Commit graph

228 commits

Author SHA1 Message Date
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
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
Aditya Chatterjee
f57edd1e35 Deleted d3_rails gem 2016-02-27 18:01:38 +05:30
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
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +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
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
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
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
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
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
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
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
f6a9142510 Integration of markdown with redcarpet gem 2014-07-02 17:36:34 +05:30
Gopesh Tulsyan
6712f582c3 Integrate font awesome 2014-06-26 21:28:06 +05:30
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
James Mason
0f697f3dbe Update awesome_nested_set
The stable release of awesome_nested_set isn't compatible with Rails 4.1;
running in production mode errors out at init.

Issue 253 suggests resolving with 3.0.0 RC
https://github.com/collectiveidea/awesome_nested_set/issues/253

Conflicts:
	Gemfile.lock
2014-06-19 08:07:30 -07:00
Stella Rouzi
600adde6ba implement openID authentication 2014-06-19 12:58:05 +03:00
Stella Rouzi
d3751be558 Add rubocop to Gemfile 2014-06-17 22:50:00 +03:00
Chrisbr
40c61ed717 Implements event submissions over time chart 2014-05-30 10:10:47 +02:00
Chrisbr
9e831cb514 Merge with master 2014-05-12 15:26:46 +02:00
Chrisbr
d97e3603b1 Merge with master 2014-05-12 15:26:18 +02:00
Chrisbr
d6c692962e Enables capybara-webkit 2014-05-10 17:53:31 +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
aff37e8fb1 Conference Model tests 2014-05-09 14:14:21 +02:00