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

130 commits

Author SHA1 Message Date
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
853e8ba9d2 add package images [ci skip] 2013-11-25 15:25:13 +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
98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen
51e6a7aeb0 Merge pull request #149 from foodcoop-adam/updated-gems 
run bundle update and make it work again
 2013-10-18 03:12:59 -07:00
wvengen
e1eb6031c8 load fr translation for datepicker 2013-10-17 16:48:34 +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
b8ff431634 clean up price tooltips javascript 2013-10-09 10:43:41 +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
dce92b9d7c i18n ordering javascript 2013-10-04 15:01:24 +02:00
wvengen
64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
Julius
26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) 2013-10-03 16:10:18 +02:00
Julius
c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) 2013-09-25 20:58:53 +02:00
Julius
a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius
9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
Julius
6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius
891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
Julius
14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +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
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
Julius
469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
wvengen
33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
wvengen
33b27d2fa7 proper usage of jQuery.on(), and update javascript in views as well 2013-07-08 22:41:06 +02:00
Julius
a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +02:00
Julius
bba70dc875 Change DOM sort style to match existing style 2013-07-08 21:51:15 +02:00
Julius
5fcc14a36d Fix trailing '*/' in application.css 2013-07-08 20:46:05 +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
d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius
dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen
c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
wvengen
931b3bef5e fix touch event twice bug (complements ac62dcce9d) 2013-06-20 01:20:13 +02:00
Julius
cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
Julius
cc5574f8b5 Revert ac62dcce9d 2013-06-18 09:10:31 +02:00
Julius
6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Julius
a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n 2013-06-17 15:43:42 +02:00
Manuel Wiedenmann
6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius
b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
wvengen
ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-14 01:42:47 +02:00
Julius
65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
Manuel Wiedenmann
7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Julius
b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius
0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +02:00
wvengen
7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Julius
3208321319 Fix stockit increase formula for present behavior 2013-03-14 21:55:10 +01: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
wvengen
e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
wvengen
eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
Julius
8c7a4f0331 Fix empty dd in horizontal dl 2013-01-29 17:52:44 +01:00
Benjamin Meichsner
310a97912c Fixed disabling submit_button in group order form. 2013-01-26 15:41:46 +01:00
benni
ecc31641aa Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
benni
1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni
16de9124fe Fixes orders. 2012-10-30 00:20:47 +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
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni
699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni
acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni
52e62f8ddb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
benni
f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni
31735f35ab Reenabled sidebar.. 2012-10-03 20:27:40 +02:00
benni
29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00