mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-05-06 22:52:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
492 Commits 18 Branches 2 Tags
d1e9bd06a644f8b2dfd92e08ed55579fdde560e0
Commit Graph

103 Commits

Author SHA1 Message Date
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
Henne Vogelsang
02691f8bf9 Fix call for papers validation 2014-05-13 15:46:35 +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
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
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
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
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
Henne Vogelsang
8f222db0bb Merge pull request #52 from gopesht/fix_supporter_page 
fixed supporter page redirect after creation
 2014-04-09 12:09:55 +02:00
Gopesh Tulsyan
dd9640b90b Fixed Bug for checking presence of email template before sending mails 2014-04-04 15:43:36 +05:30
Gopesh Tulsyan
f4b6ff56c6 fixed supporter page redirect after creation 2014-03-28 00:11:08 +05:30
Gopesh Tulsyan
481fcc9f60 Admin able to delete users except admins 2014-03-27 20:14:52 +05:30
Henne Vogelsang
24e40a5c90 Merge pull request #41 from differentreality/stats_update 
Move events stats in Statistics, add ticket distribution
 2014-03-17 16:36:03 +01:00
Stella
2e1dcd33fe Move events stats in Statistics, add ticket distribution 2014-03-09 16:16:22 +02:00
Stella
8f8824ecd6 fix registration page, only show volunteering tab if option is enabled for the conference 2014-03-04 22:22:52 +02:00
Henne Vogelsang
04e06ac251 Remove question fields from speaker statistics 2014-03-04 10:41:38 +01:00
Henne Vogelsang
5b05ffbd56 Rename the volunteers to match the other config routes 2014-03-04 10:30:23 +01:00
Henne Vogelsang
14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
 2014-03-03 10:52:24 +01:00
Henne Vogelsang
243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions 
Conflicts:
	app/models/conference.rb
	config/routes.rb
 2014-03-03 10:43:38 +01:00
Henne Vogelsang
4ed72d4967 Merge pull request #33 from differentreality/final_difficulty_levels 
Add difficulty levels
 2014-03-03 10:40:21 +01:00
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00
Stella
52543589e4 voting visual changes 2014-02-23 14:56:09 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00