Aditya Prakash
ccc28cdc90
Add test for QuestionsController
...
new method was dead code.
@questions_conference was dead variable.
assignment of question's foreign key was unnecessary.
fixes in type of flash messages.
2016-02-25 12:42:55 +05:30
Stella Rouzi
73422735c0
Merge pull request #762 from davidsf/registration_limit
...
Add registration limit to conference
2016-02-18 13:55:16 +02:00
David Sedeño
a88bb4ea97
If the conference has only one day, not put the day twice in splashpage info. fix #780
2016-02-17 16:02:01 +01: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
David Sedeño
00acf0c255
Fix room_params in scheduler update. fix #771
2016-02-08 22:52:58 +01:00
Henne Vogelsang
8e324ac1af
Fix showing a schedule without venue/rooms
2016-02-08 12:52:56 +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
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
Christian Bruckmayer
28e55f3f50
Merge pull request #737 from ChrisBr/commercial_new
...
Simplify adding commercials to conference and event
2016-01-21 20:29:03 +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
17a1c0e87c
fix hakiri issue
2016-01-21 20:19:37 +02:00
Christian Bruckmayer
81a43cc2b6
Raise exception on XSRF fail
...
Reported by hakiri.io
2016-01-13 10:35:16 +01:00
Stella Rouzi
355ecc0ac6
Introduce strong parameters
2015-12-23 11:36:50 +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
759aa54689
Syntax style + code groomming
2015-10-06 14:15:38 +03:00
raluka
f294316cba
added comments to explain comments_controller
2015-09-17 12:13:22 +02:00
raluka
a9a43d726f
WIP created tests for comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
21c10166ec
added test file for comments_controller WIP
2015-09-17 12:13:22 +02:00
raluka
945bac1fe8
WIP modified CommentsController#index
2015-09-17 12:13:22 +02:00
raluka
bc67cac873
sorting comments after event title and created at in index
2015-09-17 12:13:22 +02:00
raluka
8dd0ac7c1d
rewrite CommentsController#index to have everything in one call
2015-09-17 12:13:22 +02:00
raluka
1addae9cd9
WIP changed CommentsController#index; temporary view for all_comments
2015-09-17 12:13:22 +02:00
raluka
800a41b3f9
added logic for available conferences based on roles in comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
52a503afd2
changed #signed_in_with_roles(user) in ability.rb model
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
Stella Rouzi
0013a3a814
Merge pull request #639 from differentreality/devise_partials
...
Move common views to partial
2015-06-12 12:30:51 +03:00
Stella Rouzi
bd79719054
style
2015-06-11 15:22:54 +03:00
Stella Rouzi
2b433a9cbe
make @user definition more clear
2015-06-11 15:20:48 +03:00
Stella Rouzi
b8313aa064
Styling
2015-06-11 15:20:48 +03:00
Stella Rouzi
969c24c091
Move common views to partial
2015-06-11 15:20:48 +03:00
Stella Rouzi
bc2b262510
add username and nickname in user#show and styling changes
2015-06-11 15:13:03 +03:00
Henne Vogelsang
132fe6f98c
Disable registration/event submission without sign in with ichain
2015-04-23 11:50:22 +02:00
Stella Rouzi
3b8b86eb85
show users per question
2015-04-22 18:55:51 +03:00
Christian Bruckmayer
9963c1550f
Merge pull request #627 from ChrisBr/redirect_registration
...
Redirect to registration edit page when user is already registered
2015-04-20 17:28:34 +02:00
Stella Rouzi
6eef0c1ca7
Merge pull request #643 from differentreality/events_json
...
fix scrolling of left column in schedule, show only @conference.events
2015-04-20 18:26:25 +03:00
Henne Vogelsang
b2c7d9be99
Merge pull request #617 from sonalkr132/hakiri_dos
...
solves DOS on hakiri
2015-04-20 17:23:24 +02:00
Stella Rouzi
3b8c91bbd9
fix scrolling of left column in schedule, show only @conference.events
2015-04-20 13:17:47 +03:00
Stella Rouzi
e6bb168c5e
Refactoring of proposal workflow. Fixes #215
2015-04-16 18:37:31 +03:00
Henne Vogelsang
6a5cccbaad
Last stage of refactoring of the ability model and spec
2015-04-14 17:33:59 +02:00
chrisbr
6f64602d85
Redirect to registration edit page when user is already registered
2015-04-11 09:37:28 +02:00
Stella Rouzi
0e8bdfcb56
no authorization for Conference, as it's being authorized with read action which includes index and show actions, however action show is authorized only for Conference with public splashpage
2015-03-28 13:24:21 +02:00
Aditya Prakash
d11ebe96ff
solve dos on hakiri
2015-03-15 19:06:38 +05:30
Henne Vogelsang
0ce4aa0a49
Fix the ability spec
...
* Get rid of the volunteer coordinator role, we don't use it currently
* Test the ability with users that exclusively have a single role
2015-03-13 00:43:09 +01:00
Henne Vogelsang
e8ab94e1c7
Implements sign up during registration. Solves most of #215
2015-03-12 23:53:57 +01:00
chrisbr
232cc249d4
Implements program section for unscheduled events
...
close #610
2015-03-09 15:31:06 +01:00
Stella Rouzi
a845dd5d7d
add bootstrap-switch for is_highlight
2015-01-21 17:28:18 +02:00