gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1455 commits 2 branches 2 tags 50 MiB
Commit graph

92 commits

Author SHA1 Message Date
David Sedeño
7c0cd30dda Add venue_photos model and venue_photos admin controller in order to add more images to Venues and allow to delete it. 
Show the additional photos in splash. Added fancybox gem for zoom when click on the additional photo.

fix #777
 2016-02-13 17:39:30 +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
Andrew Kvalheim
e593c1d1fb Apply recommendation from thoughtbot/shoulda-matchers@a5623e7. 2015-10-14 09:26:36 -07:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
chrisbr
a47c84dfbb Update redcarpet CVE#46916 2015-04-11 09:33:08 +02:00
Henne Vogelsang
cc66027220 Update rest-client to fix OSVDB-117461 2015-02-27 13:56:32 +01:00
Christian Bruckmayre
a7e35b24c4 Updates nio4r to 1.1 2015-02-09 18:55:27 +01:00
Stella Rouzi
a845dd5d7d add bootstrap-switch for is_highlight 2015-01-21 17:28:18 +02:00
Henne Vogelsang
60bb00b88e Fix glyphicons, suse-icon and remove unused fonts 2014-11-27 14:47:00 +01:00
Christian Bruckmayer
0e7faf7df8 Merge pull request #547 from ChrisBr/fix_cve 
Fix several CVE
 2014-11-24 11:26:00 +01:00
chrisbr
d08d05416f Fixes CVE-2014-7819 2014-11-21 17:22:14 +01:00
chrisbr
acc28d22ae Fixes CVE-2014-7829 2014-11-21 17:10:37 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
 2014-11-20 15:39:26 +01:00
Henne Vogelsang
30e8ab856c Get rid of the splashpage banner photo and "descriptions" 2014-11-20 15:39:26 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout 
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
 2014-11-17 13:58:27 +01:00
Henne Vogelsang
796d063eda Implements piwik tracking 2014-11-12 10:45:44 +01:00
Henne Vogelsang
7cf444f3bb Update rails/sprockets to fix CVE-2014-7818/CVE-2014-7819 2014-11-06 10:59:24 +01:00
chrisbr
49d565def2 Implements iChain authentication 2014-11-04 17:42:47 +01:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Stella Rouzi
561a040c72 remove jquery-fileupload-rails 2014-08-21 07:58:26 +03:00
James Mason
2b0d7b880b Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs. 2014-08-19 10:32:37 -07:00
Henne Vogelsang
f2bbb68ad9 Update rails to address CVE-2014-3514. Fix the deployment 2014-08-19 12:31:31 +02:00
Henne Vogelsang
45b8c5dd68 Drop JQuery-UI. Fixes Issue #353 partly 2014-08-18 09:32:14 +02:00
Artem Chernikov
566382eca8 Merge pull request #441 from differentreality/cancancan 
Cancancan
 2014-08-15 12:00:35 +02:00
Stella Rouzi
bf6b09d9f4 add github for openid login 2014-08-15 06:16:42 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
f1f0f16d5c Merge pull request #355 from gopesht/email_processing_in_background 
Delayed job integration done
 2014-07-23 23:45:15 +05:30
Gopesh Tulsyan
c282f6c14e Delayed job integration done 2014-07-23 21:29:55 +05:30
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Henne Vogelsang
4b61d29e8d Exchange debugger for byebug 
https://github.com/cldwalker/debugger/issues/125#issuecomment-43353446
 2014-07-23 15:34:05 +02:00
Christian Bruckmayer
35c5116051 Merge pull request #347 from ChrisBr/fix_test_dates 
Implements timecop to make tests independent from DateTime
 2014-07-23 15:20:44 +02:00
Chrisbr
7c51d1a42f Implements timecop to make tests independent from DateTime (close #327) 2014-07-23 10:28:15 +02:00
Artem Chernikov
763f864dc9 Fix basic style issues with rubocop 2014-07-21 15:05:58 +02:00
Artem Chernikov
f4a22851a1 Update rubocop and add basic checks 2014-07-21 15:05:58 +02:00
Chrisbr
d1b038c5a7 [Bugfix] Confirmed / Unconfirmed events over time for conference dashboard 2014-07-18 15:22:15 +02:00
Artem Chernikov
4c08850786 Remove therubyracer because of the following reasons: 
* therubyracer is unstable between platforms, platform versions, ruby interpreters and even ruby versons.
  Pretty much everytime there's native extension compilation issue, it is therubyracer.
* therubyracer is officially discouraged by heroku as it uses lot of memory. On the other hand node.js advertises itself as very lightweight.
* using therubyracer on server is just like installing Node that can be used only by ruby apps (you're using v8 anyway)
* btw. node.js is necessary only on Windows and Ubuntu development, on Mac development ExecJS is using JavaScriptCore.

catched from https://github.com/sheerun/rails4-bootstrap/issues/18
 2014-07-12 12:49:58 +02:00
Artem Chernikov
460f763be5 Add Mina configuration 2014-07-07 16:09:07 +02:00
Artem Chernikov
7cd21bbf11 Fix view test for cfps 2014-07-07 15:06:44 +02:00
KalabiYau
158a9fe7a8 Add poltergeist, therubyracer, reshuffle Gemfile to be more lean 2014-07-07 15:06:43 +02:00
Gopesh Tulsyan
fbf52b1d69 Merge pull request #273 from gopesht/implements_markdown 
Implements markdown
 2014-07-03 21:01:46 +05:30