Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* https://github.com/foodcoops/foodsoft: (33 commits)
Fix financial_links table in schema.rb
API v1 navigation endpoint
API v1 config endpoint
API v1 user endpoint
Prepare for API v1 (PR foodcoops#570)
Bundle update (CVE-2018-3760, requires Ruby 2.3, PR foodcoops#561)
fix auto_close_and_send_min_quantity
Fix internal server error at invoices
Add import route for bank_transactions
Add short name to FinancialTransactionType
Add edit functionality for financial links
Add model and views for bank accounts
improve usability when ordering (PR foodcoops#552)
Add format helper for currency
Refactor FoodsoftFile to reuse the code later
Remove deprecated Gemnasium badge
Fix balancing with financial_transaction_types
Make the site_map the default view when showing all wiki pages
Add missing brackets to the Message-ID of emails
Add missing development dependency to docs
...
  • Loading branch information
Jonas Dinkelmann committed Dec 17, 2018
2 parents 9cb8f25 + 9b307f7 commit 5b5caf5
Show file tree
Hide file tree
Showing 136 changed files with 2,670 additions and 887 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: ruby
sudo: false
rvm:
- 2.1
- 2.3
services:
- mysql
- redis-server
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source "https://rubygems.org"

gem "rails", '~> 4.2'


gem 'sass-rails'
gem 'less-rails'
gem 'uglifier', '>= 1.0.3'
Expand All @@ -20,7 +19,7 @@ gem 'rails-assets-listjs', '0.2.0.beta.4' # remember to maintain list.*.js plugi
gem 'i18n-js', '~> 3.0.0.rc8'
gem 'rails-i18n'

gem 'mysql2'
gem 'mysql2', '~> 0.4.0' # for compatibility with rails 4
gem 'prawn'
gem 'prawn-table'
gem 'haml', '~> 4.0' # some breaking changes in version 5, remove this line again when fixed
Expand All @@ -30,6 +29,10 @@ gem 'simple_form'
gem 'inherited_resources'
gem 'localize_input', git: "https://github.com/bennibu/localize_input.git"
gem 'daemons'
gem 'doorkeeper'
gem 'doorkeeper-i18n'
gem 'rack-cors', require: 'rack/cors'
gem 'active_model_serializers', '~> 0.10.0'
gem 'twitter-bootstrap-rails', '~> 2.2.8'
gem 'simple-navigation', '~> 3.14.0' # 3.x for simple_navigation_bootstrap
gem 'simple-navigation-bootstrap'
Expand Down
Loading

0 comments on commit 5b5caf5

Please sign in to comment.