Commit graph

122 commits

Author SHA1 Message Date
Ana
dfd64a4510 Integrate the schedule in the admin interface
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00
Nishanth Vijayan
e83b2c3a90 Display sponsor pages only if sponsorship levels are defined 2016-05-19 19:11:38 +05:30
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables
Instead of reading a yaml file we get configuration from the
environment.
2016-04-29 16:36:47 +02:00
CamilleM
d11ea33cf0 Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908 2016-03-26 23:32:43 +01:00
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
David Sedeño
f3f40822b0 Put the config name as title in layouts. fix #773 2016-02-11 21:56:15 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Stella Rouzi
8ffa8b1e86 Venue has show action, not index. Make the ability to schedule an Event more clear. 2016-01-13 13:16:15 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
f7c70ba55c updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper 2015-09-21 15:56:57 +02:00
raluka
f3996a9bff added extra condition for view Create Conference link 2015-09-17 12:13:22 +02:00
raluka
37339dccc1 refactored comments_controller tests; fixed access to Administration link into user_menu view 2015-09-17 12:13:22 +02:00
raluka
7ba3cfd473 event title and conference title in 2 different lines now in view 2015-09-17 12:13:22 +02:00
raluka
0c39590f2e fixed Administration link in user_menu dropdown 2015-09-17 12:13:22 +02:00
raluka
52a503afd2 changed #signed_in_with_roles(user) in ability.rb model 2015-09-17 12:13:21 +02:00
raluka
74dcd75a8c created can_manage_comments helper for rendering button 2015-09-17 12:13:21 +02:00
raluka
e10a2491d3 created tests for user ability 2015-09-17 12:13:21 +02:00
raluka
b780996128 created comments with FactoryGirl 2015-09-17 12:13:21 +02:00
raluka
aa1ff51b58 small changes 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
Stella Rouzi
969c24c091 Move common views to partial 2015-06-11 15:20:48 +03:00
Henne Vogelsang
4ed8a72967 Widen the sign-in menu a bit 2015-04-23 11:23:20 +02:00
Henne Vogelsang
9e0c871494 Fix rubocop warnings and User index bug 2015-04-15 10:23:24 +02:00
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
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 Rouzi
a845dd5d7d add bootstrap-switch for is_highlight 2015-01-21 17:28:18 +02:00
Henne Vogelsang
e9f9f6524b Correct Transifex API key parsing. Fixes #573 2015-01-21 12:05:55 +01:00
Henne Vogelsang
75b5594302 Disable transifex for now. It's Issue #573 now 2014-12-17 17:09:06 +01:00
Stella
d41988c74f Fix authorization 2014-12-11 13:17:11 +02:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +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
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
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
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
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
c0cdf3e6e5 Merge pull request #504 from ChrisBr/menu
Implements new admin menu structure #304
2014-11-12 11:13:16 +01:00
Henne Vogelsang
796d063eda Implements piwik tracking 2014-11-12 10:45:44 +01:00
chrisbr
de92298085 Implements placeholder for login forms 2014-11-06 16:17:30 +01:00
Henne Vogelsang
6ab1bddd82 Use the correct URL for the ichain login 2014-11-06 12:51:39 +01:00
Christian Bruckmayer
79de791f22 Merge pull request #528 from ChrisBr/devise
Implements iChain authentication
2014-11-06 09:48:52 +01:00
chrisbr
49d565def2 Implements iChain authentication 2014-11-04 17:42:47 +01:00
Stella
4973effe23 Add Users link in drop down menu 2014-10-31 23:00:42 +02:00
Matt Barringer
6bf85d64d6 I can't take credit for all of this :-) 2014-10-15 18:28:58 +02:00