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

60 commits

Author SHA1 Message Date
Henne Vogelsang
5b05ffbd56 Rename the volunteers to match the other config routes 2014-03-04 10:30:23 +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
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00
Stella
52543589e4 voting visual changes 2014-02-23 14:56:09 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00
Stella
64b2b8b3f8 Volunteers, positions and days and volunteers list for admin, volunteering option for attendees 2014-01-01 11:39:59 +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
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
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
834362491e star voting system for proposals 2013-08-16 16:06:01 +03: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
differentreality
1686c61e7c change track from events list 2013-07-28 22:10:45 +03:00
differentreality
071cd81029 edit event from admin panel, show actual submitter and update event details 2013-07-28 21:21:54 +03: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
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
Ancor Gonzalez Sosa
b9cd54a256 Fixing a bug introduced in f53af55a74 2013-07-15 16:07:23 +02:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00
differentreality
8f34baecf6 add nickname and affiliation in registrations list 2013-07-15 06:45:32 +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
c68126ab1f define attendees var 2013-07-12 21:13:17 +03:00
differentreality
76614b858c fix query for supporters 2013-07-12 20:57:57 +03:00
differentreality
6a951f1f21 wording in message 2013-07-12 20:37:57 +03:00
differentreality
c7f326765c move attended field left before edit 2013-07-12 19:30:51 +03:00
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
Henne Vogelsang
83b20dfc58 Merge pull request #18 from differentreality/stats 
Stats
 2013-07-12 04:43:23 -07:00
differentreality
19b11a79ff Edit registration for admin 2013-07-12 13:37:30 +03:00
differentreality
463430b3e8 Allow delete of registration only to admins (not organizers) 2013-07-12 13:37:30 +03:00
differentreality
6879ca28e5 add option to delete registration 2013-07-12 13:37:29 +03:00
differentreality
f53af55a74 add pagination, re-arrange view 2013-07-12 13:37:29 +03:00
differentreality
5437cd5226 attended field as true in new registrations created by admin 2013-07-12 13:37:29 +03:00
differentreality
949cbd6a6c error messages 2013-07-12 13:31:42 +03:00
differentreality
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
differentreality
e59dbb0208 fix 2013-07-12 13:27:11 +03:00
differentreality
a71a16922c Add admin stats page 2013-07-12 12:30:31 +03:00
Henne Vogelsang
7e43a00098 Merge pull request #16 from ancorgs/master 
Fixing the json generated by admin/conference/x/events
 2013-07-11 05:32:28 -07:00
Ancor Gonzalez Sosa
b54b098a19 Fixing the json generated by admin/conference/x/events 2013-07-11 13:49:50 +02:00
Ancor Gonzalez Sosa
c6956482f0 Speaker can be changed in admin/conference/x/events 2013-07-11 09:04:54 +02:00
Ancor Gonzalez Sosa
3a2bf49f97 Adding and removing people 2013-07-10 16:13:53 +02:00
Henne Vogelsang
83b10447f4 Merge pull request #9 from differentreality/admin_events 
Add stats about submissions
 2013-07-01 03:28:00 -07:00
Stella Rouzi
030272b28e Add stats about submissions 2013-06-30 10:30:25 +00:00
Henne Vogelsang
252e1fe544 Completely rework the navigation 
Get rid of the admin layout
Get rid of the navbar custom style, use bootstrap-sass variables instead
Get rid of all the scaffold files
 2013-06-27 16:58:20 +02:00
Henne Vogelsang
9d668ad1b1 Add flexvideo class, enable proposal editing, 2013-06-20 00:26:34 +02:00
Henne Vogelsang
2d79e8e692 Cache the schedule page, fix empty rooms 2013-06-19 20:56:37 +02:00