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

95 commits

Author SHA1 Message Date
Henne Vogelsang
24e40a5c90 Merge pull request #41 from differentreality/stats_update 
Move events stats in Statistics, add ticket distribution
 2014-03-17 16:36:03 +01:00
Stella
2e1dcd33fe Move events stats in Statistics, add ticket distribution 2014-03-09 16:16:22 +02:00
Stella
8f8824ecd6 fix registration page, only show volunteering tab if option is enabled for the conference 2014-03-04 22:22:52 +02:00
Henne Vogelsang
04e06ac251 Remove question fields from speaker statistics 2014-03-04 10:41:38 +01:00
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
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
differentreality
9c35395350 redirect to requested page after login 2013-08-25 13:40:44 +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
f8a6f9626f Merge pull request #33 from differentreality/home 
Home page conferences order
 2013-07-29 04:39:52 -07:00
Henne Vogelsang
0f229f3db0 Merge pull request #31 from differentreality/schedule_show_by_date 
Schedule show by date
 2013-07-29 04:38:59 -07:00
differentreality
4f582bc7f9 show first day if today is not within the conference date range 2013-07-29 08:48:04 +03:00
differentreality
adb04ab82e show current day's schedule 2013-07-29 02:01:24 +03:00
differentreality
ffadfca7a2 show conference until its last day and order by start date 2013-07-28 22:37:26 +03: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
differentreality
d7ae2ba29b Allow title edit for confirmed proposal if organizer or admin and do not allow event type change for confirmed/unconfirmed proposals if schedule_changes is not set, unless it is done by an admin or organizer 2013-07-28 13:03:22 +03:00
Ancor Gonzalez Sosa
7f3c8a65de Only confirmed events in JSON API 2013-07-16 18:42:22 +02:00
Ancor Gonzalez Sosa
08637503e5 schedule renders 10x faster now. Caching disabled 2013-07-16 18:16:37 +02:00
Ancor Gonzalez Sosa
740a604c01 Adding api/v1/conferences/x/conferences 
* A little weird, but needed by suseconferenceclient
 2013-07-16 17:04:48 +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
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