Commit graph

252 commits

Author SHA1 Message Date
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
2c768a358a validate track name, render instead of redirect for campaigns, fix view for new sponsor 2014-11-30 17:50:23 +02:00
Stella
0a58301b66 add username for mock credentials of openid in development 2014-11-30 00:08:56 +02: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
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
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01: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
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
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
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +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
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
chrisbr
56cb805110 Adds disabled flag to user and checks it if iChain is enabled 2014-11-06 16:17:11 +01:00
Henne Vogelsang
164dd75712 Include disabled omniauth in ichain config for delayed jobs 2014-11-06 11:16:54 +01:00
chrisbr
49d565def2 Implements iChain authentication 2014-11-04 17:42:47 +01:00
chrisbr
15c6ed127f Implements username authentication
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
2014-11-03 15:25:33 +01:00
Gopesh Tulsyan
67ea900dc3 Keynote Speakers implemented 2014-09-15 19:02:02 +05:30
James Mason
a3e4ab5ca0 there's no such thing as Array#to_h
(cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)
2014-09-09 17:57:30 -07:00
Stella Rouzi
1fbbbdae6e deletions 2014-09-02 21:45:08 +03:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Stella Rouzi
f91467a00a remove trailing spaces and blank lines 2014-09-02 21:41:25 +03:00
Henne Vogelsang
89440b971d More accept/reject/confirm fixes 2014-09-01 17:17:30 +02:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference
#418
2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets
- Tickets now independent from registration
- Implemented money gem
#419
2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
2014-08-22 15:08:54 +02:00
Stella Rouzi
30c2d66a15 remove attachments 2014-08-21 07:58:26 +03:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference
#416
2014-08-18 14:33:02 +02:00
Stella Rouzi
3bb42bdb10 move sample user creation in seeds 2014-08-15 20:45:29 +03:00
Stella Rouzi
b5b85ede71 delete events without submitter 2014-08-15 20:45:28 +03:00
Christian Bruckmayer
63366d43a4 Merge pull request #453 from ChrisBr/bugfix_conference_controller
Removes dulplicate conference update action
2014-08-15 16:57:13 +02:00
Christian Bruckmayer
367c962c1b Merge pull request #429 from ChrisBr/fix_campaigns
Fix campaigns dashboard missing method bug
2014-08-15 16:14:31 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00