Henne Vogelsang
a52918c273
Merge pull request #555 from differentreality/mock_credentials
...
add username for mock credentials of openid in development
2014-12-05 16:24:10 +01:00
Stella Rouzi
01f2fae396
Merge pull request #559 from differentreality/attachments
...
remove event_attachments table
2014-12-04 14:05:31 +02:00
Stella Rouzi
343bdec617
Merge pull request #557 from differentreality/wording_styling
...
Wording styling
2014-12-01 14:07:40 +02:00
Stella
a7be4bc88e
remove event_attachments table
2014-11-30 20:32:56 +02:00
Stella
99d50ea91e
campaign spec
2014-11-30 18:34:39 +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
5fb7e5cbef
an error spec
2014-11-30 17:11:55 +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
Stella
0a58301b66
add username for mock credentials of openid in development
2014-11-30 00:08:56 +02:00
Henne Vogelsang
1edb4bff9e
Merge pull request #548 from hennevogel/feature-admin-view
...
Implement consistent admin interface
2014-11-26 14:56:32 +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
Christian Bruckmayer
0e7faf7df8
Merge pull request #547 from ChrisBr/fix_cve
...
Fix several CVE
2014-11-24 11:26:00 +01:00
chrisbr
d08d05416f
Fixes CVE-2014-7819
2014-11-21 17:22:14 +01:00
chrisbr
acc28d22ae
Fixes CVE-2014-7829
2014-11-21 17:10:37 +01:00
Henne Vogelsang
f6a87331be
Merge pull request #546 from hennevogel/feature-conference-view
...
Another round of splash design
2014-11-21 13:49:54 +01:00
Henne Vogelsang
567d8689b8
Make sure an empty splash works
2014-11-21 13:22:20 +01:00
Henne Vogelsang
b6b0c104fd
Mobile fixes for the splash
2014-11-20 16:52:55 +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
30e8ab856c
Get rid of the splashpage banner photo and "descriptions"
2014-11-20 15:39:26 +01:00
Henne Vogelsang
60ba81ab46
Merge pull request #543 from hennevogel/feature-conference-view
...
Integrate the splash page into the general layout
2014-11-17 14:20:44 +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
7acd16f923
We need glyphicons for the bootstrap-markdown editor
2014-11-17 13:56:00 +01:00
Henne Vogelsang
f21c85ad4b
Merge pull request #542 from hennevogel/feature-splash
...
Get rid of the home controller
2014-11-17 13:55:24 +01:00
Stella Rouzi
a620132f7f
Merge pull request #501 from differentreality/translation_live
...
add js code for live translation feature of transifex
2014-11-14 20:48:27 +02:00
Henne Vogelsang
e65ca7fb58
Get rid of the home controller
2014-11-14 17:24:24 +01:00
Stella Rouzi
a41f76cca1
Merge pull request #540 from differentreality/migrate_attributes_to_questions
...
Migrate attributes to questions
2014-11-14 15:22:35 +02:00
Stella Rouzi
40fc1a32d4
put live js code into application layout
2014-11-14 15:20:56 +02:00
Stella
b43b68ac4f
api key not visible
2014-11-14 15:03:56 +02:00
Stella Rouzi
fcfe1a4df1
add js code for live translation feature of transifex
2014-11-14 15:03:56 +02:00
Stella
348b67870f
re-write error message for no answers
2014-11-13 21:39:49 +02:00
Stella
953a7b2384
fix relation for conferences-questions
2014-11-13 21:23:15 +02:00
Stella
163293d3f7
Rework seeds.rb
2014-11-13 21:23:15 +02:00
Stella
59f2b636c5
Migrate registration attributes to questions
2014-11-13 21:23:15 +02:00
Stella Rouzi
08a47339a4
Merge pull request #487 from differentreality/user_is_admin
...
Make second user admin
2014-11-12 19:09:00 +02:00
Stella
3adec92431
add user in tests, it is used for ichain testing
2014-11-12 18:31:42 +02:00
Stella Rouzi
08c7e6a79a
tests for admin attribute assignment only to 2nd user, if 1rst is the deleted user.
2014-11-12 16:22:53 +02:00
Stella Rouzi
57c73f9eae
make user an admin only if user is the first one after the deleted user.
2014-11-12 16:22:53 +02:00
Stella Rouzi
0d51220a8c
load seeds before tests
2014-11-12 16:22:53 +02:00
Stella Rouzi
2e7169ede7
Make second user admin
2014-11-12 16:21:33 +02:00
Stella Rouzi
4df9fa0fdb
Merge pull request #525 from differentreality/subscribe
...
Subscribe option: move to its own controller, add authorization
2014-11-12 16:17:09 +02:00
Stella Rouzi
acbc67173b
change to authenticate_user
2014-11-12 14:13:24 +02:00
Henne Vogelsang
1c909e60f6
Make it possible to call :notify_errbit with mina manually
2014-11-12 13:09:26 +01: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
343694d076
Merge pull request #524 from differentreality/remove_attachment
...
remove leftovers from event attachment removal
2014-11-12 13:45:51 +02:00
Stella Rouzi
7b8ce46ef1
Merge pull request #526 from differentreality/users_link
...
Show Users link in drop down menu
2014-11-12 13:43:13 +02: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 Rouzi
aa37534ee1
Merge pull request #534 from differentreality/proposal_error_msg_name
...
Fix proposal error message. Username -> name.
2014-11-12 13:41:51 +02:00
