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

84 commits

Author SHA1 Message Date
Chrisbr
0db2f3bb06 Bugfix send accept / reject event mail 2014-05-13 15:24:21 +02:00
alterpub
645d525bdd removed :email field from delegate 2014-05-12 18:22:41 +04:00
alterpub
d2ac8a30c0 redesigned fix 2014-05-12 17:53:07 +04:00
Chrisbr
00b4cfd0c0 Removed public scope from event_atachment model 2014-04-30 13:44:26 +02:00
KalabiYau
a6031df9f2 Fix failing tests. Replace ruby to 2.1.1 in travis. Update travis config 2014-04-24 22:02:50 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
633fff59d8 Add conference wide media, fix proposal#show view 2014-04-14 16:25:17 +02:00
Henne Vogelsang
e3fd0c195a First tests in rspec, with factory_girl 2014-04-09 13:18:11 +02:00
Henne Vogelsang
accd7d1a58 Starting to document things with rdoc 2014-04-09 13:18:11 +02:00
Henne Vogelsang
ec2323e957 Merge pull request #58 from differentreality/schedule_public 
show schedule in home page only if it is set as public
 2014-04-09 12:09:11 +02:00
Henne Vogelsang
5ed51c7499 Merge pull request #61 from gopesht/fix_first_admin_setup 
Fix admin first setup, email and password in README
 2014-04-09 11:40:21 +02:00
Henne Vogelsang
3628253624 Merge pull request #60 from gopesht/fix_conference_create_without_start_end_date 
Validations for start and end date
 2014-04-09 11:38:16 +02:00
Gopesh Tulsyan
817861a5e4 Make the first user as admin,user with id =1 2014-04-08 22:01:47 +05:30
Gopesh Tulsyan
f6e60823a7 Fix admin first setup, email and password in README 2014-04-08 20:32:13 +05:30
Gopesh Tulsyan
014f768e0c Validations for start and end date 2014-04-05 21:44:30 +05:30
Stella Rouzi
688557b7cb show schedule in home page only if it is set as public 2014-04-02 20:07:42 +03:00
Christian Bruckmayer
cd4107bf0d Adds allow_nil for media_type validation for backward compatibility 2014-03-30 11:17:00 +02:00
Henne Vogelsang
18968a05b1 * Update devise to latest version 
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
 2014-03-24 12:45:47 +01:00
Christian Bruckmayer
cbb4b40bc0 Implement more embed code 
Supported Media Files:
- Youtube
- Vimeo
- Instagram
- Flickr
- Slidershare
- Speakerdeck

close #26
 2014-03-21 16:04:51 +01:00
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
Henne Vogelsang
120b812a53 Merge pull request #35 from differentreality/fix_conference_registration_after_questions 
fix registration page
 2014-03-17 16:34:30 +01:00
Stella
2e1dcd33fe Move events stats in Statistics, add ticket distribution 2014-03-09 16:16:22 +02:00
Henne Vogelsang
be970ba6c0 Get rid of the languages before_save function. It's too shaky 2014-03-05 11:09:40 +01: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
3d9bef366c Only upcase languages if they exist... 2014-03-04 10:15:40 +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
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
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
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
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
4d2f0e2111 fix rebase conflict 2013-08-16 16:09:29 +03:00
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03:00
differentreality
d9d889eb9f Option for proposal changes 2013-07-28 11:48:56 +03:00
Ancor Gonzalez Sosa
7f3c8a65de Only confirmed events in JSON API 2013-07-16 18:42:22 +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
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
Henne Vogelsang
83b20dfc58 Merge pull request #18 from differentreality/stats 
Stats
 2013-07-12 04:43:23 -07: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
a71a16922c Add admin stats page 2013-07-12 12:30:31 +03:00
Henne Vogelsang
00af4e0aee Merge pull request #13 from differentreality/event_registration 
Event registration
 2013-07-11 02:47:32 -07:00
differentreality
1bd779b6c1 fix registration model 2013-07-11 07:47:05 +03:00