Commit graph

497 commits

Author SHA1 Message Date
Henne Vogelsang
01f96e27e0 Merge pull request #585 from hennevogel/master
Correct Transifex API key parsing. Fixes #573
2015-02-02 13:36:06 +01:00
Stella Rouzi
6076e29733 Merge pull request #562 from differentreality/highlights_cfp
add highlights and fix cfp in splashpage
2015-01-22 20:40:24 +02:00
Gopesh Tulsyan
dc05cc83ac Merge pull request #580 from openSUSE/refactor_email_settings
Refactor Admin Email Settings Form
2015-01-22 00:49:19 +05:30
Stella
fbdec2a58e fix sorting in events#index with button functionality and add color/text to switch buttons 2015-01-21 20:12:57 +02:00
Stella
b8b3703175 fix table sorting in admin/events#index 2015-01-21 17:28:19 +02:00
Stella
8fab09e63b proposal creation: only show is_highlight for organizers or cfp 2015-01-21 17:28:18 +02: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
Christian Bruckmayer
8e25338436 Merge pull request #582 from ChrisBr/fix71
Events open now in new tab when clicking in schedule
2015-01-21 15:14:19 +01:00
Henne Vogelsang
e9f9f6524b Correct Transifex API key parsing. Fixes #573 2015-01-21 12:05:55 +01:00
Stella
80fbc144ac remove user deletion until further notice 2015-01-18 22:01:05 +02:00
chrisbr
5446c349c2 Events open now in new tab when clicking in schedule
close #71
2015-01-15 16:28:53 +01:00
Gopesh Tulsyan
327db11a8a Changing id tags for nav form 2015-01-15 11:12:57 +05:30
Gopesh Tulsyan
fc450b98ae Refactor Admin Email Settings Form 2015-01-15 11:09:08 +05:30
Stella Rouzi
bca62e6204 Merge pull request #564 from differentreality/speakers
Remove link to change speaker in Events list
2014-12-19 10:49:48 +02:00
Christian Bruckmayer
cc80fb10cb Merge pull request #567 from openSUSE/348
Adds dependent restricted association to some models
2014-12-18 15:00:18 +01:00
chrisbr
799fd0c3a4 Adds dependent restricted association to some models
fix #348
2014-12-18 13:38:40 +01:00
Christian Bruckmayer
5d2d728c9e Merge pull request #572 from ChrisBr/tickets
Fix ticket total price on each row
2014-12-18 12:53:37 +01:00
Henne Vogelsang
75b5594302 Disable transifex for now. It's Issue #573 now 2014-12-17 17:09:06 +01:00
chrisbr
0ea8228aa2 Fix ticket total price on each row 2014-12-17 16:56:31 +01:00
Henne Vogelsang
87b1aba1e9 Add conference description to the index view 2014-12-16 15:07:57 +01:00
Stella
d41988c74f Fix authorization 2014-12-11 13:17:11 +02:00
Stella Rouzi
ba5731cc18 typo in pluralization 2014-12-11 10:31:30 +02:00
Stella Rouzi
0033567a5c Remove link to change speaker. 2014-12-11 09:48:54 +02:00
Henne Vogelsang
eb817569a5 Only show confirmed speakers on registrations 2014-12-10 16:40:50 +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
Henne Vogelsang
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01:00
Henne Vogelsang
c84ebf26e0 Better scroll handling for the venue map 2014-11-27 14:14:59 +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
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
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
f21c85ad4b Merge pull request #542 from hennevogel/feature-splash
Get rid of the home controller
2014-11-17 13:55:24 +01:00
Henne Vogelsang
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00
Stella Rouzi
40fc1a32d4 put live js code into application layout 2014-11-14 15:20:56 +02:00
Stella Rouzi
fcfe1a4df1 add js code for live translation feature of transifex 2014-11-14 15:03:56 +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
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
ce7829e9c1 Profile 2014-11-12 13:20:51 +02:00
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Henne Vogelsang
5b78666eb8 Merge pull request #538 from hennevogel/master
Implements piwik tracking
2014-11-12 12:04:36 +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