gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
495 commits 2 branches 2 tags 50 MiB
Commit graph

343 commits

Author SHA1 Message Date
Gopesh Tulsyan
830193bdca Merge e49906f342 into e11ad83b32 2014-05-19 15:03:52 +00:00
Gopesh Tulsyan
e49906f342 Removed header links from conference#show 2014-05-19 20:33:33 +05:30
Gopesh Tulsyan
894ca542c0 Removed header links 2014-05-19 20:33:02 +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
Gopesh Tulsyan
aa539b2cf0 single quotes 2014-05-17 08:31:07 +05:30
Gopesh Tulsyan
de3701fce7 single quotes 2014-05-17 08:30:56 +05:30
Gopesh Tulsyan
443ee19760 Added ids to links in conference#show 2014-05-17 08:29:33 +05:30
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
Gopesh Tulsyan
2d01bcad17 fixes done 2014-05-16 21:01:03 +05:30
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
Gopesh Tulsyan
4778564e3e fixes done as suggested 2014-05-15 11:03:28 +05:30
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
Gopesh Tulsyan
1c152c87ab Create Splash Page using existing routes as Conference#Show 2014-05-14 13:16:08 +05:30
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