Commit graph

181 commits

Author SHA1 Message Date
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Henne Vogelsang
737a9d4808 Add faker gem, don't require rubocop 2016-04-29 17:21:20 +02:00
Henne Vogelsang
d79a9b6fc1 Make use of dotenv 2016-04-29 16:37:48 +02:00
Henne Vogelsang
64830e9cff Don't read config.yml anymore
add some heroku support gems and document all the new variables
2016-04-29 16:36:47 +02:00
Henne Vogelsang
a852a3b4a5 Protect us from too large images 2016-04-27 17:55:24 +02:00
Henne Vogelsang
e3c457267c Also require mini_magick for image manipulation 2016-04-27 17:40:23 +02:00
Henne Vogelsang
d55d206b93 Switch to carrierwave for upload management 2016-04-27 17:40:23 +02:00
Henne Vogelsang
1ce834391a Add cloudinary gem, fix some Gemfile comments 2016-04-27 11:48:12 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Henne Vogelsang
7b40f3ceb6 Update poltergeist 2016-04-05 13:43:52 +02:00
Henne Vogelsang
fa8d0a993c Update phantomjs to latest version 2016-04-05 13:43:52 +02:00
Henne Vogelsang
80f63c7263 Switch back to leaflet-rails
The rails-assets version has too many issues with the asset pipeline
2016-04-01 16:15:52 +02:00
Henne Vogelsang
c8481aef5d Merge pull request #936 from sonalkr132/hakiri-fix
Update for security warning on hakiri
2016-04-01 15:15:02 +02:00
Aditya Prakash
6f0bdebed4 Update uglifier to 3.0.0
The upstream library for the Ruby uglifier gem, UglifyJS, is
affected by a vulnerability that allows a specially crafted
Javascript file to have altered functionality after minification.
See on Hakiri: https://hakiri.io/github/openSUSE/osem/master/e0ec57b0dcf080bdb9e9b254f2362c52c7657b07/warnings?name=Code+Injection

Uglifier 3 dropped support of ruby 1.8
2016-04-01 09:22:01 +05:30
Aditya Prakash
e0ec57b0dc Update coverall to 0.8.13 2016-04-01 08:27:33 +05:30
Shriyansh
70b8fca197 Made use of Rails I18n data format in EventSerializer #598 2016-03-27 20:03:33 +05:30
Nishanth Vijayan
3da04c0f7c Update active_model_serializers.Fix conference serializer and api tests
The controllers are not using the serializers, because of a bug in active_model_serializer.
Hence the update.API tests are fixed to work with the new API response structure.
Fixes bugs in conference serializer.
2016-03-15 12:38:13 +05:30
Henne Vogelsang
0df693ffbf Merge pull request #820 from differentreality/update_rolify
update rolify
2016-03-09 11:32:52 +01:00
Nishanth Vijayan
f713d1eac5 Check installed Bundler version 2016-03-08 21:14:44 +05:30
Nishanth Vijayan
34e8dade05 Enforce min bundler version required by rails-assets 2016-03-08 19:20:35 +05:30
Nishanth Vijayan
64b825cebe Fix markdown editors bug #811 using asset gem. 2016-03-08 16:50:30 +05:30
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02:00
Christian Bruckmayer
d5f138b3dc Update country_select gem
and removed git repository from Gemfile. Caused bundle install error in vagrant box.
2016-03-07 18:28:14 +01:00
Christian Bruckmayer
2dad051ab9 Add letter_opener_web
to present emails in the browser in development mode.
Using letter_opener in combination with Vagrant does not work
because it's not possible to launch a web browser in your
Vagrant box. Fixes #817.
2016-03-05 14:09:42 +01:00
Henne Vogelsang
af168f0f55 Merge pull request #700 from differentreality/roles_updated
Roles updated
2016-03-04 17:11:56 +01:00
Chashmeet Singh
edbba42e16 Update Gemfile.lock
Fixes #815
2016-03-03 22:35:17 +05:30
Aditya Prakash
6301072484 Add webmock for external requests in tests
external_request.rb needs to be required before lint is run.
2016-03-02 21:15:29 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Aditya Prakash
3e146e159b Update rails to 4.2.5.2
Changed modules are:-
* actionpack: Possible remote code execution vulnerability
  https://groups.google.com/forum/#!topic/rubyonrails-security/ly-IH-fxr_Q
* actionview:  Possible Information Leak Vulnerability
  https://groups.google.com/forum/#!topic/rubyonrails-security/ddY6HgqB2z4

Rest of the action* modules are released with no change.
2016-03-01 14:40:47 +05:30
Christian Bruckmayer
dace1037bd Merge pull request #776 from sonalkr132/deprecation
Follow up on update of rails and activeuuid
2016-02-29 11:40:05 +01:00
AdiChat
b0bc54700b Ran bundle install 2016-02-27 22:08:16 +05:30
Henne Vogelsang
1313ac0a91 Update mina 2016-02-25 15:40:51 +01:00
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57:45 +02:00
Aditya Prakash
6460456202 Update Formtastic and formtastic-bootstrap
Previous version of Formtastic was giving following deprecation warning:
`#column_for_attribute` will return a null object for non-existent
columns in Rails 5. Use #has_attribute? if you need to check for
an attribute's existence.

Guide followed for upgrade: https://github.com/justinfrench/formtastic/wiki/Upgrading-to-Formtastic-3.1

formtastic-bootstrap is upgraded for compatibility with current Formtastic.
2016-02-19 08:12:03 +05:30
Henne Vogelsang
e2fb83146a Merge pull request #768 from hennevogel/rubocop
Update rubocop todo file
2016-02-18 14:08:04 +01:00
Henne Vogelsang
8f42f79423 Merge pull request #769 from hennevogel/gems
Gems: Update MySQL2, switch assets to rails-assets.org
2016-02-18 14:03:35 +01:00
Aditya Prakash
67ac6f0d65 Update spring-commands-rspec and springify bin/rspec 2016-02-16 21:46:33 +05:30
Henne Vogelsang
9135da3607 Update rubocop 2016-02-08 14:57:23 +01:00
Henne Vogelsang
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +01:00
Henne Vogelsang
3f7ccd7674 Update mysql2 gem 2016-02-08 13:53:06 +01:00
Henne Vogelsang
75b4143bc4 Update factory_girl, silence deprecation warnings 2016-02-08 13:35:31 +01:00
Stella Rouzi
813658fb19 rebase fixes for commercials path 2016-02-06 17:43:51 +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
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
e6905afc89 Update devise to 3.5.4
To fix CVE-2015-8314
2016-01-21 19:50:53 +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
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
c5c3a903fc Update paperclip to 4.3.2
To fix CVE-2015-2963
2016-01-13 10:35:16 +01:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00