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
Christian Bruckmayer
c5c392d4c7
Merge pull request #794 from differentreality/user_model_tests
...
Add tests for Event. Remove redundant function 'def week' from Event.
2016-03-05 13:45:39 +01:00
Christian Bruckmayer
0ddaea2e5f
Merge pull request #823 from hennevogel/master
...
Some Vagrant fixes
2016-03-05 13:06:13 +01:00
Stella Rouzi
81c82466f8
Add tests for Event. Remove redundant function 'def week' from Event.
2016-03-04 19:46:25 +02:00
Stella Rouzi
18bb1bd237
Merge pull request #770 from hennevogel/feature_venue_show
...
Beautify venue#show
2016-03-04 19:44:49 +02:00
Henne Vogelsang
af168f0f55
Merge pull request #700 from differentreality/roles_updated
...
Roles updated
2016-03-04 17:11:56 +01:00
Henne Vogelsang
33e1c6eae1
Beautify venues#show
2016-03-04 17:05:42 +01:00
Henne Vogelsang
f83e76102f
Make use of holder.js in venue#show
2016-03-04 15:59:17 +01:00
Henne Vogelsang
205fda70ea
Some Vagrant fixes
...
* The whole boostrap script runs in /vagrant
* Make sure that we don't overwrite existing databases
even if there is no config for them
2016-03-04 15:39:00 +01:00
Christian Bruckmayer
3dc7aaf4ea
Merge pull request #816 from chashmeetsingh/patch-2
...
Update Gemfile.lock
2016-03-04 08:52:31 +01:00
Chashmeet Singh
edbba42e16
Update Gemfile.lock
...
Fixes #815
2016-03-03 22:35:17 +05:30
Henne Vogelsang
0e01ffa565
Merge pull request #786 from sonalkr132/test
...
Speed up test boot time
2016-03-03 16:42:46 +01:00
Henne Vogelsang
46237a936a
Merge pull request #787 from davidsf/fix_schedule_in_firefox
...
Fix gradient in schedule page in Firefox
2016-03-03 16:41:55 +01:00
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
Aditya Prakash
640be7497f
Add config to allow running FactoryGirl lint before suit
...
By default the lint will be run before every test suit.
Set it to false in config.yml if you would rather just use the rake
task: `bundle exec rake factory_girl:lint`
2016-03-02 21:15:29 +05:30
Aditya Prakash
f84150362b
Move FactoryGirl.lint to rake task
...
This significantly improves start time of tests. It is also the recommended
way: https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md#linting-factories
Read more at: https://github.com/thoughtbot/factory_girl/issues/772
2016-03-02 21:15:28 +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
eda5c2bc07
Merge pull request #800 from sonalkr132/allow_future_date
...
Allow selection of future dates on registration period page
2016-03-01 12:17:53 +01:00
Christian Bruckmayer
a8b270f6e1
Merge pull request #803 from sonalkr132/update-rails
...
Update rails to 4.2.5.2
2016-03-01 10:28:20 +01: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
Aditya Prakash
0c6075dcc7
DRY datepicker function call
2016-02-29 16:54:51 +05:30
Aditya Prakash
04d5216c38
Allow selection of future dates on registration period page
...
close : #798
2016-02-29 16:28:09 +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
Christian Bruckmayer
00b95333c8
Merge pull request #797 from AdiChat/AdiChat-Remove-d3
...
Removed d3_rails gem
2016-02-29 10:30:30 +01:00
AdiChat
b0bc54700b
Ran bundle install
2016-02-27 22:08:16 +05:30
Aditya Chatterjee
f57edd1e35
Deleted d3_rails gem
2016-02-27 18:01:38 +05:30
Henne Vogelsang
1313ac0a91
Update mina
2016-02-25 15:40:51 +01:00
Henne Vogelsang
3b0eb1c407
Merge pull request #788 from differentreality/registration_period_before_conference_end
...
Add validations for registration_period
2016-02-25 15:20:17 +01:00
Stella Rouzi
f567187d45
Add validations for registration_period
2016-02-23 12:57:45 +02:00
Christian Bruckmayer
68cc4a73d9
Merge pull request #790 from davidsf/fix_user_show
...
Add program to event relation in user/show.
2016-02-22 22:51:31 +01:00
David Sedeño
cdaf77d8b8
Add program to event relation in user/show. fix #789
2016-02-22 22:20:19 +01:00
David Sedeño
1efdcdc4cf
Fix gradient in schedule page in Firefox. fix #748
2016-02-20 23:10:27 +01: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
Aditya Prakash
5f035a7b38
Change in schema due to update of activerecord and activeuuid
...
From: http://edgeguides.rubyonrails.org/4_2_release_notes.html#active-record-notable-changes
"SchemaDumper uses force: :cascade on create_table. This makes
it possible to reload a schema when foreign keys are in place."
2016-02-19 08:06:15 +05:30
Aditya Prakash
cac3f817ef
Remove deprecation warnings due to update of rails
...
* `config.serve_static_assets` has been renamed to `config.serve_static_files`
and former will be removed in rails 5
* propagate errors raised within `after_rollback`/`after_commit` callbacks.
Read more at: http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#error-handling-in-transaction-callbacks
2016-02-19 08:06:14 +05:30
Henne Vogelsang
ed0f55c45f
Fix remaining rubocop problems
2016-02-18 14:40:24 +01:00
Henne Vogelsang
5565d8fb68
Don't limit travis to master
2016-02-18 14:35:14 +01:00
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
Stella Rouzi
405b614c43
Merge pull request #783 from davidsf/fix_proposal_confirmation
...
Fix error 500 in user proposal confirmation
2016-02-18 14:00:02 +02:00
Stella Rouzi
73422735c0
Merge pull request #762 from davidsf/registration_limit
...
Add registration limit to conference
2016-02-18 13:55:16 +02:00
Henne Vogelsang
c654350423
Merge pull request #781 from davidsf/fix_repeated_day_in_splashpage
...
If the conference has only one day, not put the day twice in splashpage
2016-02-18 11:42:24 +01:00
David Sedeño
4783bc99b5
Fix error 500 in user proposal confirmation. fix #782
2016-02-17 18:19:32 +01:00
David Sedeño
a88bb4ea97
If the conference has only one day, not put the day twice in splashpage info. fix #780
2016-02-17 16:02:01 +01:00
Henne Vogelsang
743dd6ef4d
Merge pull request #779 from sonalkr132/spring
...
Update spring-commands-rspec and springify bin/rspec
2016-02-17 11:55:59 +01:00
Aditya Prakash
67ac6f0d65
Update spring-commands-rspec and springify bin/rspec
2016-02-16 21:46:33 +05:30
Christian Bruckmayer
ed083be58b
Merge pull request #775 from sonalkr132/cache-bundler
...
Enable Bundler caching on travis
2016-02-14 19:13:49 +01:00
Christian Bruckmayer
cfea3af5ca
Merge pull request #774 from davidsf/fix_title_in_layout
...
Put the config name as title in layouts.
2016-02-14 19:13:38 +01:00
Aditya Prakash
ba9a3e8afa
Enable Bundler caching on travis
...
Read more about it here: https://docs.travis-ci.com/user/caching/#Bundler
closes : #350
2016-02-12 14:30:00 +05:30
David Sedeño
f3f40822b0
Put the config name as title in layouts. fix #773
2016-02-11 21:56:15 +01:00