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

1446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
3f7ccd7674 Update mysql2 gem 2016-02-08 13:53:06 +01:00
Henne Vogelsang
4e51e93ee3 Merge pull request #767 from hennevogel/fix_depreciation_warnings 
Update factory_girl, silence deprecation warnings
 2016-02-08 13:50:36 +01:00
Henne Vogelsang
75b4143bc4 Update factory_girl, silence deprecation warnings 2016-02-08 13:35:31 +01:00
Henne Vogelsang
e28e1bf963 Merge pull request #766 from hennevogel/differentreality-fixes 
Fixes for the last merge
 2016-02-08 13:34:55 +01:00
Henne Vogelsang
6fa3864771 Fix CFP ability 2016-02-08 12:53:13 +01:00
Henne Vogelsang
8e324ac1af Fix showing a schedule without venue/rooms 2016-02-08 12:52:56 +01:00
Stella Rouzi
813658fb19 rebase fixes for commercials path 2016-02-06 17:43:51 +01:00
Stella Rouzi
a0d045e156 Remove attr_accessible from Program and Cfp, final fixes after introducing strong params 2016-02-06 17:43:51 +01:00
Stella Rouzi
62a7e724a2 Fix sqlite behavior with not null constraint, so that it works both for sqlite and mysql 2016-02-06 17:43:51 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
feabbfbc99 rebase against email settings changes 2016-02-06 17:42:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Henne Vogelsang
028b82fda8 Merge pull request #729 from differentreality/api 
API with more options
 2016-02-06 17:37:35 +01:00
Christian Bruckmayer
2607e1ecde Merge pull request #759 from ChrisBr/update_rails4.2 
Update rails to version 4.2
 2016-02-05 14:03:42 +01:00
Christian Bruckmayer
610d83d215 Merge pull request #763 from davidsf/hide_free_of_charge_msg 
Hide free of charge message
 2016-02-02 22:20:10 +01:00
David Sedeño
302d45f91a If there are tickets for the conference, not show the msg about the free of charge. fix #745 2016-02-02 21:19:14 +01:00
Henne Vogelsang
09c5cec3da Enable travis artifacts 2016-02-01 17:51:42 +01:00
Christian Bruckmayer
9e9c536946 Update rails to version 4.2 
Furthermore it was necessary to add the following gems:
- responders
- web-console

And additional it was necessary to update these gems manually:
- devise
- turbolinks
- delayed_job_active_record
- money-rails

And the corresponding dependencies.
http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-4-1-to-rails-4-2
 2016-01-26 10:04:08 +01:00
Christian Bruckmayer
57610eb39e Merge pull request #716 from differentreality/abilities 
Abilities: Minor changes & grooming
 2016-01-25 17:20:24 +01:00
Stella Rouzi
6be8d383b7 Remove unnecessary code 2016-01-21 21:49:48 +02:00
Stella Rouzi
ecef151f91 API with more options, includes #712 2016-01-21 21:49:48 +02:00
Christian Bruckmayer
28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new 
Simplify adding commercials to conference and event
 2016-01-21 20:29:03 +01:00
Christian Bruckmayer
7f2728e619 Merge pull request #758 from ChrisBr/update_devise 
Update devise to 3.5.4
 2016-01-21 20:15:18 +01:00
Christian Bruckmayer
e6905afc89 Update devise to 3.5.4 
To fix CVE-2015-8314
 2016-01-21 19:50:53 +01:00
Christian Bruckmayer
9114b275b8 Merge pull request #750 from differentreality/fix_hakiri_issue 
fix hakiri issue
 2016-01-21 19:42:57 +01:00
chrisbr
23664119bd Implement simplified commercials workflow 
It's now possible to simply enter the url of the third party provider to enter a commercial.
 2016-01-21 19:41:12 +01:00
Stella Rouzi
17a1c0e87c fix hakiri issue 2016-01-21 20:19:37 +02:00
Christian Bruckmayer
fb7ebab5a0 Merge pull request #757 from differentreality/fix_tests_756 
Fix failed tests of #756
 2016-01-21 17:32:36 +01:00
Stella Rouzi
152b59aade Fix failed tests of #756 2016-01-21 13:05:27 +02:00
Christian Bruckmayer
d7d851cb56 Merge pull request #752 from davidsf/titlepage_in_conference_show 
Conference title in conference show view. fix #751
 2016-01-21 11:25:07 +01:00
Christian Bruckmayer
1feba36d61 Merge pull request #756 from chinmaydd/date_fix 
Fixes Start date being greater than End date
 2016-01-21 09:08:35 +01:00
chinmaydd
4eafa43f7e Fixes Start date being greater than End date 2016-01-21 00:26:37 +05:30
David Sedeño
3095787aa7 Add title in conference show view. fix #751 2016-01-17 20:49:30 +01:00
Stella Rouzi
8ffa8b1e86 Venue has show action, not index. Make the ability to schedule an Event more clear. 2016-01-13 13:16:15 +02:00
Christian Bruckmayer
24f0625be1 Merge pull request #738 from ChrisBr/update_rails 
Update several gems
 2016-01-13 10:56:01 +01:00
Christian Bruckmayer
64396c9786 Update rails gem to 4.1.14 
Fix CVE-2015-3227
Fix CVE-2015-3226
 2016-01-13 10:35:16 +01:00
Christian Bruckmayer
66d4e6e833 Update jquery-rails 
To fix CVE-2015-1840 reported by Hakiri.io
 2016-01-13 10:35:16 +01:00
Christian Bruckmayer
81a43cc2b6 Raise exception on XSRF fail 
Reported by hakiri.io
 2016-01-13 10:35:16 +01:00
Christian Bruckmayer
c5c3a903fc Update paperclip to 4.3.2 
To fix CVE-2015-2963
 2016-01-13 10:35:16 +01:00
Stella Rouzi
056df982b8 Merge pull request #719 from differentreality/strong_parameters 
Introduce strong parameters
 2016-01-13 11:21:42 +02:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Henne Vogelsang
38bc2e3c3a Merge pull request #736 from ChrisBr/vagrant 
Setup vagrant file for development
 2015-12-08 15:13:53 +01:00
Christian Bruckmayer
f3549a21d9 Setup vagrant file for development 2015-12-07 15:06:04 +01:00
Henne Vogelsang
6e9a8bbd59 Merge pull request #717 from AndrewKvalheim/shoulda-spring 
Use recommended method for installing Shoulda Matchers with Spring.
 2015-10-27 09:09:10 +01:00
Henne Vogelsang
61b3383129 Merge pull request #715 from raluka/emailsettings_datatable 
Issue #603: Refactor EmailSettings attributes
 2015-10-27 09:05:01 +01:00
Andrew Kvalheim
e593c1d1fb Apply recommendation from thoughtbot/shoulda-matchers@a5623e7. 2015-10-14 09:26:36 -07:00
raluka
9eb47bd3f0 merged from upstream 2015-10-14 16:02:40 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
Stella Rouzi
2e692f7ea5 Merge pull request #705 from altsalt/master 
added Voted? column to admin/events view
 2015-10-14 14:31:30 +03:00
Henne Vogelsang
5da91c0498 Merge pull request #713 from raluka/postalcode 
Postalcode requires number - not anymore!
 2015-10-14 13:20:27 +02:00