Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1844 commits 22 branches 1 tag 31 MiB
Commit graph

133 commits

Author SHA1 Message Date
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
benni
eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni
78cc423a46 Replaced prawnto plugin with rails31 compatible version. 2012-09-30 21:48:57 +02:00
benni
0a1c326f14 Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
benni
29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni
b0c9580b53 Added delayed_job as new background queue manager. 2012-08-24 13:48:45 +02:00
benni
f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni
9ac747e9f3 Updated rails to 3.0.16 2012-07-27 18:12:10 +02:00
benni
8a74e7d77f Removed annoate and hirb Gemfiles. 
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
 2012-07-27 18:07:42 +02:00
benni
4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
5636e200dc Moved some plugins from vendor/plugins into Gemfile. 2012-04-15 19:13:38 +02:00
benni
ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni
5bf6503a8f Included new localize_input gem. 2011-05-20 00:19:58 +02:00
benni
3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni
013637a4fc Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +02:00
benni
0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni
c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
benni
a4f71bd672 Updated haml and acts_as_paranoid. Removed sass templates. 2011-05-15 21:50:43 +02:00
benni
03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni
2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni
b1a700ab5d Upgraded will_paginate. 2011-05-11 12:31:17 +02:00
benni
eab16e337e Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
benni
d09d3922c1 Upgraded exception notifier plugin. 2011-05-11 11:03:36 +02:00
benni
4eba5fbc9c First step for upgrading to rails 3. 
Check rake rails:upgrade:check for next steps.
 2011-05-11 01:32:21 +02:00
benni
bea145f33d Upgrade rails to 2.3.11. 2011-05-10 23:29:36 +02:00
benni
be85296ddb Enabled hirb for better console formatting. 2011-05-07 21:14:11 +02:00
benni
dcd2a514a6 Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
benni
04293c8dcf Added sqlite gem to support sqlite3 databases. 2011-05-06 20:37:48 +02:00
benni
0df0519947 Upgrade to rails 2.3.10. 2011-05-06 19:52:50 +02:00
benni
20b7db306b Implemented bundler. No more confusiong with gem versions! 2011-01-30 22:59:32 +01:00