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
Henne Vogelsang
10ef898a0d
Merge pull request #872 from sonalkr132/proposal-after-cfp
...
Allow submission of proposal only if program has cfp
2016-03-23 16:34:12 +01:00
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
Stella Rouzi
3f882957cf
rewrite comments form, use strong parameters with comments
2016-03-20 19:06:12 +02:00
Aditya Prakash
3e32c58460
Allow submission of proposal only if program has cfp
2016-03-18 09:18:05 +05:30
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
Nishanth Vijayan
864245fec2
Add specs for api/v1/rooms_controller & api/v1/tracks_controller
...
and cleanup api/v1/tracks and api/v1/rooms controllers
2016-03-15 00:57:15 +05:30
Nishanth Vijayan
55cfc8ff60
Fix API endpoints conferences/id/rooms/ & tracks/ issue #874
2016-03-14 20:14:54 +05:30
Henne Vogelsang
976616b47b
Protect root_path from forgery with null_session
...
Some proxies query OPTIONS for / to see if the page
is alive.
2016-03-09 15:12:58 +01:00
Stella Rouzi
782a1f071f
Merge pull request #801 from sonalkr132/targets_test
...
Model and controller tests for Target
2016-03-09 12:13:53 +02:00
Aditya Prakash
c219ffc9a3
Tests for Admin::Targets controller
...
Authorization in index action is not needed.
Fix failed delete flash error message.
2016-03-06 10:46:04 +05:30
Henne Vogelsang
feaf9d8078
Feature: Add/change Track for Event
2016-03-05 02:54:09 +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
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
