Commit graph

136 commits

Author SHA1 Message Date
Gopesh Tulsyan
d1e9bd06a6 View specs, added factories, fixed bugs 2014-05-21 16:20:02 +05:30
Stella Rouzi
7490316a5b resources :registrations 2014-05-15 20:30:01 +03:00
Gopesh Tulsyan
86b007d60e Fixed admin/users modal display 2014-05-15 17:47:34 +05:30
Chrisbr
17307736e8 Removes rating desc column from cfp 2014-05-14 16:37:19 +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
Chrisbr
edab06b253 Fix dropdown on event index page 2014-05-14 10:38:36 +02:00
Chrisbr
12fd3b7d5a Fix id in forloop 2014-05-13 16:45:43 +02:00
Chrisbr
53bc0a7dac Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2 2014-05-13 15:53:38 +02:00
Chrisbr
656ded9d96 Implements feature test for proposal workflog
- submitt proposal
- accept proposal
- confirm proposal
2014-05-13 15:45:39 +02:00
Chrisbr
0db2f3bb06 Bugfix send accept / reject event mail 2014-05-13 15:24:21 +02:00
Henne Vogelsang
e4c19ab1f6 Fix the callforpapers routing and some styling issues 2014-05-13 14:17:39 +02:00
Chrisbr
2ca99e7ab9 Fix accept event workflow 2014-05-12 18:35:28 +02:00
Chrisbr
27f35a49c6 Fix create conference form
- adds HTML 5 validations
2014-05-12 14:38:55 +02:00
Artem Chernikov
57ad1432a5 Update form to hot new path 2014-04-30 16:10:49 +02:00
Chrisbr
b095064108 Fix eventtypes form 2014-04-30 10:47:33 +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
4b401c4cea Fixes supporter level form 2014-04-28 20:19:10 +02:00
Chrisbr
e432b71fb7 Fixes social_events form 2014-04-28 20:14: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
fc11653f27 Fixes difficulty level form 2014-04-28 19:40:07 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
633fff59d8 Add conference wide media, fix proposal#show view 2014-04-14 16:25:17 +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
Stella Rouzi
688557b7cb show schedule in home page only if it is set as public 2014-04-02 20:07:42 +03:00
Stella
dd93d0ad48 fix unless statement 2014-03-30 13:28:42 +03:00
Gopesh Tulsyan
f4b6ff56c6 fixed supporter page redirect after creation 2014-03-28 00:11:08 +05:30
Gopesh Tulsyan
d38a1334ad Haml syntax modified 2014-03-28 00:00:21 +05:30
Gopesh Tulsyan
481fcc9f60 Admin able to delete users except admins 2014-03-27 20:14:52 +05:30
Henne Vogelsang
997df20ed0 Check for existence of the CFP before showing ratings 2014-03-27 14:20:22 +01:00
Henne Vogelsang
587126218d Update gems, use d3 gem, initial bootstrap v3 port 2014-03-17 16:42:19 +01:00
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
Henne Vogelsang
b64cc9f7e4 Merge pull request #38 from differentreality/supporters_title_error
show title of supporter level only if level exists
2014-03-17 16:35:29 +01:00
Henne Vogelsang
0f8cdf2b23 Merge pull request #37 from differentreality/questions_scrolling
Fix view of questions in Registrations
2014-03-17 16:35:15 +01:00
Henne Vogelsang
89cf40c2e2 Merge pull request #36 from differentreality/fix_rating_text
erase word rating, no bold
2014-03-17 16:34:47 +01:00
Stella
2e1dcd33fe Move events stats in Statistics, add ticket distribution 2014-03-09 16:16:22 +02:00
Stella
157b94c94e show title of supporter level only if level exists 2014-03-06 18:08:00 +02:00
Stella
299a882277 Fix view of questions in Registrations 2014-03-06 17:31:58 +02:00
Stella
fdd0195232 erase word rating, no bold 2014-03-04 23:35:34 +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
0982be8579 Simplify sidebar and navigation
Check existence of supporter levels
2014-03-04 10:10:07 +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
68c119b443 fixed table width, no td in index if no voting options 2014-03-02 10:36:22 +02:00
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00