Stella Rouzi
528243c8b9
Allow max_attendees to be nil
2016-05-15 14:01:36 +03:00
Stella Rouzi
9fe7d0ca7c
Use strong parameters for user in admin/registrations#update
2016-05-02 18:02:57 +03:00
Stella Rouzi
6bcecbd219
fix admin/registrations#update
2016-05-02 17:38:55 +03:00
Henne Vogelsang
2a4de3e869
Use PictureUploader on Venue
2016-04-27 17:55:17 +02:00
Henne Vogelsang
f1f5fc1cd4
Use PictureUploader on Sponsor
2016-04-27 17:40:23 +02:00
Henne Vogelsang
0ad3ff01c3
Use PictureUploader on Lodging
2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af
Use PictureUploader on Conference
2016-04-27 17:40:23 +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
Stella Rouzi
0a5ba7a204
Merge pull request #942 from nishanthvijayan/fix-roles-authorization
...
Fix authorization issues with Roles
2016-04-25 17:18:24 +02:00
Henne Vogelsang
3391d09549
Use ActiveJob to send comment mails
2016-04-22 11:31:19 +02:00
Henne Vogelsang
2e79f65989
Merge pull request #939 from Shriyanshagro/datepicker_constraints
...
Defined DateTimepicker constraints
2016-04-20 16:19:41 +02:00
Shriyansh
0ca19ea67a
added views for public view on splashpage,venue_edit,venue
2016-04-10 11:57:30 +05:30
Shriyansh
5186dfcb12
secured Ux
2016-04-10 11:57:30 +05:30
Shriyansh
7bbb0da17a
done with creating relationship and generating view for venue_commercials
2016-04-10 11:57:30 +05:30
Shriyansh
dc0da8c500
defined ,tabular form
...
defined ,tabular form
2016-04-10 11:57:30 +05:30
Shriyansh
6f667a865b
create_venue_commercial added
2016-04-10 11:57:30 +05:30
Shriyansh
bba9a552ec
attributes to send data to datepicker JS has been defined
2016-04-09 21:03:31 +05:30
Stella Rouzi
b9e10922ee
drop dietary choices, social events, and html_export_path
2016-04-09 16:29:20 +03:00
Nishanth Vijayan
03fcdecdf2
Fix authorization of adding/removing users from roles
...
Only organizers should be able to add/remove users from all roles.
Only organizers should be able to edit/update the description of roles of their conference.
Cfp/info_desk/voluters coordinators should be to able to add/remove users only to their own teams.
2016-04-09 03:50:27 +05:30
Christian Bruckmayer
86449eea67
Merge pull request #926 from sonalkr132/mailer-tests
...
Mailer fixes and tests
2016-04-08 11:43:03 -06:00
Aditya Prakash
d9db395ec6
Use each to iterate over array in mailer and fix comment link
...
*_url gives complete path with host
2016-03-31 22:59:12 +05:30
Justin Harrison
18b1ad2b70
More efficient listing of roles
...
Reduces number of loops from 2 to 1.
2016-03-29 12:04:48 -04:00
Justin Harrison
7c38622e8f
Display roles in registration list
2016-03-26 13:25:54 -04:00
Henne Vogelsang
80a06b99b4
Merge pull request #894 from differentreality/comments
...
rewrite comments form, use strong parameters with comments
2016-03-22 18:26:38 +01:00
Stella Rouzi
3f882957cf
rewrite comments form, use strong parameters with comments
2016-03-20 19:06:12 +02:00
Rishabh Saxena
99afc456cd
correcting ticket's details view and its related models.
2016-03-19 01:52:38 +05:30
Nishanth Vijayan
fd64db575b
Remove datatable functionality from Roles index table.
...
The table in roles#index view has no need of datatable features as the number of roles is just 4.
2016-03-16 12:09:58 +05:30
Stella Rouzi
fb4e8958e0
Fix variable @program typo in programs#show
2016-03-09 20:11:59 +02:00
Rishabh Saxena
2c1db3bd2a
Making datatable responsive in admin's users view.
2016-03-07 15:15:29 +05:30
Stella Rouzi
18bb1bd237
Merge pull request #770 from hennevogel/feature_venue_show
...
Beautify venue#show
2016-03-04 19:44:49 +02:00
Henne Vogelsang
33e1c6eae1
Beautify venues#show
2016-03-04 17:05:42 +01:00
Henne Vogelsang
f83e76102f
Make use of holder.js in venue#show
2016-03-04 15:59:17 +01:00
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
a0d045e156
Remove attr_accessible from Program and Cfp, final fixes after introducing strong params
2016-02-06 17:43:51 +01:00
Stella Rouzi
f840f2b3f0
Rooms belong to venue
2016-02-06 17:43:51 +01:00
Stella Rouzi
feabbfbc99
rebase against email settings changes
2016-02-06 17:42: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
Christian Bruckmayer
57610eb39e
Merge pull request #716 from differentreality/abilities
...
Abilities: Minor changes & grooming
2016-01-25 17:20:24 +01: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
8ffa8b1e86
Venue has show action, not index. Make the ability to schedule an Event more clear.
2016-01-13 13:16:15 +02:00
raluka
9eb47bd3f0
merged from upstream
2015-10-14 16:02:40 +02:00
raluka
3d57203727
added more consistency for email_settings
2015-10-14 15:34:23 +02:00
Stella Rouzi
2e692f7ea5
Merge pull request #705 from altsalt/master
...
added Voted? column to admin/events view
2015-10-14 14:31:30 +03:00
Stella Rouzi
759aa54689
Syntax style + code groomming
2015-10-06 14:15:38 +03:00
raluka
0c4b0b4ac1
Refactored EmailSetting incosistency. Fixes #603
2015-10-06 11:32:40 +02:00
raluka
1cf877bf76
grooming style
2015-10-05 13:28:35 +02:00
raluka
f7c70ba55c
updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper
2015-09-21 15:56:57 +02:00
