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

250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
3d9bef366c Only upcase languages if they exist... 2014-03-04 10:15:40 +01:00
Henne Vogelsang
0982be8579 Simplify sidebar and navigation 
Check existence of supporter levels
 2014-03-04 10:10:07 +01:00
Henne Vogelsang
59933115fc Fix merge leftovers 2014-03-03 11:04:47 +01:00
Henne Vogelsang
14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
 2014-03-03 10:52:24 +01:00
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
Henne Vogelsang
4092c68ea4 Merge pull request #34 from differentreality/final_voting_visual 
Voting visual
 2014-03-03 10:40:03 +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
Henne Vogelsang
4356616566 Merge pull request #29 from differentreality/voting_fixes 
Voting fixes
 2014-01-23 03:25:28 -08:00
Henne Vogelsang
9d09d6d038 Merge pull request #28 from differentreality/event_registration 
Show No of registrations for proposal, in proposal index page
 2014-01-23 03:25:04 -08:00
Stella
64b2b8b3f8 Volunteers, positions and days and volunteers list for admin, volunteering option for attendees 2014-01-01 11:39:59 +02:00
Stella
8ca2e53430 show voting options only if rating is enabled (>0) 2013-12-28 16:20:00 +02:00
Stella
28b8b58030 migration, add down func 2013-12-28 15:51:37 +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
125d5fe3ff Update README.md 2013-10-30 17:55:29 +01: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
Henne Vogelsang
b4a3baea1c Release osem under MIT. Fixes #57 2013-10-18 15:33:59 +02:00
Henne Vogelsang
5c719afbdf Merge pull request #55 from differentreality/stats_charts 
Stats charts for registrations (Admin)
 2013-09-26 08:38:44 -07:00
differentreality
13782d8f25 add d3 lib 2013-09-18 12:22:17 +03: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
Henne Vogelsang
c26a0a0bc9 Merge pull request #39 from differentreality/events_stats 
fix events stats table
 2013-09-04 04:00:29 -07: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
406b7dcd2d Merge pull request #42 from differentreality/proposal_event_types 
Show length of event types in new proposal drop down
 2013-09-04 02:19:18 -07:00
Henne Vogelsang
0d6d5d6a31 Merge pull request #38 from differentreality/redirection 
Redirection
 2013-09-03 02:46:41 -07:00
Henne Vogelsang
6c050ccbc2 Merge pull request #41 from differentreality/stats_fix 
Fixing some numbers there
 2013-09-03 02:42:05 -07:00
Henne Vogelsang
0c2fa49b65 Merge pull request #37 from differentreality/events_voting 
Events voting
 2013-09-03 02:40: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
9125bafe4a Show length of event types in new proposal drop down 2013-09-01 18:19:25 +03:00
differentreality
9c35395350 redirect to requested page after login 2013-08-25 13:40:44 +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
4d2f0e2111 fix rebase conflict 2013-08-16 16:09:29 +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
2314d943e1 Merge pull request #36 from averi/master 
Improve the documentation.
 2013-08-16 03:10:00 -07:00
Andrea Veri
c3a6ff83c7 Improve the documentation. 2013-08-15 16:51:57 +02: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