Commit graph

735 commits

Author SHA1 Message Date
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
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
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
59f2b636c5 Migrate registration attributes to questions 2014-11-13 21:23:15 +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
2e7169ede7 Make second user admin 2014-11-12 16:21:33 +02:00
Stella Rouzi
acbc67173b change to authenticate_user 2014-11-12 14:13:24 +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
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
Stella Rouzi
4f3684db76 Merge pull request #537 from differentreality/username_deleted_user_seeds
add username to deleted_user in seeds
2014-11-12 13:41:16 +02:00
Stella
ce7829e9c1 Profile 2014-11-12 13:20:51 +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
Henne Vogelsang
5b78666eb8 Merge pull request #538 from hennevogel/master
Implements piwik tracking
2014-11-12 12:04:36 +01:00
Christian Bruckmayer
67a672633e Merge pull request #530 from ChrisBr/devise
Implements test for ichain authentication
2014-11-12 12:01:25 +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
085629958e Test for ichain authentication 2014-11-12 11:45:17 +01:00
chrisbr
6a373b5f6c Refactoring rooms 2014-11-12 11:37:28 +01:00
Chrisbr
9376fe57e3 Moves sponsor email attribute from conference to contact 2014-11-12 11:16:22 +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
Henne Vogelsang
a9581445f3 Provide a helper to point to sign up/in for different configs 2014-11-12 10:20:53 +01:00
Stella
a2c9e15236 remove leftovers from event attachment removal 2014-11-09 20:47:34 +02:00
Stella
e3ad72268e add is_disabled attribute for deleted user 2014-11-09 20:37:28 +02:00
Stella
2f080fb458 Fix proposal error message. Username -> name. 2014-11-09 15:58:44 +02:00
Stella
bcde6b300c Do not require answers if it is a yes or no question. 2014-11-09 14:20:36 +02:00
Henne Vogelsang
2c98ba9711 Also destroy the ichain session for deisabled users 2014-11-06 17:29:46 +01:00
chrisbr
de92298085 Implements placeholder for login forms 2014-11-06 16:17:30 +01:00
chrisbr
56cb805110 Adds disabled flag to user and checks it if iChain is enabled 2014-11-06 16:17:11 +01:00
Henne Vogelsang
b95d35d5d9 It's always hard to remove another layer of indirection... 2014-11-06 14:58:51 +01:00
Henne Vogelsang
6ab1bddd82 Use the correct URL for the ichain login 2014-11-06 12:51:39 +01:00
Henne Vogelsang
164dd75712 Include disabled omniauth in ichain config for delayed jobs 2014-11-06 11:16:54 +01:00
Christian Bruckmayer
79de791f22 Merge pull request #528 from ChrisBr/devise
Implements iChain authentication
2014-11-06 09:48:52 +01:00