gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-17 05:34:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1473 commits 15 branches 2 tags 50 MiB
Commit graph

1473 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Henne Vogelsang
2034c0f965 Merge pull request #772 from davidsf/fix_schedule_event 
Fix room_params in scheduler update
 2016-02-09 13:43:35 +01:00
David Sedeño
00acf0c255 Fix room_params in scheduler update. fix #771 2016-02-08 22:52:58 +01:00
Henne Vogelsang
bcacc7fd17 Merge pull request #765 from hennevogel/travis 
Travis: Enable IRC notification, disable addons
 2016-02-08 15:55:07 +01:00
Henne Vogelsang
27e8016cf2 Travis: Enable IRC notification, disable addons 2016-02-08 14:58:11 +01:00
Henne Vogelsang
919c69f7ae Fix new rubocop offense 2016-02-08 14:57:23 +01:00
Henne Vogelsang
046f726414 rubocop: Update todo file, enable rails cops 2016-02-08 14:57:23 +01:00
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
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