Will Marshall
|
843a1133ef
|
Moving to use custom serializers for ze JSON API
|
2013-12-17 13:48:08 +11:00 |
|
Will Marshall
|
4db8f755bf
|
Getting an order cycle update function in place like a boss
|
2013-12-11 12:42:02 +11:00 |
|
Will Marshall
|
63dfa0b696
|
Getting the test framework set up for Angular, setting up a products fetch stub
|
2013-12-06 15:24:42 +11:00 |
|
Will Marshall
|
b806947e7b
|
Merge branch 'master' into darkswarm
|
2013-12-06 11:08:17 +11:00 |
|
Rohan Mitchell
|
fdc98ba24c
|
Convert Karma config file to v0.10 compatible format
Conflicts:
config/ng-test.conf.js
|
2013-12-06 11:07:32 +11:00 |
|
Will Marshall
|
4543e08872
|
Renaming everything to Shop
|
2013-12-05 13:40:05 +11:00 |
|
Will Marshall
|
720d66b379
|
Merge branch 'master' into ui_setup
|
2013-12-04 14:28:20 +11:00 |
|
Will Marshall
|
578651ddae
|
forcing SSL in staging
|
2013-12-04 14:26:22 +11:00 |
|
Will Marshall
|
9876a5f27b
|
Merge branch 'master' into ui_setup
|
2013-12-04 14:13:06 +11:00 |
|
Will Marshall
|
987ba1a81a
|
Adding a monkeypatch to spree to always allow SSL
|
2013-12-04 14:08:08 +11:00 |
|
Will Marshall
|
ff003d8931
|
disabling SSL :/
|
2013-12-04 13:42:35 +11:00 |
|
Will Marshall
|
f0e847a9f1
|
Merge branch 'master' into ui_setup
|
2013-12-04 13:09:48 +11:00 |
|
Will Marshall
|
9efd7c2d69
|
Getting the darkswarm build flow up and running. Like a boss
|
2013-12-04 13:09:30 +11:00 |
|
Will Marshall
|
c2d3e8bcec
|
Forcing staging to SSL
|
2013-12-04 13:08:28 +11:00 |
|
Rohan Mitchell
|
6608b6e1ad
|
Remove some angular testing crud, integrate with regular rails config and script dirs
|
2013-11-29 11:13:41 +11:00 |
|
Will Marshall
|
b3bf3a8378
|
Adding the plumbing for Customers reports, and one tiny refactor to products
|
2013-11-22 14:56:57 +11:00 |
|
Will Marshall
|
5772fa9589
|
Boilerplate for the new Product and Inventory report, sans any functionality
|
2013-11-20 10:34:18 +11:00 |
|
Rohan Mitchell
|
27b8c4508f
|
Split product distribution editing into its own admin page
|
2013-11-13 15:22:17 +11:00 |
|
Rohan Mitchell
|
72efb2096b
|
Remove comment - everything makes sense now
|
2013-11-06 11:26:10 +11:00 |
|
Rohan Mitchell
|
fd43227921
|
Explicitly precompile style needed
|
2013-11-06 10:42:39 +11:00 |
|
Rohan Mitchell
|
bacd8401b4
|
Compile all admin css files for manual inclusion (fixes BugHerd #126)
|
2013-11-06 10:18:45 +11:00 |
|
Rohan Mitchell
|
25b0306a93
|
Ensure css is precompiled, reformat configs
|
2013-11-01 16:22:54 +11:00 |
|
Rohan Mitchell
|
647e1d196c
|
Position enterprise groups
|
2013-10-30 14:46:49 +11:00 |
|
Rohan Mitchell
|
57a450b0aa
|
Load landing page distributors from enterprise groups instead of yaml file
|
2013-10-30 13:55:47 +11:00 |
|
Rohan Mitchell
|
a6fa73ec13
|
List enterprise groups
|
2013-10-30 10:42:32 +11:00 |
|
Rohan Mitchell
|
6161114750
|
Standardise on Australia having ID 12, as staging and prod servers do
|
2013-10-30 10:34:29 +11:00 |
|
Rohan Mitchell
|
763dab9efc
|
Fix country init for Jenkins
|
2013-10-23 10:41:50 +11:00 |
|
Rohan Mitchell
|
101510f2f4
|
Fix error when setting up a fresh db
|
2013-10-23 09:25:26 +11:00 |
|
Rohan Mitchell
|
f7c431be3c
|
Rename database names and user name
|
2013-10-19 09:43:10 +11:00 |
|
Rohan Mitchell
|
34607ff556
|
Rename misc items from openfoodweb to openfoodnetwork
|
2013-10-18 17:43:59 +11:00 |
|
Rohan Mitchell
|
89f93cae77
|
Rename namespaced includes from open_food_web to open_food_network
|
2013-10-18 17:43:18 +11:00 |
|
Rohan Mitchell
|
e47fa0edfd
|
Rename application from Openfoodweb to Openfoodnetwork
|
2013-10-18 17:32:22 +11:00 |
|
Rohan Mitchell
|
57f7d489ff
|
Rename OpenFoodWeb namespace to OpenFoodNetwork
|
2013-10-18 17:29:55 +11:00 |
|
Rohan Mitchell
|
0b0c8253c1
|
Provide a hardcoded country code for CI (Jenkins), where countries are not pre-loaded
|
2013-10-11 14:13:24 +11:00 |
|
Rohan Mitchell
|
ba31e5d9fb
|
Remove hardcoded ID for Australia
|
2013-10-11 12:52:49 +11:00 |
|
Rohan Mitchell
|
30bc45370b
|
When order cycle expires mid-order, clear the order cycle and display a message
|
2013-09-30 16:56:11 +10:00 |
|
Rohan Mitchell
|
54d95d304f
|
Convert to Melbourne time zone
|
2013-09-30 11:25:26 +10:00 |
|
Rohan Mitchell
|
99e12afd04
|
Explicitly compile store/shop_front.js, which is used on the temp landing page in isolation from all.js
|
2013-09-23 16:47:03 +10:00 |
|
Rohan Mitchell
|
136ec7d9d3
|
Remove heroku newrelic config
|
2013-09-19 09:34:57 +10:00 |
|
Rohan Mitchell
|
633399bbfb
|
Rename 'Inner Melbourne' region to 'Eaterprises'
|
2013-09-18 12:39:20 +10:00 |
|
David Cook
|
fe513d42c4
|
Rename 'Order Cycles' report group to 'Orders & Fulfillment'
|
2013-09-18 09:25:51 +10:00 |
|
Rohan Mitchell
|
29e1f38207
|
Set up production distributors for current order cycle
|
2013-09-12 18:21:44 +10:00 |
|
David Cook
|
b7541dcd52
|
Rename 'Home' link to 'OFN'
|
2013-09-11 15:13:45 +10:00 |
|
Rohan Mitchell
|
8f768d3b84
|
Update staging distributors
|
2013-09-10 15:17:18 +10:00 |
|
Rohan Mitchell
|
91550ac82f
|
Move distributor config to its own file, re-enable pry for tests
|
2013-09-10 09:50:16 +10:00 |
|
Rohan Mitchell
|
15d3bff92d
|
Add delete_content_for helper, can be used for removing the sidebar from spree views
|
2013-09-10 08:45:59 +10:00 |
|
alexs333
|
999bc2697a
|
Implemented simlified shop flow.
|
2013-09-04 20:33:18 +10:00 |
|
Rohan Mitchell
|
8a092697ee
|
Enterprise manager can clone an order cycle
|
2013-08-22 17:11:53 +10:00 |
|
Rohan Mitchell
|
f1fa90d7c3
|
Clone order cycles
|
2013-08-22 16:53:11 +10:00 |
|
Rohan Mitchell
|
aab7176f2c
|
Enterprise manager can bulk edit products
|
2013-08-22 11:21:49 +10:00 |
|