raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,631 Commits 18 Branches 452 Tags
224d91083d8317db2494b89d5737cbbe5261bfee
Commit Graph

184 Commits

Author SHA1 Message Date
Rob H
c6d9bfafbc Create shared services module for backend angularjs, rename modules 2014-01-17 13:48:28 +08:00
Rob H
970942ff42 Add JS spec and basic initialisation code for BOM 2014-01-17 13:16:35 +08:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Rohan Mitchell
7d224fb5ac Update js compressor for staging as well as production 2014-01-16 12:06:00 +11:00
Rohan Mitchell
38a20e4a8c Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 2014-01-16 12:05:43 +11:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate' 
Conflicts:
	config/ng-test.conf.js
 2014-01-09 12:07:42 +11:00
Rohan Mitchell
8f479868b4 Fix js test errors - foundation not found, but not reqd for testing angular 2014-01-09 11:44:03 +11:00
Rohan Mitchell
e35eccca93 Revert 3b3815a 6c5539a 39c2803 - remove non-mangling js compression which breaks build 2014-01-09 11:18:54 +11:00
Rohan Mitchell
3b3815a09d Require uglifier, should fix asset precompilation 2014-01-09 09:35:29 +11:00
Rohan Mitchell
6c5539a1da Update js compressor for staging as well as production 2014-01-08 17:25:32 +11:00
Rohan Mitchell
39c2803493 Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 2014-01-08 16:45:21 +11:00
Rohan Mitchell
a67cea3fcd Precompile darkswarm css and js 2014-01-08 15:59:09 +11:00
Will Marshall
e0c352d135 Merge branch 'master' into darkswarm 
Conflicts:
	spec/features/admin/products_spec.rb
 2014-01-08 14:49:47 +11:00
Rohan Mitchell
2f98888acd Remove active model serializers gem 2014-01-08 11:31:05 +11:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Will Marshall
87cef4edcc Reverting previous commit 2013-12-19 12:29:21 +11:00
Will Marshall
aaa2999ee1 Dropping our override of ActionMailer 2013-12-19 11:58:21 +11:00
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
Rohan Mitchell
cee54b4785 Convert Karma config file to v0.10 compatible format 2013-12-05 15:16:52 +11:00
Rohan Mitchell
634dd52a80 WIP: Convert bulk product update to coffeescript. 3 tests failing. 2013-12-05 15:16:51 +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