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

941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
e9530dce9b fix view test to search for input field with correct value 2014-08-15 13:32:25 +03:00
Stella Rouzi
83731d37dd Merge pull request #434 from differentreality/typo 
fix typo openSUSE
 2014-08-15 13:23:28 +03:00
Stella Rouzi
09dea4b4c5 fix typo openSUSE 2014-08-15 13:10:35 +03:00
Artem Chernikov
566382eca8 Merge pull request #441 from differentreality/cancancan 
Cancancan
 2014-08-15 12:00:35 +02:00
Artem Chernikov
b89432aff7 Merge pull request #374 from differentreality/openid_keys 
Openid keys + addition of github
 2014-08-15 11:20:47 +02:00
Stella Rouzi
88f613ef8c Add controller tests for roles 2014-08-15 11:37:11 +03:00
Stella Rouzi
b1c65eea79 style fix 2014-08-15 06:16:42 +03:00
Stella Rouzi
035988a2e1 remove keys 2014-08-15 06:16:42 +03:00
Stella Rouzi
bf6b09d9f4 add github for openid login 2014-08-15 06:16:42 +03:00
Stella Rouzi
c8e741d0ca openID keys for localhost in example secrets, so that openID works out of the box 2014-08-15 06:16:42 +03:00
Stella Rouzi
efc00787fc style fix 2014-08-14 20:18:38 +03:00
Stella Rouzi
7d35fc2857 fix test and add test for roles view 2014-08-14 19:58:50 +03:00
Stella Rouzi
911143c006 fix in admin menu and rework menu tests 2014-08-14 16:46:34 +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
336d0e9d04 migration for old roles 2014-08-13 22:53:15 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
d794593e10 migrate roles 2014-08-13 22:53:14 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
1cbf78df3d create @user with cancan for remove_user action 2014-08-13 22:53:14 +03:00
Stella Rouzi
e9a57f78a3 style 2014-08-13 22:53:14 +03:00
Stella Rouzi
c9d608175b fix from rebase 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
eaf637e9bd db 2014-08-13 22:53:14 +03:00
Stella Rouzi
d13c1a83e4 fix in questions 2014-08-13 22:53:14 +03:00
Stella Rouzi
e7a79528b6 fix 2014-08-13 22:53:14 +03:00
Stella Rouzi
bbeae5e0ff 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
Henne Vogelsang
6755328c4c Merge pull request #443 from hennevogel/master 
Switch to apache init restart
 2014-08-13 11:41:28 +02: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
fe17bd26e5 Merge pull request #440 from gopesht/add_home_route_to_splash 
Added route to root path for navigation from splash
 2014-08-13 09:20:56 +05:30
Henne Vogelsang
6e2efa502b Switch to apache init restart as passenger's tmp/restart.txt seem not to be reliable :-/ 2014-08-12 18:43:46 +02:00
Christian Bruckmayer
63d2980fe3 Merge pull request #437 from ChrisBr/refactor_basic_menu 
Refactor basic menu
 2014-08-12 17:25:40 +02:00
Gopesh Tulsyan
ebdf0df410 Moving notifications to models 2014-08-12 18:34:59 +05:30
Gopesh Tulsyan
4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons 2014-08-12 17:04:16 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Gopesh Tulsyan
41fc21f7f4 Added Subscription model to send emails 2014-08-12 16:47:35 +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
Artem Chernikov
ac25561523 Merge pull request #432 from differentreality/style_module 
enable style ClassAndModuleChildren
 2014-08-11 10:26:23 +02:00
Gopesh Tulsyan
7afa8be27c Merge pull request #412 from gopesht/fix_splash_layout 
Fix splash layouts, other ui fixes
 2014-08-07 17:00:53 +05:30
Gopesh Tulsyan
ddfe8e5227 Fix splash layouts, other ui fixes 2014-08-07 16:34:22 +05:30
Artem Chernikov
a2089a09fa Merge pull request #435 from openSUSE/review_140807_add_cleanup_for_mina 
Remove syck, add notifier back, add cleanup on deploy
 2014-08-07 10:58:56 +02:00