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

277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
628211f0fc Merge pull request #50 from differentreality/logo_missing 
avoid missing image icon, in home page, when there is no conference logo
 2014-03-27 14:21:02 +01:00
Henne Vogelsang
997df20ed0 Check for existence of the CFP before showing ratings 2014-03-27 14:20:22 +01:00
Henne Vogelsang
26a54a0f79 Remove this migration, additional_speakers neaver existed 2014-03-27 14:20:22 +01:00
Henne Vogelsang
d85106f1e3 Merge pull request #49 from ChrisBr/fix_mixed_content_issue 
Fix mixed content issue
 2014-03-27 14:19:11 +01:00
Christian Bruckmayer
1c8961fa75 Fix mixed content issue 2014-03-25 23:09:40 +01:00
Stella
ecc516b802 avoid missing image icon 2014-03-25 11:30:17 +02:00
Henne Vogelsang
9d72775c29 Use user_registration_path instead of hardcoded /accounts for deployments into sub-directories... 2014-03-24 13:22:41 +01: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
Henne Vogelsang
7920c3df65 Merge pull request #46 from ChrisBr/implement_more_embed_code 
Implement more embed code
 2014-03-24 12:30:26 +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
587126218d Update gems, use d3 gem, initial bootstrap v3 port 2014-03-17 16:42:19 +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
b64cc9f7e4 Merge pull request #38 from differentreality/supporters_title_error 
show title of supporter level only if level exists
 2014-03-17 16:35:29 +01:00
Henne Vogelsang
0f8cdf2b23 Merge pull request #37 from differentreality/questions_scrolling 
Fix view of questions in Registrations
 2014-03-17 16:35:15 +01:00
Henne Vogelsang
89cf40c2e2 Merge pull request #36 from differentreality/fix_rating_text 
erase word rating, no bold
 2014-03-17 16:34:47 +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
Stella
157b94c94e show title of supporter level only if level exists 2014-03-06 18:08:00 +02:00
Stella
299a882277 Fix view of questions in Registrations 2014-03-06 17:31:58 +02:00
Henne Vogelsang
257226273b Add default to :conferences use_vpositions/use_vdays 2014-03-05 11:37:58 +01:00
Henne Vogelsang
be970ba6c0 Get rid of the languages before_save function. It's too shaky 2014-03-05 11:09:40 +01:00
Henne Vogelsang
1b9479cb32 Ran migrations 2014-03-05 11:05:40 +01:00
Stella
fdd0195232 erase word rating, no bold 2014-03-04 23:35:34 +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
97eae285c5 Get rid of the error page after sign up 2014-03-04 10:18:07 +01:00
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