Commit graph

542 commits

Author SHA1 Message Date
Christian Bruckmayer
244ea9d34a Merge pull request #708 from raluka/remaining_days
Issue #649: Wrong days remaining label when submitting a new proposal
2015-08-28 13:27:42 +02:00
raluka
1de8f979cd Issue #649: Wrong days remaining label when submitting a new proposal 2015-08-27 10:35:43 +02:00
Stella Rouzi
2a6ca7b0ff Fix ordering for event.average_voting in events#index 2015-08-06 07:41:20 +03:00
raluka
3df77c84f6 Issue#690: fixed Attendance Button 2015-07-15 12:44:08 +02:00
Stella Rouzi
124d275a09 Merge pull request #671 from differentreality/registrations_xls
Remove redundant code.
2015-07-02 21:27:15 +03:00
Stella Rouzi
8567a997cb Merge pull request #679 from differentreality/switch
Rework bootstrapSwitch
2015-07-02 13:08:16 +03:00
Stella Rouzi
ebadb84f2f Fix longitude latitude order 2015-06-17 22:08:18 +03:00
Christian Bruckmayer
491df2c5c6 Merge pull request #687 from meonkeys/fix-start-date-typo
fix "End Date" typo on Call for Papers show
2015-06-17 12:08:54 +02:00
Adam Monsen
279817d57d fix "End Date" typo on Call for Papers show 2015-06-16 21:26:15 -07:00
Christian Bruckmayer
a80e3d814e Merge pull request #656 from bgeuken/make_schedules_links
Make talks on schedules table real links
2015-06-15 22:06:33 +02:00
Stella Rouzi
53f0606ac1 Rework bootstrapSwitch 2015-06-14 22:28:33 +03: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
04e9f77138 Remove redundant code. 2015-06-11 15:37:00 +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
Björn Geuken
b685628208 Remove superflous condition
We ensured that the event has a track in the condition 3 lines above. Thus
we can remove this one.
2015-05-16 15:00:21 +02:00
Björn Geuken
94bb76f5ec Haml'fy schedule_item partial 2015-05-16 15:00:17 +02:00
Björn Geuken
7309782b05 TypoFix: <span> -> </span> 2015-05-16 14:50:12 +02:00
Björn Geuken
02e6f78153 Handle talks on the scheduler table as links
Previously the link functionality (open in window or tab) of those talks was
done via javascript. Because of that they couldn't be selected via right click
to be opened in a tab, copied or bookmarked.

By embedding the talk items into a link element and adding some css to hide
the link effects, like hover and underline, we get the desired behaviour
without changing it's appearance.
2015-05-15 17:52:51 +02:00
Björn Geuken
93135a6085 Move view for proposals on schedule board into a partial 2015-05-15 17:27:22 +02:00
Björn Geuken
1731625153 Remove superflous span element
At least firefox and chrome doesn't even render it
2015-05-15 17:22:46 +02:00
Björn Geuken
54f86a3212 Replace tabs by whitespaces and fix indentation 2015-05-15 17:20:38 +02: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