gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-18 06:01:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
525 commits 15 branches 2 tags 50 MiB
Commit graph

99 commits

Author SHA1 Message Date
Gopesh Tulsyan
1e802bc3c6 Added description to conference and program segment to splash 
Added tracks to program component

Rebased and updated the new navigation for splash
 2014-05-30 00:20:44 +05:30
Gopesh Tulsyan
b3d719829e Added description to conference and program segment to splash 
removed id from program partial
 2014-05-29 23:57:35 +05:30
Chrisbr
dc080705ae Adds color attribute to conference 2014-05-28 13:40:58 +02:00
Gopesh Tulsyan
d1e9bd06a6 View specs, added factories, fixed bugs 2014-05-21 16:20:02 +05:30
Chrisbr
17307736e8 Removes rating desc column from cfp 2014-05-14 16:37:19 +02:00
Christian Bruckmayer
e8b9c26778 Merge pull request #113 from ChrisBr/feature_tests 
tests
 2014-05-13 15:54:18 +02:00
Chrisbr
c7e5c73242 removes redundant self 2014-05-13 15:28:25 +02:00
Chrisbr
37430152c6 fix Hound CI violations 2014-05-13 15:27:43 +02:00
Chrisbr
0db2f3bb06 Bugfix send accept / reject event mail 2014-05-13 15:24:21 +02:00
Chrisbr
25ad5b7409 fix hound ci violations 2014-05-13 11:12:53 +02:00
Chrisbr
132bb89556 fix hound ci violations 2014-05-13 10:39:03 +02:00
Chrisbr
84843ade48 refactoring setup_roles and updated tests 2014-05-13 10:35:23 +02:00
Chrisbr
86c188a38a Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests 2014-05-12 21:16:00 +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
7e7dadac88 Fix Hound CI violations 2014-05-10 16:09:24 +02:00
Chrisbr
1976276d4d Bugfix to pass user model tests 2014-05-10 15:58:02 +02:00
Chrisbr
8aa68fb84a Installs database cleaner 
- preparation for feature tests with capybara
see:
http://devblog.avdi.org/2012/08/31/configuring-database_cleaner-with-rails-rspec-capybara-and-selenium/
 2014-05-10 15:55:17 +02: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