gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 04:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1137 commits 15 branches 2 tags 50 MiB
Commit graph

204 commits

Author SHA1 Message Date
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
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
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
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
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
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
6a373b5f6c Refactoring rooms 2014-11-12 11:37:28 +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
bcde6b300c Do not require answers if it is a yes or no question. 2014-11-09 14:20:36 +02:00
Stella Rouzi
46aed52c85 commercials 2014-09-03 00:18:45 +03:00
Stella Rouzi
2d2b605063 deletions 2014-09-02 22:23:49 +03:00
Stella Rouzi
0b04179be9 fix quotes on tickets 2014-09-02 22:17:54 +03:00
Stella Rouzi
1fbbbdae6e deletions 2014-09-02 21:45:08 +03:00
Stella Rouzi
da061b3902 exclude config/ from rubocop styling, more style fixes 2014-09-02 21:45:07 +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
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
Chrisbr
236f3f20e7 Adds error message to questions controller 2014-08-19 13:01:39 +02:00
Chrisbr
4189d5251b Removes stats controller 2014-08-18 14:33:12 +02:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Stella Rouzi
88f613ef8c Add controller tests for roles 2014-08-15 11:37:11 +03:00
Stella Rouzi
61f23f88c9 style fixes from rubocop 2014-08-14 12:08:01 +03:00
Stella Rouzi
17ebad413e base controller 
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
 2014-08-14 11:36:07 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
1cbf78df3d create @user with cancan for remove_user action 2014-08-13 22:53:14 +03:00
Stella Rouzi
f169049003 write in 1 single line actions with no body 
Conflicts:
	app/controllers/admin/contacts_controller.rb
 2014-08-13 22:53:14 +03:00
Stella Rouzi
f5081813d9 fix from rebase 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
 2014-08-13 22:53:14 +03:00
Stella Rouzi
f7ef401be7 style fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
e7a79528b6 fix 2014-08-13 22:53:14 +03:00
Stella Rouzi
ed11253d4f fix style 2014-08-13 22:53:14 +03:00
Stella Rouzi
e6ddb910d6 fix style 2014-08-13 22:53:13 +03:00
Stella Rouzi
58a63d9fd0 fix style 2014-08-13 22:53:13 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts 
Add email settings to user accounts
 2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
ebdf0df410 Moving notifications to models 2014-08-12 18:34:59 +05:30
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form 
close #384
 2014-08-12 08:38:51 +02:00
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00
Stella Rouzi
e06e0a5ca3 more style fixes 2014-08-07 07:42:22 +03:00
Stella Rouzi
1c1391c69e enable style ClassAndModuleChildren 2014-08-06 21:26:08 +03:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object 
close #420
 2014-08-06 14:30:50 +02:00
Henne Vogelsang
5aa0d58c57 Move Conference contact details to Contact 2014-08-01 14:30:10 +02:00
Henne Vogelsang
eb3e6898d2 Implements Contacts 2014-08-01 14:30:10 +02:00
Gopesh Tulsyan
021b118c5c Merge pull request #406 from gopesht/fix_user_creation 
Adds new method to admin/users controller
 2014-08-01 17:19:11 +05:30