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
960 commits 15 branches 2 tags 50 MiB
Commit graph

960 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
59fe90a706 fix style 2014-08-15 20:45:28 +03:00
Stella Rouzi
78ab264bc2 delete old migration 2014-08-15 20:45:28 +03:00
Stella Rouzi
93ced745e7 name the migration more appropriately 2014-08-15 20:45:28 +03:00
Stella Rouzi
e82a417874 style fixes 2014-08-15 20:45:28 +03:00
Stella Rouzi
6827f45d60 fix migration 2014-08-15 20:45:28 +03:00
Stella Rouzi
d98cb8ccff fix style 2014-08-15 20:45:28 +03:00
Stella Rouzi
e0778a94de use sample user for scheduled events without user 2014-08-15 20:45:28 +03:00
Stella Rouzi
b5b85ede71 delete events without submitter 2014-08-15 20:45:28 +03:00
Stella Rouzi
79af7266ec Merge pull request #452 from differentreality/conference_view_test_edit 
fix view test to search for input field with correct value
 2014-08-15 20:38:44 +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
Henne Vogelsang
71bf793cdf Merge pull request #451 from hennevogel/master 
Fix email from config variable. Fixes #446
 2014-08-15 14:12:21 +02:00
Christian Bruckmayer
1ab7fe3051 Merge pull request #449 from ChrisBr/introduce_speakers_relation 
Introduces speakers relation to conference #416
 2014-08-15 13:00:59 +02:00
Christian Bruckmayer
70e3d0af35 Merge pull request #448 from ChrisBr/introduce_participants_relation 
Introduces participants relation to conference #416
 2014-08-15 12:58:10 +02:00
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
Henne Vogelsang
63cf8e784a Fix email from config variable. Fixes #446 2014-08-15 11:58:47 +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
Chrisbr
47f524259c Introduces speakers relation to conference #416 2014-08-14 11:25:11 +02:00
Stella Rouzi
61f23f88c9 style fixes from rubocop 2014-08-14 12:08:01 +03:00
Chrisbr
c7d47ce6df Introduces participants relation to conference #416 2014-08-14 10:46:02 +02: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