Julius
3336065218
Add missing translations for ArticlePrice attributes
2013-12-30 12:38:26 +01:00
Julius
f3c3b7af34
Fix StockArticle#derive title i18n
2013-12-28 20:07:28 +01:00
Julius
3bf1392251
Show clearer error message on WikiCloth exception
2013-12-22 23:34:54 +01:00
Julius
42e983f7ee
Move html markup of WikiCloth exception from locales to controller
2013-12-22 18:09:40 +01:00
Julius
496a250495
Rescue on WikiCloth exception
2013-12-22 12:17:02 +01:00
wvengen
88f2dad706
language change
2013-12-18 22:14:52 +01:00
wvengen
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
wvengen
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
wvengen
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +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
a02ca1b9c0
localeapp roundtrip [ci skip]
2013-12-17 18:54:05 +01:00
wvengen
94b2c8eac3
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
...
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
2013-12-17 15:58:47 +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
5af82eb55c
Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
...
Publish/subscribe pattern for DOM updates after AJAX database manipulation
2013-12-17 06:28:25 -08:00
wvengen
46ab4dcc01
proper i18n of last ordergroup order (thanks @JuliusR)
2013-12-14 13:15:47 +01:00
wvengen
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
wvengen
6bbc614e42
localeapp roundtrip (closes foodcoops#156)
2013-12-10 18:03:50 +01:00
wvengen
e42e27957d
improve task i18n (affects foodcoops#137)
2013-12-10 17:58:32 +01:00
wvengen
85b6ff908b
make new article dialog more responsive
2013-12-10 16:41:26 +01:00
Julius
30b35cdd11
Improve usability of supplier selection for stock_articles in delivery form
2013-12-09 00:03:07 +01:00
Julius
7eb64e3c9d
Update locales
2013-12-07 17:58:06 +01:00
Julius
7a673b1a8b
Move stock_article locales from delivery to stock_article
2013-12-07 17:48:04 +01:00
Julius
92f560e189
Again revert wrong quotation mark in English locale
2013-12-07 16:46:16 +01:00
Julius
3e49104318
Revert wrong quotation mark in English locale
2013-12-07 16:44:16 +01:00
Julius Rapp
11117738ce
Resolve merge conflicts
2013-12-07 11:50:37 +01:00
Julius Rapp
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
wvengen
112fa3be23
fix forgotten i18n string (affects foodcoops#137)
2013-12-06 23:08:28 +01:00
wvengen
111c061efa
more i18n cleanup (affects foodcoops#137)
2013-12-06 22:53:59 +01:00
wvengen
a475a27f79
i18n cleanup (affects foodcoops#137)
2013-12-06 22:43:36 +01:00
wvengen
1c4b9591a2
fix edit article dialog title
2013-12-06 12:34:14 +01:00
wvengen
e42589ae72
translations update (localeapp roundtrip)
2013-12-06 11:58:08 +01:00
wvengen
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
wvengen
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
wvengen
6410396489
localeapp roundtrip
2013-11-24 02:12:32 +01:00
wvengen
e5471b9f73
more i18n cleanup
2013-11-24 01:47:34 +01:00
wvengen
652a392b37
simplify i18n and fix some small ui issues
2013-11-23 17:49:43 +01:00
wvengen
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
wvengen
2ac7016ccc
localeapp roundtrip [ci skip]
2013-11-18 15:01:26 +01:00
wvengen
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
wvengen
5daf1a466f
localeapp roundtrip
2013-11-11 18:08:28 +01:00
wvengen
768796407f
Merge pull request #192 from foodcoop-adam/cleanup-stale
...
Cleanup unused views&controllers
2013-11-11 09:05:19 -08:00
wvengen
891b9a21c0
fix and improve i18n of "My Ordergroup"
2013-11-09 14:19:54 +01:00
wvengen
f7a0103553
clearer login field name
2013-10-30 21:28:35 +01:00
wvengen
3588962329
remove unused layout
2013-10-30 20:53:01 +01:00
wvengen
5ead67f88c
remove unused memberships controller/view
2013-10-30 20:46:59 +01:00
wvengen
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
wvengen
9ba425aafa
fallback for when nick is nil
2013-10-29 19:05:24 +01:00
wvengen
13a7f84e35
localeapp roundtrip [ci skip]
2013-10-23 12:48:19 +02:00
wvengen
d1f9b0b090
apply changes to other translations + translation fixes
2013-10-21 17:55:58 +02:00
wvengen
6e5184d796
use rails-i18n translations
2013-10-17 16:43:14 +02:00
wvengen
a339ae4c7c
i18n simple_form move of remaining labels
2013-10-10 19:12:59 +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
762292ef8e
small i18n move
2013-10-09 22:29:19 +02:00
wvengen
1b49a08c5e
localeapp roundtrip
2013-10-08 11:42:23 +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
9041a350d5
Add some locales for article attributes
2013-10-05 22:37:17 +02:00
wvengen
dce92b9d7c
i18n ordering javascript
2013-10-04 15:01:24 +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
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
3574f239c6
localeapp roundtrip
2013-10-02 17:33:37 +02:00
wvengen
17bbb0705b
fix i18n
2013-10-02 17:23:49 +02:00
wvengen
a8ace3bc79
add missing i18n
2013-10-02 17:13:49 +02:00
wvengen
1d8fefcfb7
small i18n update
2013-10-02 17:08:24 +02:00
wvengen
0bb62332c0
localeapp roundtrip
2013-10-01 00:05:46 +02:00
Julius
9f083dd4d0
Add button to clear article search (list.js customization)
2013-09-23 21:31:54 +02:00
wvengen
77fbf3ca81
Merge pull request #175 from foodcoop-rostock/fix-balancing
...
Added hint when changing total delivered amount.
2013-09-23 02:14:50 -07:00
Julius
14d4d2f12d
Add list.js for filtering articles (another try for foodcoops#143)
2013-09-18 23:28:18 +02:00
wvengen
f1f7e8d709
localeapp roundtrip
2013-09-18 19:14:48 +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
Benjamin Meichsner
5444c3a1c0
Merged updates from localeapp.
2013-09-18 17:48:24 +02:00
Robert Waltemath
142de28ade
Split up messages for stock/ supplier orders.
2013-09-18 10:50:56 +02:00
Robert Waltemath
dbb0bb4506
Added hint when changing total delivered amount.
2013-09-18 10:07:50 +02:00
Robert Waltemath
e728e76729
Merge branch 'master' into warn-uncheck-ordered-article
2013-09-17 17:10:56 +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
ee31c0c2af
localeapp roundtrip
2013-09-10 12:06:40 +02:00
wvengen
b235592656
add total to order pdf, layout changes ( closes foodcoops/foodsoft#138 )
2013-09-10 11:59:32 +02:00
wvengen
6418790ef5
localeapp roundtrip, with updated translations
2013-09-10 10:46:02 +02:00
wvengen
9922c0322a
first version of new translation: French
2013-09-06 19:41:24 +02:00
Robert Waltemath
805071f3fb
Added checkbox to ignore warnings. Added translations.
2013-09-04 10:52:14 +02:00
Benjamin Meichsner
51a91f376d
Updated locales from localeapp.
2013-09-02 13:34:30 +02:00
wvengen
3e4c535bb1
update translations and localeapp roundtrip
2013-07-18 19:27:52 +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
1d12e09342
update translations and localeapp roundtrip
2013-07-18 16:22:38 +02:00
Julius
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
wvengen
3fd498d29f
translations update
2013-07-13 12:37:20 +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
730dc7cf2a
Move StockChanges#index to StockArticles#history
2013-07-13 09:32:27 +02:00
wvengen
66e0bbc348
cleanup translation changes introduced by last merge
2013-07-11 22:09:58 +02:00
wvengen
db8a929f0b
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
...
Great!
2013-07-11 12:48:41 -07:00
wvengen
2ee1bef410
translation updates
2013-07-11 21:36:32 +02:00
Julius
54afbb7af5
Add locales for stock_changes index
2013-07-11 19:21:56 +02:00
Robert Waltemath
65c0b555c2
Added warning/ hint when updating periodic task.
2013-07-11 10:30:55 +02:00
Julius
f76b9da1e9
Separate columns for article price and unit in delivery form
2013-07-08 22:19:27 +02:00
Julius
a6228bdcf2
Style bootstrap tooltip; show FC share in article price info
2013-07-08 22:10:36 +02:00
Julius
ff1317b17b
Add hint to copy stock_article if price change desired in delivery process
2013-07-08 21:02:43 +02:00
Julius Rapp
a5565b436f
Resolve merge conflicts
2013-07-07 14:58:57 +02:00
Julius Rapp
02e2ce4bc3
Update locales
2013-07-07 14:30:13 +02:00
wvengen
9ef208fa13
small translation changes
2013-06-29 03:02:05 +02:00
wvengen
b807e9d059
beautify order mail
2013-06-29 02:54:00 +02:00
wvengen
9b0db5bb0b
translation updates: capitalisations, order_result mail
2013-06-29 02:46:20 +02:00
Robert Waltemath
e5d790021c
Add repeated symbol to task list.
2013-06-27 10:22: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
8a79dfd167
Add tooltip for article prices
2013-06-26 20:06:38 +02:00
Julius
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
Julius
5df4c8f8a6
Update locales for delivery form
2013-06-26 15:21:11 +02:00
wvengen
e450cf404e
harmonize order cycle translations
2013-06-25 00:16:30 +02:00
Robert Waltemath
c27127c745
Added i18n strings.
2013-06-24 11:53:52 +02:00
wvengen
cab6ada8b8
small invoice i18n cleanup/refactoring
2013-06-21 14:24:05 +02:00
wvengen
c5c4b1f93f
small translation updates
2013-06-21 13:54:36 +02:00
wvengen
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
wvengen
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
wvengen
c48ce138f3
cleanup of profile layout
2013-06-18 12:25:05 +02:00
Julius
04c9770e80
Complete I18n
2013-06-18 10:59:53 +02:00
Julius
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
wvengen
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +02:00
wvengen
8c08de9eae
translation fixes, clarifications and additions
2013-06-15 17:59:15 +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
Julius
885b11dba8
Add english translations for novel delivery functionality
2013-06-14 12:33:16 +02:00
Manuel Wiedenmann
ba923a8f16
updates locale files
2013-06-14 02:53:17 +02:00
wvengen
ca9841dd02
fixup translation string order for localeapp roundtrip
2013-06-13 00:09:04 +02:00
wvengen
d63e1f8066
translation updates previously missed
2013-06-12 23:20:02 +02:00
wvengen
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
wvengen
ad29a238f2
finish English translation
2013-06-10 10:02:33 +02:00
wvengen
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
wvengen
3d05900067
make translation roundtrip over localeapp work without changes
2013-06-06 02:28:58 +02:00
wvengen
fb6196b78b
fix translation errors and inconsistencies between German and English
2013-06-06 01:54:50 +02:00
wvengen
75c4e7d6f7
move English translations to single file
2013-06-06 01:33:41 +02:00
wvengen
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
wvengen
afda844380
initial English locale translation
2013-01-31 11:03:32 +01:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +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
Benjamin Meichsner
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
