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
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
chrisbr
6a373b5f6c
Refactoring rooms
2014-11-12 11:37:28 +01:00
Henne Vogelsang
a9581445f3
Provide a helper to point to sign up/in for different configs
2014-11-12 10:20:53 +01:00
Stella
bcde6b300c
Do not require answers if it is a yes or no question.
2014-11-09 14:20:36 +02:00
Stella Rouzi
46aed52c85
commercials
2014-09-03 00:18:45 +03:00
Stella Rouzi
2d2b605063
deletions
2014-09-02 22:23:49 +03:00
Stella Rouzi
0b04179be9
fix quotes on tickets
2014-09-02 22:17:54 +03:00
Stella Rouzi
1fbbbdae6e
deletions
2014-09-02 21:45:08 +03:00
Stella Rouzi
da061b3902
exclude config/ from rubocop styling, more style fixes
2014-09-02 21:45:07 +03:00
Stella Rouzi
b7c45718d8
apply StringLiterals cop (remove double quotes, unless there is string interpolation)
2014-09-02 21:45:07 +03:00
Stella Rouzi
f91467a00a
remove trailing spaces and blank lines
2014-09-02 21:41:25 +03:00
Chrisbr
fedb0753bf
Extracted Splashpage from Conference
...
#418
2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9
Refactoring Tickets
...
- Tickets now independent from registration
- Implemented money gem
#419
2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977
Big refactoring of registration
...
- Added datatable gem
- Addaed datatable to events, users (#422 ), registrations
2014-08-22 15:08:54 +02:00
Chrisbr
236f3f20e7
Adds error message to questions controller
2014-08-19 13:01:39 +02:00
Chrisbr
4189d5251b
Removes stats controller
2014-08-18 14:33:12 +02:00
Chrisbr
ed55e2bf3a
Introduces new RegistrationPeriod Object for Conference
...
#416
2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456
Removes dulplicate conference update action and moves methods out of private area
2014-08-15 16:06:02 +02:00
Stella Rouzi
88f613ef8c
Add controller tests for roles
2014-08-15 11:37:11 +03:00
Stella Rouzi
61f23f88c9
style fixes from rubocop
2014-08-14 12:08:01 +03:00
Stella Rouzi
17ebad413e
base controller
...
Conflicts:
app/controllers/admin/commercials_controller.rb
app/controllers/admin/questions_controller.rb
app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
Stella Rouzi
beb88b848d
changes from comments, fix commercials failing test
2014-08-13 22:53:15 +03:00
Stella Rouzi
1cbf78df3d
create @user with cancan for remove_user action
2014-08-13 22:53:14 +03:00
Stella Rouzi
f169049003
write in 1 single line actions with no body
...
Conflicts:
app/controllers/admin/contacts_controller.rb
2014-08-13 22:53:14 +03:00
Stella Rouzi
f5081813d9
fix from rebase
...
Conflicts:
app/views/layouts/_admin_sidebar.html.haml
2014-08-13 22:53:14 +03:00
Stella Rouzi
f7ef401be7
style fixes
2014-08-13 22:53:14 +03:00
Stella Rouzi
e7a79528b6
fix
2014-08-13 22:53:14 +03:00
Stella Rouzi
ed11253d4f
fix style
2014-08-13 22:53:14 +03:00
Stella Rouzi
e6ddb910d6
fix style
2014-08-13 22:53:13 +03:00
Stella Rouzi
58a63d9fd0
fix style
2014-08-13 22:53:13 +03:00
Stella Rouzi
71dfb3b7e4
fix conflicts
2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7
Implement role authorization
2014-08-13 22:53:13 +03:00