Julius
|
cc5574f8b5
|
Revert ac62dcce9d
|
2013-06-18 09:10:31 +02:00 |
|
wvengen
|
1e984df3aa
|
more beautiful ordergroup edit form
|
2013-06-18 01:35:12 +02:00 |
|
Julius
|
6e6cce1cb7
|
Add Select2 jQuery plugin
|
2013-06-17 16:15:19 +02:00 |
|
Julius
|
9502ca28dd
|
Merge latest changes in master
|
2013-06-17 15:47:08 +02:00 |
|
Julius
|
a9938df443
|
Clean up sort functionality; Remove title attributes due to hard I18n
|
2013-06-17 15:43:42 +02:00 |
|
wvengen
|
f47237ebe0
|
update link
|
2013-06-17 03:13:42 +02:00 |
|
wvengen
|
9523eba65f
|
add badges
|
2013-06-17 02:59:36 +02:00 |
|
Benjamin Meichsner
|
eee5d4a896
|
Fixed indentation bug in sync template.
|
2013-06-16 15:10:50 +02:00 |
|
Benjamin Meichsner
|
8c4da55561
|
Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign
|
2013-06-16 14:55:48 +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 |
|
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 |
|
wvengen
|
18f067ea60
|
make localeapp updates work in production environment too
|
2013-06-14 03:10:32 +02:00 |
|
wvengen
|
2f31d1a5f8
|
add heroku deploy script
|
2013-06-14 02:42:13 +02:00 |
|
wvengen
|
9b05923d7c
|
Merge branch 'touchscreens'
|
2013-06-14 01:44:04 +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 |
|
wvengen
|
8141ad0233
|
remove duplicate code
|
2013-06-14 01:39:30 +02:00 |
|
wvengen
|
13f2c128c6
|
do not use string values for integers (closes foodcoops/foodsoft#128)
|
2013-06-14 01:36:41 +02:00 |
|
Julius
|
3a48d1576f
|
Remove broken sort-by-price; comment redundancy of stock_change template
|
2013-06-13 23:51:37 +02:00 |
|
Julius
|
65f61e09d5
|
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
|
2013-06-13 23:36:22 +02:00 |
|
wvengen
|
add4afd172
|
make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)
|
2013-06-13 11:59:50 +02:00 |
|
wvengen
|
ca9841dd02
|
fixup translation string order for localeapp roundtrip
|
2013-06-13 00:09:04 +02:00 |
|
wvengen
|
e3e1b5a1b3
|
add start of Dutch translation
|
2013-06-13 00:08:15 +02:00 |
|
wvengen
|
d63e1f8066
|
translation updates previously missed
|
2013-06-12 23:20:02 +02:00 |
|
wvengen
|
848ef67e40
|
update documentation urls in config after repository move
|
2013-06-12 22:57:44 +02:00 |
|
wvengen
|
a9c3d538d0
|
use rfc2606 compliant domains in sample config
|
2013-06-12 22:56:37 +02:00 |
|
wvengen
|
3d1847fabb
|
small i18n and translation updates
|
2013-06-12 22:44:51 +02:00 |
|
Julius
|
49cfa9aded
|
Cleanup StockArticle creation during delivery
|
2013-06-11 15:05:19 +02:00 |
|
Julius
|
e28f3eda65
|
Fix StockArticle creation during delivery; small cleanups
|
2013-06-11 13:10:18 +02:00 |
|
wvengen
|
b7f71f5859
|
fix reset password breakage by avoiding encoding ampersand in url (closes #123)
|
2013-06-11 00:01:57 +02:00 |
|
Julius
|
9753e6db00
|
Resolve merge conflicts with i18n
|
2013-06-10 20:05:47 +02:00 |
|
Robert Waltemath
|
b7416b2210
|
Fixed percent sign in sync-view.
|
2013-06-10 11:01:31 +02:00 |
|
wvengen
|
ad29a238f2
|
finish English translation
|
2013-06-10 10:02:33 +02:00 |
|
Manuel Wiedenmann
|
d9b6723975
|
adds infos about the new branch structure to readme
|
2013-06-10 02:01:15 +02:00 |
|
Manuel Wiedenmann
|
7a63394dac
|
Merge remote-tracking branch 'origin/rails3'
Conflicts:
Gemfile
Gemfile.lock
|
2013-06-10 01:53:31 +02:00 |
|
Benjamin Meichsner
|
241c5666ec
|
Merge pull request #119 from balkansalat/rails3-improve-checkall-performance
Improve performance of *check-all* checkbox
|
2013-06-09 09:19:19 -07:00 |
|
Benjamin Meichsner
|
fd091d9b89
|
Merge pull request #118 from balkansalat/rails3-order-delivery-articles
Order articles for delivery selection by name only
|
2013-06-09 09:15:20 -07:00 |
|
Benjamin Meichsner
|
7c4ee01ff2
|
Define autofill attributes when creating new supplier from shared_supplier.
|
2013-06-09 18:02:47 +02:00 |
|
Benjamin Meichsner
|
e74c6b4068
|
Avoid having content-length warning in dev log.
|
2013-06-09 17:33:11 +02:00 |
|
Benjamin Meichsner
|
60afa85ece
|
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
Update ordergroup prices in OrderArticles via Order.
|
2013-06-09 08:26:38 -07:00 |
|
Julius
|
0ebe38b7a9
|
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance
|
2013-06-07 09:52:56 +02:00 |
|
Julius
|
966902ff55
|
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles
|
2013-06-07 09:51:50 +02:00 |
|
Julius
|
ff343933dd
|
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views
|
2013-06-07 09:49:32 +02:00 |
|
Julius
|
0058e826b2
|
Reorder delivery articles
|
2013-06-07 09:35:22 +02:00 |
|
Julius
|
0f4614eb31
|
Add percent sign for tax in forms
|
2013-06-06 17:58:02 +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
|
a1a469da03
|
do not fail when common_deploy is not installed
|
2013-06-06 14:54:54 +02:00 |
|
wvengen
|
8929f69dc4
|
add missing i18n text
|
2013-06-06 02:42:38 +02:00 |
|