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

151 commits

Author SHA1 Message Date
Chrisbr
ab4d3021a2 Moves conference show #action to #edit action 2014-05-23 13:01:23 +02:00
Gopesh Tulsyan
322ddd1501 Merge pull request #148 from gopesht/splash_page 
Create view for splash page from existing routes
 2014-05-20 19:39:23 +05:30
Stella Rouzi
2e7eb7d367 Merge pull request #137 from differentreality/resources_registrations 
resources :registrations
 2014-05-19 22:27:47 +03:00
Gopesh Tulsyan
7a5f47257a Create view for splash page from existing routes 2014-05-19 21:21:06 +05:30
Christian Bruckmayer
e11ad83b32 Merge pull request #147 from ChrisBr/sp_registration 
Implements strong parameters for registration controller
 2014-05-19 13:38:41 +02:00
Chrisbr
074ca56cb2 Implements strong parameters for registration controller 2014-05-19 13:01:07 +02:00
Chrisbr
04c00e4b0c Implements devise strong parameters for registration 2014-05-16 20:31:41 +02:00
Stella Rouzi
e921e4da22 new Ruby 1.9 hash syntax 2014-05-15 21:04:08 +03:00
Stella Rouzi
544146e7a9 houndci fixes 2014-05-15 20:55:27 +03:00
Stella Rouzi
7490316a5b resources :registrations 2014-05-15 20:30:01 +03:00
Chrisbr
3d534ff7ba Refactoring alert message for conference controller 2014-05-14 13:58:01 +02:00
Henne Vogelsang
f6088e9abe Merge pull request #117 from hennevogel/callforpapers 
Fix the callforpapers routing and some styling issues
 2014-05-14 11:29:53 +02:00
Christian Bruckmayer
e8b9c26778 Merge pull request #113 from ChrisBr/feature_tests 
tests
 2014-05-13 15:54:18 +02:00
Henne Vogelsang
02691f8bf9 Fix call for papers validation 2014-05-13 15:46:35 +02:00
Chrisbr
05392701a9 Send registration mail only if email settings true 2014-05-13 14:50:29 +02:00
Henne Vogelsang
e4c19ab1f6 Fix the callforpapers routing and some styling issues 2014-05-13 14:17:39 +02:00
Chrisbr
70b114586b Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests 2014-05-13 11:13:49 +02:00
Christian Bruckmayer
59a503a42d Merge pull request #115 from ChrisBr/fix_confirm_event 
Fix accept event workflow
 2014-05-13 11:13:32 +02:00
Chrisbr
86c188a38a Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests 2014-05-12 21:16:00 +02:00
Chrisbr
b94b5a4c75 Adds conference update errors to flash 
- fix tests
 2014-05-12 21:15:33 +02:00
Chrisbr
2ca99e7ab9 Fix accept event workflow 2014-05-12 18:35:28 +02:00
Chrisbr
980eb9f6bc Changed not to exclamation mark 2014-05-12 17:22:48 +02:00
Artem Chernikov
9090cc0d38 Merge pull request #95 from alter/master 
Fixed /admin/users
 2014-05-12 17:20:21 +02:00
alterpub
d2ac8a30c0 redesigned fix 2014-05-12 17:53:07 +04:00
Chrisbr
9e831cb514 Merge with master 2014-05-12 15:26:46 +02:00
Chrisbr
d97e3603b1 Merge with master 2014-05-12 15:26:18 +02:00
Chrisbr
27f35a49c6 Fix create conference form 
- adds HTML 5 validations
 2014-05-12 14:38:55 +02:00
Chrisbr
c742e57534 Fix Hound CI violations 2014-05-10 18:02:29 +02:00
Chrisbr
12e6fd9cb5 Bugfix to pass feature test 
- check if session[:return_to] is nil
- adds unique html ids for dropdown login fields
 2014-05-10 17:52:26 +02:00
Chrisbr
546977fc02 Fix Hound CI violations 2014-05-10 10:24:58 +02:00
Chrisbr
0661b86b1c Bugfix for Conference Controller update 2014-05-09 14:44:18 +02:00
alter
42d65aef23 Update users_controller.rb 2014-05-05 02:49:35 +04:00
alter
7c57675693 Update users_controller.rb 2014-05-05 02:44:08 +04:00
alterpub
0eb82bb11f Fixed /admin/users 
ArgumentError in Admin::UsersController#index
wrong number of arguments (1 for 0)

Rails 4 has depricated "all" method, now it's default behaviour
 2014-05-05 02:28:46 +04:00
Artem Chernikov
a425d1c6e4 As exception is used - we need to interpolate this string 2014-04-30 16:11:34 +02:00
Chrisbr
b095064108 Fix eventtypes form 2014-04-30 10:47:33 +02:00
Chrisbr
8154e6f72c Fixes Hound CI violations 2014-04-28 21:42:09 +02:00
Chrisbr
169fab5c31 Fixes cfp form 2014-04-28 20:52:02 +02:00
Chrisbr
ba2051afc7 Fixes email settings form 2014-04-28 20:31:44 +02:00
Chrisbr
810908089e Refactoring: Removes not necessary named parameters 2014-04-28 20:25:43 +02:00
Chrisbr
229581efc3 Fixes eventtype form 2014-04-28 20:08:06 +02:00
Chrisbr
c67b255e05 Fixes tracks form 2014-04-28 20:01:20 +02:00
Chrisbr
c4fbf8d038 Fixes rooms form 2014-04-28 19:58:49 +02:00
Chrisbr
ec0543ef3b dropped first() 2014-04-27 17:38:30 +02:00
Chrisbr
fbda757e70 Replaced find_all_by through find_by 
Find_by_all is removed in Rails 4.1
 2014-04-27 16:27:29 +02:00
Henne Vogelsang
aa17d6ea6f Merge pull request #64 from differentreality/fix_no_bio 
save person attributes first
 2014-04-23 15:04:55 +02:00
Stella
5e881faef2 fix controller (find and json output). Now attachments get listed (no preview though) 2014-04-21 21:13:25 +03:00
Stella
735d1ef7d2 save person attributes first 2014-04-19 16:42:52 +03:00
Henne Vogelsang
e3fd0c195a First tests in rspec, with factory_girl 2014-04-09 13:18:11 +02:00
Henne Vogelsang
c261876ce0 Merge pull request #51 from gopesht/delete_users 
Admin able to delete users except admins
 2014-04-09 12:11:48 +02:00