Commit graph

354 commits

Author SHA1 Message Date
Henne Vogelsang
1ce834391a Add cloudinary gem, fix some Gemfile comments 2016-04-27 11:48:12 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
1fdc2f8efe Merge pull request #946 from Shriyanshagro/venue_commercial
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Henne Vogelsang
21280cd9d8 Switch mail sending to active_job
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
2016-04-20 18:59:24 +02:00
Shriyansh
6f667a865b create_venue_commercial added 2016-04-10 11:57:30 +05:30
Shriyansh
154f4a400c venue_commercial association establihed 2016-04-10 11:57:30 +05:30
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Aditya Prakash
9abda59b0d Add configuration and documentation smtp setting 2016-04-07 13:49:28 +05:30
Henne Vogelsang
f56fc0052f Merge pull request #907 from sonalkr132/proposal-test
Proposal controller improvements and test
2016-04-01 14:49:50 +02:00
Henne Vogelsang
6aedf2b03d Merge pull request #904 from Shriyanshagro/master
Made use of Rails I18n data format in EventSerializer #598
2016-03-30 17:31:42 +02:00
Shriyansh
70b8fca197 Made use of Rails I18n data format in EventSerializer #598 2016-03-27 20:03:33 +05:30
Nishanth Vijayan
53555d5efa Remove leftover from event_attachment in routes 2016-03-26 15:49:23 +05:30
Aditya Prakash
dcb98c49f9 Improvements in proposal controller
`if..else` is better than unless with return.
On failed update render `edit` template and not render `new` template.
On failed save redirect to index path and not render `new` template.
Change `destory` to `withdraw`, cause `destroy` makes DELETE request when
we are updating the event record.
Check for success for save in withdraw (save can fail for reasons other than validation).
2016-03-24 11:37:40 +05:30
Aditya Prakash
19157ac81d Add test for conference registration controller show and destroy action
After failed delete, user should be redirected to registration show and not
root.
2016-03-23 11:42:40 +05:30
robin kiplangat
72c068203b Update routes.rb
removed index get '/stats' => 'stats#index' as it references to a non-existent statscontroller
2016-03-22 12:40:26 +03:00
Christian Bruckmayer
2f23ba2fd3 Remove duplicate delivery_method config option 2016-03-10 15:06:59 +01:00
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02:00
Christian Bruckmayer
2dad051ab9 Add letter_opener_web
to present emails in the browser in development mode.
Using letter_opener in combination with Vagrant does not work
because it's not possible to launch a web browser in your
Vagrant box. Fixes #817.
2016-03-05 14:09:42 +01:00
Henne Vogelsang
af168f0f55 Merge pull request #700 from differentreality/roles_updated
Roles updated
2016-03-04 17:11:56 +01:00
Aditya Prakash
640be7497f Add config to allow running FactoryGirl lint before suit
By default the lint will be run before every test suit.
Set it to false in config.yml if you would rather just use the rake
task: `bundle exec rake factory_girl:lint`
2016-03-02 21:15:29 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Aditya Prakash
6460456202 Update Formtastic and formtastic-bootstrap
Previous version of Formtastic was giving following deprecation warning:
`#column_for_attribute` will return a null object for non-existent
columns in Rails 5. Use #has_attribute? if you need to check for
an attribute's existence.

Guide followed for upgrade: https://github.com/justinfrench/formtastic/wiki/Upgrading-to-Formtastic-3.1

formtastic-bootstrap is upgraded for compatibility with current Formtastic.
2016-02-19 08:12:03 +05:30
Aditya Prakash
cac3f817ef Remove deprecation warnings due to update of rails
* `config.serve_static_assets` has been renamed to `config.serve_static_files`
  and former will be removed in rails 5
* propagate errors raised within `after_rollback`/`after_commit` callbacks.
  Read more at: http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#error-handling-in-transaction-callbacks
2016-02-19 08:06:14 +05:30
Henne Vogelsang
75b4143bc4 Update factory_girl, silence deprecation warnings 2016-02-08 13:35:31 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Stella Rouzi
ecef151f91 API with more options, includes #712 2016-01-21 21:49:48 +02:00
chrisbr
23664119bd Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
aa1ff51b58 small changes 2015-09-17 12:13:21 +02:00
raluka
35714f350e Issue#15: Added Comment Notifications: notification_emails and comments view 2015-09-17 12:13:21 +02:00
raluka
3df77c84f6 Issue#690: fixed Attendance Button 2015-07-15 12:44:08 +02:00
Henne Vogelsang
132fe6f98c Disable registration/event submission without sign in with ichain 2015-04-23 11:50:22 +02:00
Henne Vogelsang
e8ab94e1c7 Implements sign up during registration. Solves most of #215 2015-03-12 23:53:57 +01:00
Henne Vogelsang
b65a33f047 Merge pull request #560 from hennevogel/feature-user-view
Various small UI fixes
2014-12-09 15:52:44 +01:00
Henne Vogelsang
c6bd65deaa Fix Stellas review gripes 2014-12-09 15:19:01 +01:00
Henne Vogelsang
f91de69ede Merge pull request #558 from differentreality/confirmations
sign in user after confirmation
2014-12-05 16:24:19 +01:00
Stella
31df114ce4 sign in user after confirmation 2014-12-01 14:40:31 +02:00
Stella
0a58301b66 add username for mock credentials of openid in development 2014-11-30 00:08:56 +02:00
Henne Vogelsang
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01:00
Henne Vogelsang
28063129c7 Implement consistent admin interface
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
2014-11-25 10:47:18 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
2014-11-20 15:39:26 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
2014-11-17 13:58:27 +01:00
Henne Vogelsang
f21c85ad4b Merge pull request #542 from hennevogel/feature-splash
Get rid of the home controller
2014-11-17 13:55:24 +01:00
Henne Vogelsang
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00
Stella
b43b68ac4f api key not visible 2014-11-14 15:03:56 +02:00
Stella Rouzi
4df9fa0fdb Merge pull request #525 from differentreality/subscribe
Subscribe option: move to its own controller, add authorization
2014-11-12 16:17:09 +02:00
Henne Vogelsang
1c909e60f6 Make it possible to call :notify_errbit with mina manually 2014-11-12 13:09:26 +01:00
Stella
3be200abcc move subscribe to its own controller, add authorization, test subscribe/unsubscribe 2014-11-12 14:00:17 +02:00