James Mason
9e39fedf05
Merge pull request #177 from gopesht/add_tickets_to_registration_segment
...
Add tickets to registration segment
2014-05-29 13:18:19 -07:00
Gopesh Tulsyan
e2fd1bbd69
Add tickets to registration segment
2014-05-30 00:31:12 +05:30
Gopesh Tulsyan
abfb0884a1
Added registration segment to display description, period
...
Controller test for Conference#show
houndci fixes
Rebased with single entry for navigation branding
Conditional rendering of splash navbar
2014-05-30 00:30:09 +05:30
Gopesh Tulsyan
1e802bc3c6
Added description to conference and program segment to splash
...
Added tracks to program component
Rebased and updated the new navigation for splash
2014-05-30 00:20:44 +05:30
Gopesh Tulsyan
b3d719829e
Added description to conference and program segment to splash
...
removed id from program partial
2014-05-29 23:57:35 +05:30
Gopesh Tulsyan
f825599433
Conditional rendering of splash navbar
2014-05-29 11:24:54 -07:00
James Mason
b023459600
Use a single entry for navigation branding:
...
Allow a view to override the brand (esp. for conference splash pages),
Use the app name link for the admin control panel,
use the conference short title for end user content within a conference,
fall back to the app name link.
Visually, there are two substantial changes:
(1) the conference title (or short title) serves as the brand when viewing
conference content;
(2) the short title isn't shown redundantly on the navbar and the top of the
sidebar when editing a conf.
2014-05-28 13:52:15 -07:00
Christian Bruckmayer
b6538cddb2
Merge pull request #171 from ChrisBr/bugfix_sidebar
...
Removes new conference link form loop
2014-05-28 14:25:15 +02:00
Chrisbr
dc080705ae
Adds color attribute to conference
2014-05-28 13:40:58 +02:00
Chrisbr
d1d75e97a4
Removes new conference link form loop
2014-05-28 13:31:42 +02:00
Chrisbr
cd83cb2f8f
Renmanes Conference edit link to Settings in admin menu
2014-05-23 16:49:34 +02:00
Christian Bruckmayer
b97b48b1eb
Merge pull request #156 from ChrisBr/remove_admin_dd
...
Removes admin from dropdown
2014-05-23 15:07:16 +02:00
Christian Bruckmayer
e9e3dad431
Merge pull request #155 from ChrisBr/dd_admin
...
Dropdown shows now context
2014-05-23 15:07:08 +02:00
Chrisbr
a9814146ff
Removes admin from dropdown
2014-05-23 14:30:59 +02:00
Chrisbr
cd8e8a5c7e
Dropdown shows now context
2014-05-23 14:19:57 +02:00
Chrisbr
ab4d3021a2
Moves conference show #action to #edit action
2014-05-23 13:01:23 +02:00
Chrisbr
89fb059aaa
New admin menu
2014-05-22 18:19:07 +02:00
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
Chrisbr
8e0b9193e2
Removes gravater alt text
2014-05-19 11:20:11 +02: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
Chrisbr
17307736e8
Removes rating desc column from cfp
2014-05-14 16:37: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
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
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
Chrisbr
656ded9d96
Implements feature test for proposal workflog
...
- submitt proposal
- accept proposal
- confirm proposal
2014-05-13 15:45:39 +02:00
Chrisbr
0db2f3bb06
Bugfix send accept / reject event mail
2014-05-13 15:24:21 +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
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
