Commit graph

524 commits

Author SHA1 Message Date
Rob Smith
24db130c92 Allow a proposal to be created with a Subtitle and Difficulty Level.
When a proposal is being submitted, we want to allow the submitter to
fill out the form once with all the required data. This change unifies
the forms for both editing and creating proposals. This allows us to
ensure that features are added in parallel to both workflows.

We also reduce the number of duplicate lines by removing duplicates
from the new.html.haml file.

We also increase the column size in css to have both pages show the
same width forms.
2015-06-14 01:57:52 -07:00
Stella Rouzi
a9f806ca39 Merge pull request #674 from differentreality/dasboard_todo_venu_link
Edit link for venue in dashboard TODO list
2015-06-12 12:36:16 +03:00
Stella Rouzi
0013a3a814 Merge pull request #639 from differentreality/devise_partials
Move common views to partial
2015-06-12 12:30:51 +03:00
Stella Rouzi
529a75eee6 Edit link for venue in dashboard TODO list 2015-06-12 10:34:31 +03:00
Stella Rouzi
30831ce718 Add styling to passwords and confirmations 2015-06-11 15:20:48 +03:00
Stella Rouzi
28143a8cce keep fields reference in devise new registration 2015-06-11 15:20:48 +03:00
Stella Rouzi
969c24c091 Move common views to partial 2015-06-11 15:20:48 +03:00
Stella Rouzi
393f26c679 De-activate buttons in registrations#show when conference has ended, so that user cannot edit registration details after the conference is over. 2015-06-11 15:15:02 +03:00
Stella Rouzi
fcca0e71d2 show label of confirmed or unconfirmed in users#show 2015-06-11 15:13:18 +03:00
Stella Rouzi
bc2b262510 add username and nickname in user#show and styling changes 2015-06-11 15:13:03 +03:00
Stella Rouzi
93bbd0ea0d td width with col-md 2015-06-11 13:31:03 +03:00
Stella Rouzi
1890aece1d remove datatable error in admin/users#index due to submissions table 2015-06-11 13:30:08 +03:00
Tommy Jans
1cbda33564 osc15 ruby workshop fixing issue #650 2015-05-07 11:35:26 +02:00
Henne Vogelsang
40e08b5624 Update edit.html.haml 2015-05-02 15:07:31 +02:00
Henne Vogelsang
4ed8a72967 Widen the sign-in menu a bit 2015-04-23 11:23:20 +02:00
Henne Vogelsang
c3330a846f Always show the Update button for registrations 2015-04-23 11:23:20 +02:00
Stella Rouzi
ef96da7144 include questions in registrations pdf and xls 2015-04-23 12:07:11 +03:00
Stella Rouzi
3b8b86eb85 show users per question 2015-04-22 18:55:51 +03:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Henne Vogelsang
9e0c871494 Fix rubocop warnings and User index bug 2015-04-15 10:23:24 +02:00
Henne Vogelsang
defef46ae8 Merge pull request #615 from hennevogel/master
Implements sign up during registration. Solves most of #215
2015-03-26 14:30:14 +01:00
Christian Bruckmayer
07049d61f8 Merge pull request #618 from sonalkr132/broken_link
removed broken add user link on admin/users
2015-03-16 12:18:55 +01:00
Aditya Prakash
fb457da675 removed broken add user link on admin/users 2015-03-15 19:28:28 +05:30
Henne Vogelsang
e8ab94e1c7 Implements sign up during registration. Solves most of #215 2015-03-12 23:53:57 +01:00
chrisbr
232cc249d4 Implements program section for unscheduled events
close #610
2015-03-09 15:31:06 +01:00
Shayon Mukherjee
54bcc89204 Refactored nested comments. Now using partial to load them 2015-02-27 12:29:18 -06:00
Henne Vogelsang
93a09b729e Adapt the ticket text to be more precise 2015-02-18 14:54:18 +01:00
Henne Vogelsang
01f96e27e0 Merge pull request #585 from hennevogel/master
Correct Transifex API key parsing. Fixes #573
2015-02-02 13:36:06 +01:00
Stella Rouzi
6076e29733 Merge pull request #562 from differentreality/highlights_cfp
add highlights and fix cfp in splashpage
2015-01-22 20:40:24 +02:00
Gopesh Tulsyan
dc05cc83ac Merge pull request #580 from openSUSE/refactor_email_settings
Refactor Admin Email Settings Form
2015-01-22 00:49:19 +05:30
Stella
fbdec2a58e fix sorting in events#index with button functionality and add color/text to switch buttons 2015-01-21 20:12:57 +02:00
Stella
b8b3703175 fix table sorting in admin/events#index 2015-01-21 17:28:19 +02:00
Stella
8fab09e63b proposal creation: only show is_highlight for organizers or cfp 2015-01-21 17:28:18 +02:00
Stella Rouzi
a845dd5d7d add bootstrap-switch for is_highlight 2015-01-21 17:28:18 +02:00
Stella
11d0a71231 fix controller update 2015-01-21 17:28:18 +02:00
Stella Rouzi
ecfc348ea8 add highlights and fix cfp in splashpage 2015-01-21 17:28:18 +02:00
Christian Bruckmayer
8e25338436 Merge pull request #582 from ChrisBr/fix71
Events open now in new tab when clicking in schedule
2015-01-21 15:14:19 +01:00
Henne Vogelsang
e9f9f6524b Correct Transifex API key parsing. Fixes #573 2015-01-21 12:05:55 +01:00
Stella
80fbc144ac remove user deletion until further notice 2015-01-18 22:01:05 +02:00
chrisbr
5446c349c2 Events open now in new tab when clicking in schedule
close #71
2015-01-15 16:28:53 +01:00
Gopesh Tulsyan
327db11a8a Changing id tags for nav form 2015-01-15 11:12:57 +05:30
Gopesh Tulsyan
fc450b98ae Refactor Admin Email Settings Form 2015-01-15 11:09:08 +05:30
Stella Rouzi
bca62e6204 Merge pull request #564 from differentreality/speakers
Remove link to change speaker in Events list
2014-12-19 10:49:48 +02:00
Christian Bruckmayer
cc80fb10cb Merge pull request #567 from openSUSE/348
Adds dependent restricted association to some models
2014-12-18 15:00:18 +01:00
chrisbr
799fd0c3a4 Adds dependent restricted association to some models
fix #348
2014-12-18 13:38:40 +01:00
Christian Bruckmayer
5d2d728c9e Merge pull request #572 from ChrisBr/tickets
Fix ticket total price on each row
2014-12-18 12:53:37 +01:00
Henne Vogelsang
75b5594302 Disable transifex for now. It's Issue #573 now 2014-12-17 17:09:06 +01:00
chrisbr
0ea8228aa2 Fix ticket total price on each row 2014-12-17 16:56:31 +01:00
Henne Vogelsang
87b1aba1e9 Add conference description to the index view 2014-12-16 15:07:57 +01:00
Stella
d41988c74f Fix authorization 2014-12-11 13:17:11 +02:00