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
1285 commits 15 branches 2 tags 50 MiB
Commit graph

1285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
a9f806ca39 Merge pull request #674 from differentreality/dasboard_todo_venu_link 
Edit link for venue in dashboard TODO list
 2015-06-12 12:36:16 +03:00
Stella Rouzi
0013a3a814 Merge pull request #639 from differentreality/devise_partials 
Move common views to partial
 2015-06-12 12:30:51 +03:00
Stella Rouzi
b57e5a64fe Merge pull request #670 from differentreality/users_changes 
Users changes
 2015-06-12 10:46:28 +03:00
Stella Rouzi
529a75eee6 Edit link for venue in dashboard TODO list 2015-06-12 10:34:31 +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
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
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