Commit graph

1176 commits

Author SHA1 Message Date
chrisbr
799fd0c3a4 Adds dependent restricted association to some models
fix #348
2014-12-18 13:38:40 +01:00
Henne Vogelsang
87b1aba1e9 Add conference description to the index view 2014-12-16 15:07:57 +01:00
Henne Vogelsang
97bbd6adb6 Fix email_settings cfp call 2014-12-16 11:26:03 +01:00
Stella Rouzi
dab0d9db16 Merge pull request #556 from differentreality/abilities
Fix authorization
2014-12-11 20:49:18 +02:00
Stella Rouzi
d7873c9e6c do not index users unless organizer or admin 2014-12-11 13:17:11 +02:00
Stella
d41988c74f Fix authorization 2014-12-11 13:17:11 +02:00
Stella Rouzi
33bbbc9566 Merge pull request #565 from differentreality/registration
typo in pluralization
2014-12-11 12:51:33 +02:00
Stella Rouzi
ba5731cc18 typo in pluralization 2014-12-11 10:31:30 +02:00
Henne Vogelsang
eb817569a5 Only show confirmed speakers on registrations 2014-12-10 16:40:50 +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
e9456be31a Merge pull request #554 from differentreality/cfp_dates
cfp validations
2014-12-05 16:25:10 +01:00
Henne Vogelsang
f91de69ede Merge pull request #558 from differentreality/confirmations
sign in user after confirmation
2014-12-05 16:24:19 +01:00
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
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +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
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 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
Stella
6e026746a9 validate cfp start_date before end_date and end_date before conference.end_date 2014-11-29 20:00:26 +02:00
Henne Vogelsang
b6abe96279 Various ability fixes and clarifications for guests/users 2014-11-27 15:15:34 +01:00
Henne Vogelsang
9c968ad3e2 Create some DifficultyLevels by default 2014-11-27 15:05:44 +01:00
Henne Vogelsang
fe35f1d788 Help with date selection in the datepickers 2014-11-27 15:04:39 +01:00
Henne Vogelsang
60bb00b88e Fix glyphicons, suse-icon and remove unused fonts 2014-11-27 14:47:00 +01:00
Henne Vogelsang
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01:00
Henne Vogelsang
ebb7d8da2c We don't use the JqueryUI timepicker anymore 2014-11-27 14:14:59 +01:00
Henne Vogelsang
c84ebf26e0 Better scroll handling for the venue map 2014-11-27 14:14:59 +01: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