Stella Rouzi
04e9f77138
Remove redundant code.
2015-06-11 15:37:00 +03:00
Stella Rouzi
bd79719054
style
2015-06-11 15:22:54 +03:00
Stella Rouzi
2b433a9cbe
make @user definition more clear
2015-06-11 15:20:48 +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
b8313aa064
Styling
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
c972731e20
Small refactoring of get_status & self.get_event_state_line_colors
2015-05-28 10:38:38 +02:00
Björn Geuken
12fa985fff
conference: refactor some conditions
2015-05-27 16:06:17 +02:00
Björn Geuken
5a5745947d
Simplify cfp_open? method
2015-05-27 16:06:17 +02:00
Björn Geuken
c58585d445
cleanup: if !object.nil? -> if object
2015-05-27 16:06:17 +02:00
Björn Geuken
a1d022d0be
Refactor user_registered? method
2015-05-27 16:06:14 +02:00
Björn Geuken
3e77241f8a
user_registered: Return false if user is nil
...
The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
2015-05-27 16:02:01 +02:00
Björn Geuken
e334a6dec3
Add a test for user_registered?
2015-05-27 16:02:00 +02:00
Björn Geuken
f180ce0d27
Refactor registration_open? method, part II
2015-05-21 19:16:02 +02:00
Björn Geuken
0d8a77c9ef
Refactor registration_open? method
...
The registration_period is already checked in registration_dates_given?
method. No need to check it twice
2015-05-21 19:16:02 +02:00
Björn Geuken
bc966259fb
Refactor registration_dates_given?
2015-05-21 19:16:01 +02:00
Björn Geuken
7638b33926
Fix registration_dates_given?
...
When the registration period is nil registration_dates_given? should return
false.
2015-05-21 19:16:01 +02:00
Henne Vogelsang
b15c1abd2e
Merge pull request #657 from bgeuken/calculate_progress
...
Calculate progress
2015-05-18 14:53:37 +02:00
Björn Geuken
ca7f1a3b25
Simplify progress calculation
2015-05-16 15:27:42 +02:00
Björn Geuken
1862534b2c
Avoid float conversion when calculating progress
2015-05-16 15:27:34 +02:00
Björn Geuken
5043d26cc5
Update comment of calculate_progress method
2015-05-16 15:17:20 +02: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
Henne Vogelsang
fc56c06991
Merge branch 'cwxda-master'
2015-05-07 11:38:20 +02:00
Tommy Jans
1cbda33564
osc15 ruby workshop fixing issue #650
2015-05-07 11:35:26 +02:00
Henne Vogelsang
01ba76e8c6
Merge pull request #638 from bgeuken/small_patches
...
Few things I stumbled over while waiting for tests to finish:)
2015-05-06 14:08:50 +02:00
Björn Geuken
68bbdb9fc9
Fix styling issue: " -> '
2015-05-05 14:04:26 +02:00
Henne Vogelsang
40e08b5624
Update edit.html.haml
2015-05-02 15:07:31 +02:00
Henne Vogelsang
d3e0066f88
Merge pull request #647 from hennevogel/master
...
Some more sign in/up & ichain stuff
2015-04-23 12:20:32 +02:00
Henne Vogelsang
132fe6f98c
Disable registration/event submission without sign in with ichain
2015-04-23 11:50:22 +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
8accc47bcc
Merge pull request #646 from differentreality/questions_users
...
show users per question
2015-04-23 12:22:52 +03: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
Christian Bruckmayer
9963c1550f
Merge pull request #627 from ChrisBr/redirect_registration
...
Redirect to registration edit page when user is already registered
2015-04-20 17:28:34 +02:00
Stella Rouzi
6eef0c1ca7
Merge pull request #643 from differentreality/events_json
...
fix scrolling of left column in schedule, show only @conference.events
2015-04-20 18:26:25 +03:00
Henne Vogelsang
b2c7d9be99
Merge pull request #617 from sonalkr132/hakiri_dos
...
solves DOS on hakiri
2015-04-20 17:23:24 +02:00
Henne Vogelsang
6cc8c1e5c2
Merge pull request #635 from bgeuken/refactor_calculate_progress
...
Refactor calculate progress
2015-04-20 17:21:15 +02:00
