Commit graph

843 commits

Author SHA1 Message Date
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
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
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
Henne Vogelsang
40e08b5624 Update edit.html.haml 2015-05-02 15:07:31 +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
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
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
6a5cccbaad Last stage of refactoring of the ability model and spec 2015-04-14 17:33:59 +02:00
chrisbr
ac1d9fd329 First stage of refactoring of the ability model and spec 2015-04-14 08:31:52 +02:00
chrisbr
6f64602d85 Redirect to registration edit page when user is already registered 2015-04-11 09:37:28 +02: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
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
Aditya Prakash
d11ebe96ff solve dos on hakiri 2015-03-15 19:06:38 +05:30
Henne Vogelsang
0ce4aa0a49 Fix the ability spec
* Get rid of the volunteer coordinator role, we don't use it currently
* Test the ability with users that exclusively have a single role
2015-03-13 00:43:09 +01:00
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
37164e3694 Fixing functions for minutes to hours conversion for dashboard 2015-03-02 11:36:42 -06:00