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

718 Commits

Author SHA1 Message Date
wvengen 0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
wvengen 6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically 
Order tasks with same date by name.
 2013-09-17 05:45:13 -07:00
wvengen b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen 39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) 2013-09-10 11:59:32 +02:00
wvengen e20898c5ee Merge branch 'tests-rspec' into master-spec 2013-09-10 11:37:05 +02:00
wvengen 12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner a0760ebfdb Fixed delivering emails to users. 
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
 2013-09-06 11:40:40 +02:00
Robert Waltemath 9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master 
Conflicts:
	app/views/suppliers/shared_suppliers.haml
 2013-09-02 13:31:40 +02:00
wvengen 37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +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
Manuel Wiedenmann c85a7fcc5c fixes User#receive_email? 2013-07-18 16:58:04 +02:00
Manuel Wiedenmann dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
Manuel Wiedenmann 0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n 
cleanup of profile layout + set session on login
 2013-07-18 07:19:20 -07:00
Manuel Wiedenmann 206709aa61 sets session[:locale] = user.locale after login 2013-07-18 16:09:32 +02:00
wvengen 1fed9834b3 fix tooltip after bootstrap update 2013-07-17 11:31:27 +02:00
wvengen ccea97c2b3 update bootstrap assets 2013-07-17 11:31:12 +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 b81472d91b Merge pull request #159 from foodcoop-rostock/improve-delivery-workflow-further-stupid 
Move client-side sorting into separate javascript file.
 2013-07-17 01:54:18 -07:00
wvengen ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further 
Improve delivery workflow
 2013-07-17 01:43:59 -07:00
Julius 9f464706b4 Undo senseless indentation correction 2 2013-07-16 22:04:44 +02:00
Julius 3b91b9f7c6 Undo senseless indentation correction 2013-07-16 22:03:47 +02:00
Julius 7fd8abf381 Replace 'own' js table sorting by stupidtable plugin 2013-07-16 22:01:56 +02:00
wvengen 9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +02:00
Julius 4fafdcb7ad Remove broken font-size fix which is no longer needed 2013-07-15 21:58:09 +02:00
wvengen db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00
wvengen 5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) 2013-07-15 18:03:02 +02:00
wvengen 3ed8e0bc84 allow longer supplier phone number 2013-07-15 17:57:00 +02:00
Julius 0e66414534 Allow creation of StockArticles also if there are no Articles for a supplier in delivery form 2013-07-14 22:00:38 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
wvengen 126f7e7459 Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history 
Show StockChanges index
 2013-07-13 03:16:31 -07:00
Julius 12506e54b8 Remove stock_changes_helper.rb 2013-07-13 09:34:19 +02:00
Julius 730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
Julius edaf91b029 Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +02:00
Julius e5eff07abd Move Select2 for stock_article_creation to tfoot of delivery form 2013-07-12 21:15:12 +02:00
wvengen f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
wvengen db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius 469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
Julius 620686fa46 Merge branch 'master' into stock_article_quantity_history 2013-07-11 19:23:52 +02:00
Julius 7c27017306 Link delivery/stock_taking/order in stock_changes index 2013-07-11 18:37:55 +02:00
Julius ffcb9490c9 Make stock_changes readonly in index view 2013-07-11 18:20:24 +02:00
Robert Waltemath 65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
wvengen 2ef7e58b0b Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles 
only add undeleted articles in balancing screen
 2013-07-10 13:05:50 -07:00
wvengen 33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
Julius de9541a0df Ask how to fetch readonly associations 2013-07-09 21:49:39 +02:00
Julius ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius 5ed2659bc6 Fix StockArticle update in Delivery form 2013-07-09 17:08:59 +02:00