Gopesh Tulsyan
|
d1e9bd06a6
|
View specs, added factories, fixed bugs
|
2014-05-21 16:20:02 +05:30 |
|
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 |
|
Christian Bruckmayer
|
7cf139cc9b
|
Merge pull request #145 from ChrisBr/remove_gravater_alt
Removes gravater alt text
|
2014-05-19 13:16:26 +02:00 |
|
Chrisbr
|
074ca56cb2
|
Implements strong parameters for registration controller
|
2014-05-19 13:01:07 +02:00 |
|
Chrisbr
|
8e0b9193e2
|
Removes gravater alt text
|
2014-05-19 11:20:11 +02:00 |
|
Christian Bruckmayer
|
c78a09cc53
|
Merge pull request #143 from ChrisBr/bugfix_account_edit
Implements devise strong parameters for registration
|
2014-05-19 11:18:00 +02:00 |
|
Chrisbr
|
04c00e4b0c
|
Implements devise strong parameters for registration
|
2014-05-16 20:31:41 +02:00 |
|
Chrisbr
|
6ac8f6fd7a
|
fix flash css classes
|
2014-05-16 19:52: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 |
|
Gopesh Tulsyan
|
86b007d60e
|
Fixed admin/users modal display
|
2014-05-15 17:47:34 +05:30 |
|
Christian Bruckmayer
|
c9b65e9a5d
|
Merge pull request #122 from ChrisBr/conference_alert
Conference alert
|
2014-05-15 13:16:29 +02:00 |
|
Chrisbr
|
17307736e8
|
Removes rating desc column from cfp
|
2014-05-14 16:37:19 +02: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 |
|
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 |
|