wvengen
|
1946cd1ab3
|
make user creation possible again
|
2013-10-02 23:33:24 +02:00 |
|
wvengen
|
bc5795b052
|
small model change
|
2013-10-02 23:29:21 +02:00 |
|
wvengen
|
75e858db71
|
bundle update
|
2013-10-02 22:55:14 +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
|
6cfaa4979a
|
show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179)
|
2013-10-02 16:32:29 +02:00 |
|
wvengen
|
9ac9d1ea50
|
add spec for foodcoops/foodsoft#179
|
2013-10-02 16:32:01 +02:00 |
|
wvengen
|
0bb62332c0
|
localeapp roundtrip
|
2013-10-01 00:05:46 +02:00 |
|
Julius
|
d36f2dd4ac
|
Fix minor delivery bug
|
2013-09-30 11:04:55 +02:00 |
|
wvengen
|
6632f5ed75
|
workaround migration bug introduced by 975bcdec3a
|
2013-09-30 11:01:15 +02:00 |
|
Julius
|
53f24cd885
|
Fix migrate problem caused by output formating(?)
|
2013-09-25 21:22:34 +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 |
|
Benjamin Meichsner
|
817d61491e
|
Merge branch 'master' of github.com:foodcoops/foodsoft
|
2013-09-25 11:58:53 +02:00 |
|
Benjamin Meichsner
|
975bcdec3a
|
Avoid send messages so STDOUT in rake silen mode.
|
2013-09-25 11:57:22 +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 |
|
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
|
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 |
|
wvengen
|
ea3db22306
|
user display changes in model and mailer
|
2013-09-22 14:38:56 +02:00 |
|
wvengen
|
f6c2fd9a9d
|
more user display changes
|
2013-09-22 02:15:35 +02:00 |
|
wvengen
|
6d3db7636a
|
make search work without nickname usage
|
2013-09-20 23:18:06 +02:00 |
|
wvengen
|
17c1ee803f
|
fix typo breaking invitation
|
2013-09-20 23:15:44 +02:00 |
|
wvengen
|
e4f0a1e3ed
|
start of making nickname optional
|
2013-09-20 22:40:13 +02:00 |
|
wvengen
|
a77c3b59b1
|
allow to login with email instead of nick as well + tests
|
2013-09-20 22:39:19 +02:00 |
|
wvengen
|
fa99a0a852
|
add bitdeli badge
|
2013-09-20 18:24:40 +02:00 |
|
Benjamin Meichsner
|
2060261c89
|
Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals
fix closed group_order totals
|
2013-09-19 03:14:40 -07:00 |
|
wvengen
|
2008bb75bf
|
update travis badge after tests merge [ci skip]
|
2013-09-18 23:35:01 +02:00 |
|
Julius
|
14d4d2f12d
|
Add list.js for filtering articles (another try for foodcoops#143)
|
2013-09-18 23:28:18 +02:00 |
|
wvengen
|
c7f28a3b5c
|
use plain Ruby memoization to fix deprecation (closes #121)
|
2013-09-18 22:46:58 +02:00 |
|
wvengen
|
6b0146eb95
|
add spec for article#in_open_order
|
2013-09-18 22:46:57 +02:00 |
|
wvengen
|
50a8cce9fd
|
do not update localeapp from translation instance, since it may run a slightly older version [ci skip]
|
2013-09-18 19:21:59 +02:00 |
|
wvengen
|
f1f7e8d709
|
localeapp roundtrip
|
2013-09-18 19:14:48 +02:00 |
|
wvengen
|
2d549fc1da
|
do not recalculate GroupOrder totals, but show message to do so on migrations
|
2013-09-18 18:33:49 +02:00 |
|
Benjamin Meichsner
|
84daaf1b6c
|
Merge branch 'production'
|
2013-09-18 18:30:15 +02:00 |
|
Benjamin Meichsner
|
4c27a98e06
|
Fixed failing asset precompiling in production mode.
|
2013-09-18 18:19:41 +02:00 |
|
wvengen
|
ebb22ccb53
|
Merge branch 'master' into fix-closed-group_order-totals
Conflicts:
db/schema.rb
|
2013-09-18 18:14:07 +02:00 |
|
Benjamin Meichsner
|
5681553ca0
|
Avoid connecting to redis backend in test environment.
This makes it also possible to test if certain background task are doing what they should do.
|
2013-09-18 18:04:40 +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 |
|
Benjamin Meichsner
|
857eb64a45
|
Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion
Keep member order on orderarticle deletion
|
2013-09-18 08:32:33 -07:00 |
|
Benjamin Meichsner
|
6a1f7d279a
|
Merge branch 'master' of github.com:foodcoops/foodsoft
|
2013-09-18 17:29:03 +02:00 |
|
Benjamin Meichsner
|
7e659e2374
|
Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements
|
2013-09-18 17:16:04 +02:00 |
|
wvengen
|
5f9b144c53
|
Merge pull request #176 from fsmanuel/master
uses FactoryGirl helpers
|
2013-09-18 08:16:02 -07:00 |
|
wvengen
|
19a61a6c42
|
update gems
|
2013-09-18 16:53:49 +02:00 |
|
Benjamin Meichsner
|
c597d70596
|
Merge branch 'master' of github.com:foodcoops/foodsoft
|
2013-09-18 15:19:04 +02:00 |
|
Benjamin Meichsner
|
b515d5b2e8
|
Fixed whenever cron config.
|
2013-09-18 14:52:23 +02:00 |
|