wvengen
|
fef17604c5
|
remove unused autocomplete templates
|
2013-10-30 20:50:56 +01:00 |
|
wvengen
|
5ead67f88c
|
remove unused memberships controller/view
|
2013-10-30 20:46:59 +01:00 |
|
wvengen
|
3275e9ba31
|
small i18n bug
|
2013-10-22 00:09:11 +02: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
|
4e61e764df
|
fix haml indentation errors
|
2013-10-17 16:35:50 +02:00 |
|
wvengen
|
389b45a505
|
fix stockit i18n reference
|
2013-10-10 19:23:37 +02:00 |
|
wvengen
|
23b38b5a46
|
fix category heading
|
2013-10-10 19:22:43 +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
|
67e29620f4
|
i18n simple_form move of invoices
|
2013-10-09 23:37:08 +02:00 |
|
wvengen
|
6ba971fe15
|
i18n simple_form move of deliveries
|
2013-10-09 23:19:40 +02:00 |
|
wvengen
|
c3d22e883d
|
i18n simple_form move of suppliers
|
2013-10-09 23:12:26 +02:00 |
|
wvengen
|
78c81b194c
|
i18n simple_form move of foodcoop
|
2013-10-09 23:00:07 +02:00 |
|
wvengen
|
552af7925d
|
i18n simple_form move of tasks
|
2013-10-09 22:41:23 +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 |
|
wvengen
|
a32a3757d2
|
Merge pull request #180 from foodcoop-rostock/search-article-list-modified
Search articles in group_orders form
|
2013-10-08 02:21:35 -07:00 |
|
Julius
|
10d1615cd8
|
Prepare tooltip for next bootstrap version (as in 1fed9834b3)
|
2013-10-05 22:28:04 +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
|
a9dff7f1df
|
add missing i18n
|
2013-10-04 10:25:53 +02:00 |
|
Julius
|
ac1341d5b0
|
Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip
|
2013-10-03 23:22:31 +02:00 |
|
Julius
|
9a9a782bc4
|
Complete StockArticle#show view
|
2013-10-03 23:21:53 +02:00 |
|
Julius
|
fef8c6d99f
|
Move StockArticle#history to StockArticle#show
|
2013-10-03 22:24:21 +02:00 |
|
Julius
|
a3e82f5304
|
Add article price tooltip to StockTaking form
|
2013-10-03 22:14:41 +02:00 |
|
wvengen
|
bbcad49831
|
start moving from simple_form i18n to activerecord
|
2013-10-03 16:03:13 +02:00 |
|
wvengen
|
1674dcf851
|
fix i18n of article sync
|
2013-10-03 14:36:53 +02:00 |
|
wvengen
|
1d8fefcfb7
|
small i18n update
|
2013-10-02 17:08:24 +02:00 |
|
Julius
|
d36f2dd4ac
|
Fix minor delivery bug
|
2013-09-30 11:04:55 +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
|
3c8f56b24f
|
Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143)
|
2013-09-22 22:07:34 +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 |
|
Benjamin Meichsner
|
b015ceea0b
|
Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article
|
2013-09-18 17:50:30 +02:00 |
|
wvengen
|
0abb63279f
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile.lock
|
2013-09-18 13:00:26 +02:00 |
|
Robert Waltemath
|
e728e76729
|
Merge branch 'master' into warn-uncheck-ordered-article
|
2013-09-17 17:10:56 +02:00 |
|
wvengen
|
b11706f30a
|
sort ordergroups in order screen and pdfs
|
2013-09-17 00:25:38 +02:00 |
|
wvengen
|
8ca95f396f
|
make both ordered and received products visible in order screens and pdfs
|
2013-09-16 23:52:58 +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 |
|
Robert Waltemath
|
805071f3fb
|
Added checkbox to ignore warnings. Added translations.
|
2013-09-04 10:52:14 +02:00 |
|
Robert Waltemath
|
bb25bdc6eb
|
Improved error data passing.
|
2013-09-03 17:37:49 +02:00 |
|
Robert Waltemath
|
1c9fad0a7b
|
Added validation for removed but ordered articles.
|
2013-09-03 12:09:33 +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
|
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 |
|