gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1488 commits 15 branches 2 tags 50 MiB
Commit graph

1488 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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