Commit graph

323 commits

Author SHA1 Message Date
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
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
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
Henne Vogelsang
e4c19ab1f6 Fix the callforpapers routing and some styling issues 2014-05-13 14:17:39 +02:00
Chrisbr
147310b8b7 Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2 2014-05-13 13:43:06 +02:00
Gopesh Tulsyan
db79ad3e08 Refactoring home#index 2014-05-13 15:34:35 +05:30
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
25ad5b7409 fix hound ci violations 2014-05-13 11:12:53 +02:00
Chrisbr
132bb89556 fix hound ci violations 2014-05-13 10:39:03 +02:00
Chrisbr
84843ade48 refactoring setup_roles and updated tests 2014-05-13 10:35:23 +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
645d525bdd removed :email field from delegate 2014-05-12 18:22:41 +04: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
Artem Chernikov
374efd311f Merge pull request #93 from differentreality/proposal_show
Show more information in proposal page
2014-05-12 14:58:30 +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
7e7dadac88 Fix Hound CI violations 2014-05-10 16:09:24 +02:00
Chrisbr
1976276d4d Bugfix to pass user model tests 2014-05-10 15:58:02 +02:00
Chrisbr
8aa68fb84a Installs database cleaner
- preparation for feature tests with capybara
see:
http://devblog.avdi.org/2012/08/31/configuring-database_cleaner-with-rails-rspec-capybara-and-selenium/
2014-05-10 15:55:17 +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
Stella
b4425128e6 Mention if registration is required 2014-05-02 22:52:58 +03:00
Stella
8be5750382 show speaker's email 2014-05-02 22:52:11 +03:00
Stella
c5c240888c Add details of proposal in show page 2014-05-02 21:58:55 +03:00
Stella
1840a858b7 button to link to schedule 2014-05-02 21:40:42 +03:00
Stella
fdd5b6cb95 Add 'edit button' in proposal show 2014-05-02 21:33:43 +03:00
Artem Chernikov
a425d1c6e4 As exception is used - we need to interpolate this string 2014-04-30 16:11:34 +02:00
Artem Chernikov
57ad1432a5 Update form to hot new path 2014-04-30 16:10:49 +02:00