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

89 commits

Author SHA1 Message Date
Henne Vogelsang
243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions 
Conflicts:
	app/models/conference.rb
	config/routes.rb
 2014-03-03 10:43:38 +01:00
Henne Vogelsang
4ed72d4967 Merge pull request #33 from differentreality/final_difficulty_levels 
Add difficulty levels
 2014-03-03 10:40:21 +01:00
Stella
68c119b443 fixed table width, no td in index if no voting options 2014-03-02 10:36:22 +02:00
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00
Stella
0dbd513c8a Add no of voters in events index 2014-02-23 15:03:21 +02:00
Stella
52543589e4 voting visual changes 2014-02-23 14:56:09 +02:00
Stella Rouzi (differentreality)
f36eeb6469 fix removal of answers 2014-02-13 15:29:52 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00
Stella
8ca2e53430 show voting options only if rating is enabled (>0) 2013-12-28 16:20:00 +02:00
Stella
de1ed9be2b Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems. 2013-12-28 15:29:50 +02:00
Henne Vogelsang
0e1a6b9771 Show the supporter_level title, not the class 2013-10-22 15:56:44 +02:00
Henne Vogelsang
8aeeabebab Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats 2013-10-22 15:52:29 +02:00
Henne Vogelsang
52d1785a7c Fix managing user roles 2013-10-22 14:16:20 +02:00
differentreality
87551e88f8 Create charts for registrations 
Conflicts:

	app/controllers/admin/stats_controller.rb
	app/views/admin/stats/index.html.haml
 2013-09-18 12:19:13 +03:00
differentreality
9cf5c59f28 final registrations stats 
Conflicts:

	app/views/admin/stats/index.html.haml
 2013-09-18 12:15:38 +03:00
differentreality
29d048ee7d Add length along with type title to differentiate between types with same name and different length 2013-09-04 13:49:30 +03:00
differentreality
d603d0830f fix events stats table 2013-09-04 13:49:29 +03:00
Henne Vogelsang
6c050ccbc2 Merge pull request #41 from differentreality/stats_fix 
Fixing some numbers there
 2013-09-03 02:42:05 -07:00
differentreality
e6b7fbceb5 fix 2013-09-02 16:38:43 +03:00
differentreality
a0dc62b125 Changes based on comments 2013-09-02 16:15:02 +03:00
differentreality
aaa77bb893 allow stars from 1 to 10, 1 star being the default 2013-09-02 15:58:09 +03:00
differentreality
e3828c0a74 wording 2013-08-16 16:11:53 +03:00
differentreality
1d59c05591 fix rebase conflict 2013-08-16 16:11:21 +03:00
differentreality
69efd2619a fix rebase conflict 2013-08-16 16:08:38 +03:00
differentreality
96d14f14de fix rebase conflict 2013-08-16 16:06:36 +03:00
differentreality
609b3d45fe check if voting is enabled by organizers 2013-08-16 16:06:01 +03:00
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03:00
Henne Vogelsang
b70ba985af Merge pull request #28 from differentreality/cfp 
Cfp option to accept changes in events
 2013-08-15 02:31:36 -07:00
differentreality
a13a084f3e fixing stat numbers 2013-07-30 11:41:39 +03:00
Henne Vogelsang
ef556f02ca Merge pull request #34 from differentreality/admin_events_list 
Admin events list
 2013-07-29 04:40:25 -07:00
Henne Vogelsang
5602d9d9be Merge pull request #32 from differentreality/venue 
Minor layout change to single line box for venue name and address
 2013-07-29 04:39:30 -07:00
differentreality
4a41336bff layout change to single line box for venue name and address 2013-07-28 22:41:32 +03:00
differentreality
1686c61e7c change track from events list 2013-07-28 22:10:45 +03:00
differentreality
3b201f951a Hide stats by default 2013-07-28 21:37:25 +03:00
differentreality
071cd81029 edit event from admin panel, show actual submitter and update event details 2013-07-28 21:21:54 +03:00
differentreality
d9d889eb9f Option for proposal changes 2013-07-28 11:48:56 +03:00
Ancor Gonzalez Sosa
2553bd4e03 Fixes in registration#show after merging 2013-07-16 16:15:17 +02:00
Ancor Gonzalez Sosa
bae0be338a Use render instead of redirect if registration/create fails 2013-07-16 16:03:36 +02:00
Ancor Gonzalez Sosa
243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended 
Conflicts:
	app/controllers/admin/registrations_controller.rb
	app/models/registration.rb
 2013-07-16 15:59:00 +02:00
Ancor Gonzalez Sosa
7e930d8d40 Getting rid of plain sql in stats_controller 2013-07-16 15:50:32 +02:00
Ancor Gonzalez Sosa
26236424cc Fixing a typo 2013-07-16 15:50:13 +02:00
Ancor Gonzalez Sosa
45b95584e0 Merge branch 'statistics' of github.com:differentreality/osem into differentreality-statistics 2013-07-16 15:43:22 +02:00
Ancor Gonzalez Sosa
9af4393928 xlsx export for registrations list 2013-07-16 09:47:23 +02:00
differentreality
094e0bb0d0 fix 2013-07-15 13:20:28 +03:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00
differentreality
79ba3c5ea6 as string 2013-07-15 12:29:37 +03:00
differentreality
e4cc6f158f fix new registration, add check if user/person exists but is not registered 2013-07-14 14:39:40 +03:00
differentreality
6fc6e924ef show supporter level below name in registrations list (if other than free) 2013-07-13 10:59:02 +03:00
differentreality
ca8759bc10 visual changes 2013-07-13 09:57:13 +03:00
differentreality
4fd6512af0 minor fix 2013-07-12 20:30:49 +03:00