Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
2,455 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

180 Commits

Author SHA1 Message Date
wvengen 9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen ae4979a3f0 Lock protected_attributes version to make tests succeed (for now) 2015-07-20 23:55:44 +02:00
wvengen 12dae9cee8 Use inherited_resources rubygem 2015-06-05 14:59:54 +02:00
wvengen f5a7c4c90a Bundle update 2015-05-30 19:12:33 +02:00
wvengen 491ca00949 Update roo 2015-05-30 19:09:58 +02:00
wvengen 7f9c99f849 Use main ice_cube gem now feature is merged 2015-05-30 18:31:49 +02:00
wvengen b3196e0a12 Use tokeninput as dependency 2015-05-08 17:56:08 +02:00
wvengen aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen 07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen 7be903c209 Fix simple-navigation version to be sure 2015-04-11 02:13:28 +02:00
wvengen 987f14c226 Add missing gem (since Rails 4.2 upgrade) 2015-01-16 20:22:32 +01:00
wvengen 68f56a55e5 Merge pull request #333 from foodcoops/feature/plugin-uservoice 
Add uservoice plugin
 2015-01-02 23:22:12 +01:00
wvengen 7bc9d0ede6 Upgrade to rails 4.2 2015-01-02 17:43:44 +01:00
wvengen f72da3b5c9 Add uservoice plugin 2014-12-16 22:43:46 +01:00
wvengen 7ac3f54709 bundle update 2014-12-10 20:07:26 +01:00
wvengen a278004c11 Merge pull request #330 from foodcoops/feature/plugin-move 
Move plugins to separate directory.
 2014-12-02 23:37:22 +01:00
wvengen 219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen 6aa8ee7968 Move plugins to separate directory. 2014-11-22 00:43:24 +01:00
wvengen 6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen fe38e168bd bundle update 2014-10-16 20:57:44 +02:00
wvengen da2b5b54d0 fix pdf generation after last bundle update (complements 61a1efdfcf) 2014-09-02 15:41:43 +02:00
wvengen 21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen fcd2cd8713 update documentation generation 2014-06-23 17:51:20 +02:00
wvengen a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen 06bed3698f upgrade rails-settings-cached & bundle update 2014-06-23 17:51:19 +02:00
wvengen f2c755d2fb fix Gemfile (rspec would fail) 2014-06-23 17:51:18 +02:00
wvengen 8c0df3b4e8 edit order user-interface update 
also closes foodcoops#145
 2014-06-23 17:51:18 +02:00
wvengen 24b0628825 add yard documentation config 2014-06-23 17:51:18 +02:00
wvengen caed27948d add meta_request gem for debugging 2014-05-17 16:01:17 +02:00
wvengen 0bbe5ebcee bundle update 2014-05-13 17:01:27 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-05-13 17:01:25 +02:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen e88810e4a7 fix "Mysql2::Error: This connection is in use by" in spec for Rails 4 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-02-10 15:58:52 +01:00
wvengen ca234f0b70 deployment with Capistrano 3 (affects foodcoops#148) 2014-01-15 13:58:24 +01:00
wvengen 64040d6bb9 make some dependencies optional to decrease startup-time 2013-12-17 23:03:48 +01:00
wvengen 147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +01:00
wvengen 8ac7cbf96f retry tests as a workaround for fragile integration tests (closes foodcoops#205) 2013-11-21 00:29:24 +01:00
wvengen fd3aa7ebc9 move dependency to wiki plugin 2013-11-06 13:43:04 +01:00
wvengen 70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen d4dccbc646 add foodsoft_wiki plugin to Gemfile by default 2013-10-29 22:23:17 +01:00
wvengen 7779c15dc9 update testing gems to try fixing occasional integration test error 2013-10-29 21:31:07 +01:00
wvengen 98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen 6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen 34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
 2013-10-09 23:57:43 +02:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
Julius 3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +02:00
wvengen 64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
wvengen 0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
wvengen 1cf2145ff6 version update for security (now properly) (see also resque/redis-namespace#64) 2013-09-17 15:02:58 +02:00
wvengen e6320e5b7b add resque version for security 2013-09-17 14:49:19 +02:00
wvengen 707f487128 update spec gems to make tests work again 2013-09-07 01:34:34 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner 4ea940e4a3 Removed unused acts_as_configurable gem. 2013-09-02 10:03:12 +02:00
wvengen eac8260b38 add i18n tests 2013-07-25 14:46:25 +02:00
wvengen ca50006235 add coverage report, set COVERAGE=1 in env when running specs 2013-07-25 14:00:08 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +02:00
wvengen 62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen 0d33922ed9 make integration spec work with javascript driver too 2013-07-24 02:58:53 +02:00
wvengen d58ce31b7f add first integration test 2013-07-24 01:05:01 +02:00
wvengen b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
wvengen 3c264f6225 add some rspec tests for supplier and article 2013-07-14 02:50:54 +02:00
wvengen fc6fbdaa95 use less-rails, and make exception_notifier work again 2013-07-13 23:06:30 +02:00
wvengen 7fa8193010 start using rspec for tests 2013-07-12 20:06:49 +02:00
wvengen e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
wvengen 8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
Julius 6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Benjamin Meichsner e74c6b4068 Avoid having content-length warning in dev log. 2013-06-09 17:33:11 +02:00
wvengen a1a469da03 do not fail when common_deploy is not installed 2013-06-06 14:54:54 +02:00
Manuel Wiedenmann e8173d44ae adds rails-settings cached and rails-i18n-debug gems 2013-06-06 03:21:44 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 2fb7797c12 readds mysql 2013-05-25 20:31:15 +02:00
Manuel Wiedenmann ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann 92d9a57f3f adds capistrano for deployment 2013-05-25 19:38:14 +02:00
Manuel Wiedenmann 1f44204b58 readme updates 2013-05-25 15:03:31 +02:00
Benjamin Meichsner 77d4caea68 Added quiet_assets gem to have cleaner log file in developing. 2013-04-08 15:08:18 +02:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Benjamin Meichsner 44ef0a9807 Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
Benjamin Meichsner 65f9fe3392 Updated rails to version 3.2.11 2013-01-11 11:56:47 +01:00
benni d347e2404b Added whenever to manage cronjobs. 2012-12-26 14:03:35 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 8074fedefd Added libs for nice error output and benchmarker support. 2012-12-16 13:47:45 +01:00
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 2012-12-14 18:10:46 +01:00
benni ddcb4a9b2d Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
benni 7e6ac8c924 Moved acts_as_tree to gemfile. 2012-11-24 16:41:34 +01:00
benni 7fc0462fc4 Upgrade to rails 3.2.9. Moved acts_as_versioned to gem. 2012-11-24 16:36:40 +01:00
benni 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 
Conflicts:
	Gemfile
 2012-11-24 15:27:48 +01:00
Julius cecad7db13 make it run... 2012-11-09 23:54:45 +01:00
benni fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
Robert Waltemath dd3e5a0e4c Use sqlite database in development env only. 2012-10-18 10:08:29 +02:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
Robert Waltemath 9ac913fd34 added Gem 'sqlite3' for quick setup to work 2012-10-15 17:31:12 +02:00
benni ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00