Commit graph

57 commits

Author SHA1 Message Date
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Ana
7f843a3a13 Remove unnecessary code from conference_controller
Remove unnecessary code from conference_controller#update.
2016-09-26 13:36:44 +02:00
Nishanth Vijayan
7a7a58ebf8 Remove unused columns from Conferences,Venues,Events and Sponsors tables 2016-06-25 00:27:25 +05:30
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Henne Vogelsang
e758c30292 Use ActiveJob to send conference date update mails 2016-04-21 15:11:20 +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
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Nishanth Vijayan
1c1e56ed46 Change update/save failures to use flash type :error instead of :alert 2016-03-16 11:20:56 +05:30
Nishanth Vijayan
19c54bd935 Change all redirect_to(path) to redirect path for uniformity 2016-03-16 09:17:41 +05:30
Nishanth Vijayan
434eb90b76 Add flash type error.Rewrite controllers to use common flash style with redirect_to 2016-03-16 09:17:41 +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
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +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
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Aditya Prakash
d11ebe96ff solve dos on hakiri 2015-03-15 19:06:38 +05:30
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference
#416
2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Stella Rouzi
88f613ef8c Add controller tests for roles 2014-08-15 11:37:11 +03:00
Stella Rouzi
17ebad413e base controller
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
1cbf78df3d create @user with cancan for remove_user action 2014-08-13 22:53:14 +03:00
Stella Rouzi
f5081813d9 fix from rebase
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
Stella Rouzi
e7a79528b6 fix 2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts
Add email settings to user accounts
2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
ebdf0df410 Moving notifications to models 2014-08-12 18:34:59 +05:30
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00
Stella Rouzi
1c1391c69e enable style ClassAndModuleChildren 2014-08-06 21:26:08 +03:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings
close #16
Subjects now mandatory if send mail enabled
2014-07-23 13:42:18 +02:00
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Gopesh Tulsyan
6d847547b7 Adds email template and settings for conference registration dates updates
Added tests

Minor typo
2014-07-15 16:26:06 +05:30
Gopesh Tulsyan
861c1af729 Conference date update email notification completed
Added tests
2014-07-15 16:25:16 +05:30
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Artem Chernikov
8803384d2f Merge pull request #229 from differentreality/create_conf_indicator
remove readonly option for start_date and end_date of conference
2014-06-19 14:04:04 +02:00
Chrisbr
4abd5d2185 Implements instance dashboard 2014-06-16 13:51:43 +02:00
Stella Rouzi
72a077e260 remove readonly option for start_date and end_date of conference so that the on-screen indication of missing fields will work 2014-06-12 21:16:08 +03:00
Chrisbr
b25ae50908 Implements user and event state distribution 2014-06-11 09:31:13 +02:00
Chrisbr
28293cb4c4 Implements recent items tabs and top submitter for dashboard 2014-06-04 16:11:33 +02:00
Chrisbr
65a73f876a Implements todo list for instance dashboard 2014-06-03 16:27:10 +02:00
Chrisbr
54ac8a8fb7 Bugfix conference#calculate_items_per_week 2014-06-03 14:00:33 +02:00
Chrisbr
dd22ce3608 Implements active user and submissions for global dashboard 2014-06-02 14:57:53 +02:00
Chrisbr
b645b1a4ff Implements registrations and last login information for dashboard 2014-06-02 14:22:51 +02:00
Chrisbr
40c61ed717 Implements event submissions over time chart 2014-05-30 10:10:47 +02:00
Chrisbr
ab4d3021a2 Moves conference show #action to #edit action 2014-05-23 13:01:23 +02:00
Chrisbr
3d534ff7ba Refactoring alert message for conference controller 2014-05-14 13:58:01 +02:00
Chrisbr
b94b5a4c75 Adds conference update errors to flash
- fix tests
2014-05-12 21:15:33 +02:00
Chrisbr
9e831cb514 Merge with master 2014-05-12 15:26:46 +02:00
Chrisbr
d97e3603b1 Merge with master 2014-05-12 15:26:18 +02:00