Commit graph

1352 commits

Author SHA1 Message Date
wvengen
71d25c5ebb travis.yml fix 2013-07-24 21:40:36 +02:00
wvengen
c1147306be fix travis.yml 2013-07-24 21:28:42 +02:00
wvengen
a6114f137b add order integration spec 2013-07-24 21:25:57 +02:00
wvengen
bb20e9abea Merge branch 'master' into tests-rspec
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-24 21:25:36 +02:00
wvengen
23a08b2ac8 cleaner way to set foodcoop scope 2013-07-24 20:44:07 +02:00
wvengen
6da2fdee6d add travis-ci configuration 2013-07-24 13:21:52 +02:00
wvengen
62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen
8af04e0112 add product distribution integration test 2013-07-24 04:04:59 +02:00
wvengen
0d33922ed9 make integration spec work with javascript driver too 2013-07-24 02:58:53 +02:00
wvengen
a858ceedea more flexible login in spec helper 2013-07-24 01:11:36 +02:00
wvengen
d58ce31b7f add first integration test 2013-07-24 01:05:01 +02:00
wvengen
b9599ce455 Merge branch 'master' into updated-gems
Conflicts:
	Gemfile.lock
2013-07-18 20:28:56 +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
Manuel Wiedenmann
c85a7fcc5c fixes User#receive_email? 2013-07-18 16:58:04 +02:00
Manuel Wiedenmann
dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
wvengen
1d12e09342 update translations and localeapp roundtrip 2013-07-18 16:22:38 +02:00
Manuel Wiedenmann
0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n
cleanup of profile layout + set session on login
2013-07-18 07:19:20 -07:00
Manuel Wiedenmann
206709aa61 sets session[:locale] = user.locale after login 2013-07-18 16:09:32 +02:00
wvengen
1fed9834b3 fix tooltip after bootstrap update 2013-07-17 11:31:27 +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
wvengen
b81472d91b Merge pull request #159 from foodcoop-rostock/improve-delivery-workflow-further-stupid
Move client-side sorting into separate javascript file.
2013-07-17 01:54:18 -07:00
wvengen
ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further
Improve delivery workflow
2013-07-17 01:43:59 -07: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
ea399b2c72 client_side_validations config 2013-07-16 00:39:11 +02:00
wvengen
9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +02:00
wvengen
e5448603a4 update uglifier 2013-07-15 23:45:09 +02:00
Julius
4fafdcb7ad Remove broken font-size fix which is no longer needed 2013-07-15 21:58:09 +02:00
wvengen
427a023135 add group_order_article spec 2013-07-15 21:01:46 +02:00
wvengen
db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00
wvengen
679fc673c7 add group_order spec 2013-07-15 18:45:02 +02:00
wvengen
5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) 2013-07-15 18:03:02 +02:00
wvengen
3a7d650ed8 fix tests 2013-07-15 17:57:20 +02:00
wvengen
3ed8e0bc84 allow longer supplier phone number 2013-07-15 17:57:00 +02:00
wvengen
cc6a188f4e fix small test bug 2013-07-15 00:22:20 +02:00
wvengen
acd18721aa expand rspec tests 2013-07-15 00:17:07 +02:00
Julius
0e66414534 Allow creation of StockArticles also if there are no Articles for a supplier in delivery form 2013-07-14 22:00:38 +02:00
wvengen
3c264f6225 add some rspec tests for supplier and article 2013-07-14 02:50:54 +02:00
wvengen
fc6fbdaa95 use less-rails, and make exception_notifier work again 2013-07-13 23:06:30 +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
12506e54b8 Remove stock_changes_helper.rb 2013-07-13 09:34:19 +02:00
Julius
730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
wvengen
cfae279196 bundle update 2013-07-12 23:35:31 +02:00
Julius
edaf91b029 Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +02:00
Julius
e5eff07abd Move Select2 for stock_article_creation to tfoot of delivery form 2013-07-12 21:15:12 +02:00