Commit graph

335 commits

Author SHA1 Message Date
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
Christian Bruckmayer
97bf86454e Merge pull request #518 from ChrisBr/lodgings
Refactoring admin lodging menu
2014-11-12 12:47:30 +01:00
Christian Bruckmayer
5a80adaee5 Merge pull request #539 from ChrisBr/venue
Refactoring venue
2014-11-12 12:47:14 +01:00
Henne Vogelsang
12e04af21f Deploy piwik config 2014-11-12 12:38:54 +01:00
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Henne Vogelsang
5b78666eb8 Merge pull request #538 from hennevogel/master
Implements piwik tracking
2014-11-12 12:04:36 +01:00
chrisbr
580c6c6ed9 Refactoring lodgings 2014-11-12 12:00:03 +01:00
chrisbr
6a373b5f6c Refactoring rooms 2014-11-12 11:37:28 +01:00
Henne Vogelsang
796d063eda Implements piwik tracking 2014-11-12 10:45:44 +01:00
Henne Vogelsang
c3b0dcc9d7 Set the ichain base url 2014-11-06 10:28:19 +01:00
chrisbr
49d565def2 Implements iChain authentication 2014-11-04 17:42:47 +01:00
chrisbr
15c6ed127f Implements username authentication
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
2014-11-03 15:25:33 +01:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Stella Rouzi
f91467a00a remove trailing spaces and blank lines 2014-09-02 21:41:25 +03:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference
#418
2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets
- Tickets now independent from registration
- Implemented money gem
#419
2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
2014-08-22 15:08:54 +02:00
Henne Vogelsang
f212aeeb30 Add a rake task to the deployment to backup the DB.
Apparently needed with all the broken migrations...
2014-08-20 00:49:48 +02:00
Henne Vogelsang
f2bbb68ad9 Update rails to address CVE-2014-3514. Fix the deployment 2014-08-19 12:31:31 +02:00
Artem Chernikov
65291d8b0d Merge pull request #450 from gopesht/dj_deploy
Adds delayed jobs recipe for production, and some documentation
2014-08-19 09:50:36 +02:00