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
Henne Vogelsang
206c3a8144
Merge pull request #636 from bgeuken/cleanup_get_progress
...
Cleanup get progress
2015-04-20 17:20:09 +02:00
Stella Rouzi
3b8c91bbd9
fix scrolling of left column in schedule, show only @conference.events
2015-04-20 13:17:47 +03:00
Björn Geuken
8250e1305e
event: refactor get_state_color method
2015-04-17 16:38:03 +02:00
Björn Geuken
82edf7870a
event: refactor as_json method and add a test
2015-04-17 16:38:01 +02:00
Björn Geuken
80f8bba951
Refactor abstract_word_count method
2015-04-17 16:27:47 +02:00
Björn Geuken
9f3da955f0
Move default value into else branch and remove superfluous variable
2015-04-17 16:27:44 +02:00
Björn Geuken
650a49d87b
Update method documentation (returns a string not an fixnum)
2015-04-17 14:46:25 +02:00
Björn Geuken
ac0abce6e1
Small refactoring of calculate_setup_progress, part II
2015-04-17 14:46:21 +02:00
Björn Geuken
28669ac635
get_progress: align case and when as rubocop
2015-04-17 14:19:32 +02:00
Björn Geuken
e9ba87a49c
get_progress: cleanup case statement
2015-04-17 12:26:10 +02:00
Björn Geuken
eea7d94223
get_progress: Move default value into else branch
2015-04-17 12:26:03 +02:00
Björn Geuken
db59fa096c
get_progress: Turn if condition into switch
2015-04-17 12:25:57 +02:00
Björn Geuken
83bf6a512d
get_progress: simplify percentage generation
2015-04-17 12:25:50 +02:00
Björn Geuken
d910a0f532
Small refactoring of calculate_setup_progress
2015-04-17 12:21:52 +02:00
Henne Vogelsang
751bf4eb42
Merge pull request #634 from differentreality/hackweek_proposal_workflow
...
Refactoring of proposal workflow. Fixes #215
2015-04-17 10:40:59 +02:00
Stella Rouzi
e6bb168c5e
Refactoring of proposal workflow. Fixes #215
2015-04-16 18:37:31 +03:00
Stella Rouzi
333c5e39bf
Merge pull request #630 from hennevogel/master
...
Last stage of refactoring of the ability model and spec
2015-04-15 12:00:46 +03:00
Henne Vogelsang
9e0c871494
Fix rubocop warnings and User index bug
2015-04-15 10:23:24 +02:00
Henne Vogelsang
6a5cccbaad
Last stage of refactoring of the ability model and spec
2015-04-14 17:33:59 +02:00
Henne Vogelsang
762985b83d
Merge pull request #629 from ChrisBr/refactoring_new
...
First stage of refactoring of the ability model and spec
2015-04-14 09:45:15 +02:00
chrisbr
ac1d9fd329
First stage of refactoring of the ability model and spec
2015-04-14 08:31:52 +02:00
Henne Vogelsang
6d5d969347
Merge pull request #628 from ChrisBr/update_redcarpet
...
Update redcarpet CVE#46916
2015-04-13 14:43:28 +02:00
chrisbr
6f64602d85
Redirect to registration edit page when user is already registered
2015-04-11 09:37:28 +02:00
chrisbr
a47c84dfbb
Update redcarpet CVE#46916
2015-04-11 09:33:08 +02:00
Stella Rouzi
3bd82039ad
Merge pull request #621 from differentreality/subscription_authorization
...
no authorization for Conference in subscriptions controller
2015-04-01 11:49:40 +03:00
Stella Rouzi
0e8bdfcb56
no authorization for Conference, as it's being authorized with read action which includes index and show actions, however action show is authorized only for Conference with public splashpage
2015-03-28 13:24:21 +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
ff124632ef
Merge pull request #611 from shayonj/dashboard-status-minutes-fix
...
Fixing functions for minutes to hours conversion for dashboard
2015-03-16 12:20:51 +01:00
