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

251 commits

Author SHA1 Message Date
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
ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout 2014-08-14 11:37:30 +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
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +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
850beb72e1 Merge pull request #409 from hennevogel/refactor-conference-contact 
Refactor conference contact
 2014-08-06 11:56:14 +02:00
Gopesh Tulsyan
23c68211f0 Redirect to root path if splash is not public 2014-08-04 18:49:45 +05:30
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
Gopesh Tulsyan
9dd866f17d Adds 'new' method to admin/users controller, to render new user template, fixes #380 2014-08-01 14:35:25 +05:30
Artem Chernikov
eb127b4f8c Add new styles to be checked 2014-07-30 23:43:00 +02:00
Artem Chernikov
6e7e0c2cd3 Style/BracesAroundHashParameters enabled 2014-07-30 23:37:50 +02:00
Artem Chernikov
4aa1f0bf3a rubocop Style/AndOr style enabled 2014-07-30 23:34:09 +02:00
Artem Chernikov
f8784fdcd8 rubocop style fix Style/AlignParameters 2014-07-30 23:32:29 +02:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Gopesh Tulsyan
4a552c9623 Merge pull request #338 from gopesht/notify_on_cfp_update 
Notify on cfp update
 2014-07-28 21:31:02 +05:30
Gopesh Tulsyan
f5c53f77cf Email notification on cfp dates updates and schedule made public 2014-07-26 11:15:37 +05:30
Stella Rouzi
5e293e5547 typo 2014-07-24 23:30:28 +03:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings 
close #16
Subjects now mandatory if send mail enabled
 2014-07-23 13:42:18 +02:00
Chrisbr
2254c2e359 [Bugfix] Added missing namespace for TransitionsException 2014-07-23 13:42:18 +02:00
Chrisbr
424bf19a91 [Bugfix] Admin event states controller 
#286
fix #287
 2014-07-23 13:42:17 +02:00
Artem Chernikov
d9d72eae07 Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'
 2014-07-23 11:00:30 +02:00
Artem Chernikov
9a3451af4f Merge pull request #311 from differentreality/openid 
Only show openid options if providers are set in User model.
 2014-07-22 23:30:12 +02:00
Gopesh Tulsyan
b2ab893d17 Merge pull request #318 from gopesht/notify_on_venue_change 
Email notification to all participants on venue update
 2014-07-22 21:37:29 +05:30
Gopesh Tulsyan
5baeee9ee8 Venue update notifications done 2014-07-22 11:08:50 +05:30
Artem Chernikov
5289f41eb5 Use only new hash syntax 2014-07-21 15:05:58 +02:00
Artem Chernikov
3901973fd6 Do not use variables in void context 2014-07-21 15:05:58 +02:00