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

62 Commits

Author SHA1 Message Date
wvengen 2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00
wvengen 4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2014-01-20 13:36:46 +01:00
wvengen 8b4c292ea0 Merge pull request #222 from wvengen/feature-receive 
New receive screen
 2014-01-20 03:02:27 -08:00
wvengen 42d622d1b2 cleanup orders and add search 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
 2014-01-17 13:41:38 +01:00
wvengen b2f032ac8e fix bootstrap menu on mobile [ci skip] 2014-01-13 14:45:48 +01:00
wvengen 90c81de872 update receive delta column + responsive css 2014-01-09 12:20:54 +01:00
wvengen 56bd527a8b keep white input background with package class [ci skip] 2014-01-09 10:51:54 +01:00
wvengen b331d9a2a9 better css responsiveness [ci skip] 2014-01-08 19:58:51 +01:00
wvengen 65e79d7e1b small receive usability changes 2014-01-08 19:28:39 +01:00
wvengen dcc3d21b4d center table rows vertically [ci skip] 2014-01-08 10:32:30 +01:00
Julius 8479678530 Improve unlock button for receiving OrderArticles manually adjusted 
Conflicts:
	app/views/orders/_edit_amount.html.haml
 2014-01-04 20:51:42 +01:00
wvengen 133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
wvengen 9219d099c8 ui update for packages display 2014-01-03 12:42:36 +01:00
wvengen 014a62aa11 use disabled property for input and fix style 2014-01-03 10:59:42 +01:00
wvengen a439f26b67 ui design update 2014-01-02 22:30:04 +01:00
wvengen f5bd7a43e4 update balancing order article edit screen to support received units 2013-12-23 15:25:45 +01:00
wvengen 82d1c41e9f update show order 2013-12-18 21:46:34 +01:00
wvengen 2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog 
Edit article user-interface update
 2013-12-17 06:29:04 -08:00
wvengen 3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen 85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
Julius cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
wvengen 62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen 2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen 923b579bd1 Merge branch 'master' into article-dialog 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-06 14:26:50 +01:00
wvengen 3937400683 fix modal dialog margin [ci skip] 2013-12-06 14:26:04 +01:00
wvengen c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen 9c340ec08e more clarity whether a number is number units or boxes 2013-11-25 15:13:54 +01:00
wvengen bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen 84191ddcd0 first shot on improving edit article form 
(see also foodcoops#209)
 2013-11-20 23:46:11 +01:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
Julius 9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +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 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
Julius 4fafdcb7ad Remove broken font-size fix which is no longer needed 2013-07-15 21:58:09 +02:00
Julius a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +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 dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
Julius cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
 2013-03-06 01:01:12 +01:00