gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1255 commits 15 branches 2 tags 50 MiB
Commit graph

1255 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Christian Bruckmayer
511007138a Merge pull request #612 from ChrisBr/program 
Implements program section for unscheduled events
 2015-03-09 15:47:38 +01:00
chrisbr
232cc249d4 Implements program section for unscheduled events 
close #610
 2015-03-09 15:31:06 +01:00
Henne Vogelsang
c7271780f2 Add creation/update times to qanswers 2015-03-04 15:10:11 +01:00
Shayon Mukherjee
37164e3694 Fixing functions for minutes to hours conversion for dashboard 2015-03-02 11:36:42 -06:00
Henne Vogelsang
0894d9ec29 Merge pull request #604 from shayonj/format-comments-partial 
Refactored nested comments. Now using partial to load them
 2015-03-02 11:10:25 +01:00
Shayon Mukherjee
54bcc89204 Refactored nested comments. Now using partial to load them 2015-02-27 12:29:18 -06:00
Henne Vogelsang
cc66027220 Update rest-client to fix OSVDB-117461 2015-02-27 13:56:32 +01:00
Henne Vogelsang
3cb569ad88 Fix some email template links 2015-02-27 13:37:40 +01:00
Henne Vogelsang
59257c85c5 Merge pull request #602 from v0dro/replace-with-case 
replaced if-else with case-when
 2015-02-27 11:53:00 +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
Christian Bruckmayer
af8a653fbb Merge pull request #596 from openSUSE/update_nio4r 
Updates nio4r to 1.1
 2015-02-10 12:15:24 +01:00