Commit graph

327 commits

Author SHA1 Message Date
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
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
Henne Vogelsang
b65a33f047 Merge pull request #560 from hennevogel/feature-user-view
Various small UI fixes
2014-12-09 15:52:44 +01:00
Henne Vogelsang
c6bd65deaa Fix Stellas review gripes 2014-12-09 15:19:01 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Stella Rouzi
6d0f3021ca rubocop styling 2014-12-01 14:40:31 +02:00
Stella
31df114ce4 sign in user after confirmation 2014-12-01 14:40:31 +02: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
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01: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
Henne Vogelsang
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00
Stella Rouzi
acbc67173b change to authenticate_user 2014-11-12 14:13:24 +02:00
Stella
3be200abcc move subscribe to its own controller, add authorization, test subscribe/unsubscribe 2014-11-12 14:00:17 +02: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
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Christian Bruckmayer
56747fc118 Merge pull request #515 from ChrisBr/rooms
Refactoring admin room menu
2014-11-12 12:01:10 +01:00
chrisbr
580c6c6ed9 Refactoring lodgings 2014-11-12 12:00:03 +01:00