Commit graph

630 commits

Author SHA1 Message Date
Chrisbr
6ac8f6fd7a fix flash css classes 2014-05-16 19:52:41 +02:00
Stella Rouzi
7a209e10a7 Merge pull request #138 from differentreality/houndci
configure houndci to allow lines up to 100 chars
2014-05-16 15:59:49 +03:00
Stella Rouzi
7d921929a0 configure houndci to allow lines up to 100 chars 2014-05-15 21:25:29 +03: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
Gopesh Tulsyan
045e434f3d Merge pull request #134 from gopesht/fix_admin_dashboard_modal
Fixed admin/users modal display
2014-05-15 19:00:06 +05:30
Christian Bruckmayer
bf19cec236 Merge pull request #135 from ChrisBr/update_nokogiri
Updates nokogiri
2014-05-15 14:38:37 +02:00
Christian Bruckmayer
baf9e4f2fd Merge pull request #132 from ChrisBr/difficulty_levels_spec
Implements difficulty level feature test
2014-05-15 14:20:16 +02:00
Christian Bruckmayer
6cc9e16c73 Merge pull request #131 from ChrisBr/event_types_spec
Implements event types feature test
2014-05-15 14:20:05 +02:00
Chrisbr
799fba1321 Updates nokogiri 2014-05-15 14:18:33 +02:00
Gopesh Tulsyan
86b007d60e Fixed admin/users modal display 2014-05-15 17:47:34 +05:30
Christian Bruckmayer
7c7cbc0310 Merge pull request #130 from ChrisBr/tracks_spec
Implements tracks feature test
2014-05-15 13:49:04 +02:00
Christian Bruckmayer
9e1da20f79 Merge pull request #129 from ChrisBr/rooms_spec
Adds rooms feature test
2014-05-15 13:48:45 +02:00
Chrisbr
cbe1f8b96d Implements difficulty level feature test 2014-05-15 13:23:14 +02:00
Christian Bruckmayer
b06b64b3dd Merge pull request #133 from ChrisBr/supporter_levels_spec
Implements supporter levels feature test
2014-05-15 13:22:15 +02:00
Chrisbr
b282ce229c Implements event types feature test 2014-05-15 13:21:34 +02:00
Chrisbr
675f5e7895 Implements tracks feature test 2014-05-15 13:20:17 +02:00
Chrisbr
0f32960eed Adds rooms feature test 2014-05-15 13:18:31 +02:00
Christian Bruckmayer
5f174762b4 Merge pull request #127 from ChrisBr/email_test
Implements email feature test
2014-05-15 13:16:38 +02:00
Christian Bruckmayer
c9b65e9a5d Merge pull request #122 from ChrisBr/conference_alert
Conference alert
2014-05-15 13:16:29 +02:00
Christian Bruckmayer
60ca821419 Merge pull request #128 from ChrisBr/refactor_conf_spec
Refactoring conference feature test
2014-05-15 13:16:16 +02:00
Chrisbr
dceb5d37e5 Implements supporter levels feature test 2014-05-15 12:47:54 +02:00
Christian Bruckmayer
0caa62cacd Merge pull request #126 from ChrisBr/delete_cfp_rating_desc
Removes rating desc column from cfp
2014-05-15 11:56:45 +02:00
Christian Bruckmayer
c8ee5b0f77 Merge pull request #125 from ChrisBr/cfp_test
Implements cfp feature test
2014-05-15 11:33:19 +02:00
Christian Bruckmayer
d284455583 Merge pull request #124 from ChrisBr/fix_tests
Extended porposal feature test
2014-05-15 11:33:08 +02:00
Chrisbr
b533b1594f Refactoring conference feature test 2014-05-14 17:27:42 +02:00
Chrisbr
fcee4a0991 Implements email feature test 2014-05-14 17:08:46 +02:00
Chrisbr
17307736e8 Removes rating desc column from cfp 2014-05-14 16:37:19 +02:00
Chrisbr
cef4a7c49d Implements cfp feature test 2014-05-14 15:56:22 +02:00
Chrisbr
3d534ff7ba Refactoring alert message for conference controller 2014-05-14 13:58:01 +02:00
Chrisbr
77dc4b2a93 Extended porposal feature test 2014-05-14 13:52:54 +02:00
Christian Bruckmayer
a8c9c2f2d4 Merge pull request #123 from ChrisBr/fix_tests
fix failing tests
2014-05-14 13:33:50 +02:00
Chrisbr
f485f4ce57 fix failing tests 2014-05-14 13:18: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
Christian Bruckmayer
f01093196f Merge pull request #121 from ChrisBr/fix_dropdown
Fix dropdown on event index page
2014-05-14 11:20:21 +02:00
Chrisbr
edab06b253 Fix dropdown on event index page 2014-05-14 10:38:36 +02:00
Christian Bruckmayer
5f6ab4f7ee Merge pull request #119 from ChrisBr/event_workflow_test
Event workflow feature test
2014-05-13 17:57:06 +02:00
Gopesh Tulsyan
c3228f701a Merge pull request #116 from gopesht/refactor_home_page
Refactoring home#index
2014-05-13 21:17:18 +05:30
Chrisbr
12fd3b7d5a Fix id in forloop 2014-05-13 16:45:43 +02:00
Chrisbr
81a022776b Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2 2014-05-13 15:59:44 +02:00
Christian Bruckmayer
e8b9c26778 Merge pull request #113 from ChrisBr/feature_tests
tests
2014-05-13 15:54:18 +02:00
Chrisbr
53bc0a7dac Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2 2014-05-13 15:53:38 +02:00
Henne Vogelsang
02691f8bf9 Fix call for papers validation 2014-05-13 15:46:35 +02:00
Christian Bruckmayer
61aabe2531 Merge pull request #118 from ChrisBr/bugfix_emailsettings
Bugfix emailsettings
2014-05-13 15:46:31 +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
c7e5c73242 removes redundant self 2014-05-13 15:28:25 +02:00
Chrisbr
37430152c6 fix Hound CI violations 2014-05-13 15:27:43 +02:00
Chrisbr
0db2f3bb06 Bugfix send accept / reject event mail 2014-05-13 15:24:21 +02:00
Chrisbr
05392701a9 Send registration mail only if email settings true 2014-05-13 14:50:29 +02:00