Commit graph

818 commits

Author SHA1 Message Date
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
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
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
Shayon Mukherjee
54bcc89204 Refactored nested comments. Now using partial to load them 2015-02-27 12:29:18 -06:00
Henne Vogelsang
3cb569ad88 Fix some email template links 2015-02-27 13:37:40 +01:00
Sameer Deshmukh
ee3def430e replace if-else with case-when
replaced if-else with case-when

slight update
2015-02-27 11:28:20 +05:30
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
44f693a093 fix height of switch 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 Rouzi
2dd326c8b9 show only confirmed events as highlights 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
01c57d0b53 Merge pull request #570 from ChrisBr/email_variables
Fix email variables (close #569)
2014-12-18 12:53:44 +01:00