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
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
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
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
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
bc2b262510
add username and nickname in user#show and styling changes
2015-06-11 15:13:03 +03:00
Stella Rouzi
3b8b86eb85
show users per question
2015-04-22 18:55:51 +03: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
Henne Vogelsang
6a5cccbaad
Last stage of refactoring of the ability model and spec
2015-04-14 17:33:59 +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
Stella Rouzi
a845dd5d7d
add bootstrap-switch for is_highlight
2015-01-21 17:28:18 +02:00
Stella
11d0a71231
fix controller update
2015-01-21 17:28:18 +02:00
Stella Rouzi
ecfc348ea8
add highlights and fix cfp in splashpage
2015-01-21 17:28:18 +02:00
Stella
80fbc144ac
remove user deletion until further notice
2015-01-18 22:01:05 +02:00
chrisbr
799fd0c3a4
Adds dependent restricted association to some models
...
fix #348
2014-12-18 13:38:40 +01:00
Stella
2c768a358a
validate track name, render instead of redirect for campaigns, fix view for new sponsor
2014-11-30 17:50:23 +02:00
Stella
d44e1f7c24
flash alert to flash error
2014-11-30 15:41:47 +02:00
Stella
65c0cd7a73
an error
2014-11-30 15:19:19 +02: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
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
Stella Rouzi
dfc7fccc07
Merge pull request #531 from differentreality/questions_fixed_answers_for_yes_no
...
Do not require answers if it is a yes or no question.
2014-11-12 13:43:02 +02:00
Stella
2b749fb1c5
Add clarification when updating user's email
2014-11-12 13:20:51 +02:00
