Commit graph

216 commits

Author SHA1 Message Date
Chrisbr
656ded9d96 Implements feature test for proposal workflog
- submitt proposal
- accept proposal
- confirm proposal
2014-05-13 15:45: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
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
2ca99e7ab9 Fix accept event workflow 2014-05-12 18:35:28 +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
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
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
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
Stella
5e881faef2 fix controller (find and json output). Now attachments get listed (no preview though) 2014-04-21 21:13:25 +03:00
Henne Vogelsang
bacae17b87 One more place media types are configured... 2014-04-14 18:15:20 +02:00
Henne Vogelsang
a8179c87e8 Fix all glyphicons 2014-04-14 18:10:38 +02:00
Henne Vogelsang
980eb3b831 Only show the conf media if it's set 2014-04-14 16:39:45 +02:00
Henne Vogelsang
633fff59d8 Add conference wide media, fix proposal#show view 2014-04-14 16:25:17 +02:00
Henne Vogelsang
accd7d1a58 Starting to document things with rdoc 2014-04-09 13:18:11 +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
628211f0fc Merge pull request #50 from differentreality/logo_missing
avoid missing image icon, in home page, when there is no conference logo
2014-03-27 14:21:02 +01:00
Henne Vogelsang
997df20ed0 Check for existence of the CFP before showing ratings 2014-03-27 14:20:22 +01:00
Christian Bruckmayer
1c8961fa75 Fix mixed content issue 2014-03-25 23:09:40 +01:00
Stella
ecc516b802 avoid missing image icon 2014-03-25 11:30:17 +02:00
Christian Bruckmayer
cbb4b40bc0 Implement more embed code
Supported Media Files:
- Youtube
- Vimeo
- Instagram
- Flickr
- Slidershare
- Speakerdeck

close #26
2014-03-21 16:04:51 +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