gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
425 commits 15 branches 2 tags 50 MiB
Commit graph

41 commits

Author SHA1 Message Date
Artem Chernikov
adfa9cc871 Merge pull request #90 from openSUSE/review_140430_style_cleanup 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140430_style_cleanup'
 2014-05-09 11:27:49 +02:00
Gopesh Tulsyan
a409fc8119 replacing put requests by patch for rails 4 compatibility 2014-05-08 14:18:06 +05:30
Artem Chernikov
90fe1cc995 Replace update from member to collection 2014-04-30 16:11:14 +02:00
Chrisbr
b095064108 Fix eventtypes form 2014-04-30 10:47:33 +02:00
Chrisbr
8154e6f72c Fixes Hound CI violations 2014-04-28 21:42:09 +02:00
Chrisbr
169fab5c31 Fixes cfp form 2014-04-28 20:52:02 +02:00
Chrisbr
ba2051afc7 Fixes email settings form 2014-04-28 20:31:44 +02:00
Chrisbr
4b401c4cea Fixes supporter level form 2014-04-28 20:19:10 +02:00
Chrisbr
e432b71fb7 Fixes social_events form 2014-04-28 20:14:43 +02:00
Chrisbr
229581efc3 Fixes eventtype form 2014-04-28 20:08:06 +02:00
Chrisbr
c67b255e05 Fixes tracks form 2014-04-28 20:01:20 +02:00
Chrisbr
c4fbf8d038 Fixes rooms form 2014-04-28 19:58:49 +02:00
Chrisbr
fc11653f27 Fixes difficulty level form 2014-04-28 19:40:07 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02: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
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09: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
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03: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
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
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
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
differentreality
a71a16922c Add admin stats page 2013-07-12 12:30:31 +03: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
d95d8f234b json API for suseconferenceclient 2013-07-08 10:07:12 +02:00
Ancor Gonzalez Sosa
27017a4823 WIP: first prototype of the JSON API. 
* Tests not included, so I cannot prove that it works
 2013-07-04 14:02:50 +02:00
Henne Vogelsang
b2f8cfbec3 First version of the non-js schedule. Removed the assets from version control. 2013-06-19 13:58:48 +02:00
Matt Barringer
3933e89a9c Adding social events, which can be used on the registration page 2013-02-16 13:30:53 +01:00
Matt Barringer
152e8a345d Working on the backend interface for supporter registrations 2013-02-03 18:12:44 +01:00
Matt Barringer
973913b3bf Adding more registration options, and starting work on supporter levels 2013-02-02 16:43:47 +01:00
Matt Barringer
900bcb16d5 Starting to add email sending 2013-01-14 08:49:49 +01:00
Matt Barringer
b801f0dc19 - Restructuring the assets 
- Worked on the schedule
- Removed some gems
 2013-01-11 15:00:54 +01:00
Matt Barringer
a9207671b8 Allow users to confirm their proposal 2013-01-08 08:51:34 +01:00
Matt Barringer
f86232bedf Added paper_trail, also starting work on the scheduler 2013-01-07 16:45:48 +01:00
Matt Barringer
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00