Rohan Mitchell
|
924492ec5b
|
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
|
2015-05-15 10:37:34 +10:00 |
|
Continuous Integration
|
e3723da65a
|
Auto-merge from CI [skip ci]
|
2015-05-14 14:32:07 +10:00 |
|
Rob Harrington
|
c8502747be
|
Fixing layout of customers index
|
2015-05-14 12:37:55 +10:00 |
|
Rob Harrington
|
78fc3e376b
|
Fixing styling of inputs for with pending/success/error status
|
2015-05-14 11:39:37 +10:00 |
|
Rob Harrington
|
50d0d04994
|
Removing obsolete dataSubmitter service
|
2015-05-14 11:38:55 +10:00 |
|
Rohan Mitchell
|
b4755c37dc
|
Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics
|
2015-05-14 11:03:27 +10:00 |
|
Rohan Mitchell
|
7da403808c
|
Style mobile menu [skip ci]
|
2015-05-13 16:56:49 +10:00 |
|
Rob Harrington
|
640c02570d
|
Splitting out specs for switchClass service
|
2015-05-13 16:41:28 +10:00 |
|
Rob Harrington
|
3849b39d3e
|
Splitting out specs for pending changes service
|
2015-05-13 16:39:43 +10:00 |
|
Rob Harrington
|
ffac0e4ceb
|
Adding ngTagsInput to angular spec manifest
|
2015-05-13 16:06:38 +10:00 |
|
Rohan Mitchell
|
ec1290d687
|
Style home page for mobile
|
2015-05-13 15:59:36 +10:00 |
|
Rob Harrington
|
a473d0ed11
|
Checking in db version change
|
2015-05-13 15:58:03 +10:00 |
|
Rohan Mitchell
|
7946340dad
|
Allow more phantomjs timeout to avoid the first-spec-timeout issue
|
2015-05-13 15:34:27 +10:00 |
|
Rohan Mitchell
|
b86872095a
|
Add google analytics
|
2015-05-13 14:52:17 +10:00 |
|
Rohan Mitchell
|
5e5628d0c3
|
Fix shops path for spec
|
2015-05-13 14:31:40 +10:00 |
|
Rohan Mitchell
|
0ac7dbf23b
|
Update spec references to removed file logo.jpg
|
2015-05-13 14:27:43 +10:00 |
|
Rohan Mitchell
|
14fdc7d3ae
|
Move home spec to shops spec
|
2015-05-13 14:27:18 +10:00 |
|
Rohan Mitchell
|
238adc5354
|
Do not couple editable content to frequently-changing home page format
|
2015-05-13 14:18:00 +10:00 |
|
Rohan Mitchell
|
75e0c1d99e
|
Conclusively remove cta1
|
2015-05-13 14:13:10 +10:00 |
|
Rohan Mitchell
|
ff44636040
|
Home controller functionality moved to shops controller
|
2015-05-13 14:10:21 +10:00 |
|
Rohan Mitchell
|
76e41e6c1e
|
Basic consistency styling for groups signup page [skip ci]
|
2015-05-13 12:51:34 +10:00 |
|
Rohan Mitchell
|
92805b5442
|
Style producers signup page CTA pane
|
2015-05-13 12:46:11 +10:00 |
|
Rob Harrington
|
34f5cfb6b5
|
Completed orders require a customer, add association logic
|
2015-05-13 12:44:38 +10:00 |
|
Rob Harrington
|
1559b4e30a
|
Adding customer reference to orders
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
ed941e211d
|
Don't require a code on customer
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
dd9c192d48
|
Shuffling layout a little on customer index
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
b364994cc8
|
Adding tags input to customer index using ngTagsInput
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
3bc69242ce
|
Style tweaks
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
d2e8b23dd4
|
Creating association between enterprise and customers
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
5b3c9842e4
|
Adding acts_as_taggable to customer model
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
a03c7a5f22
|
Adding ngTagsInput to admin assets
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
a60fd3d388
|
Installing ngTagInput
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
4c5e75c3f9
|
Adding acts-as-taggable-on gem
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
5b49e64bf2
|
Hiding bulk checkboxes on customer interface (for now)
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
9add073b17
|
User can update customer code from customer index page
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
734ad21e82
|
Customers controller responds with json
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
dcde2d88ad
|
Adding Customer resource to resources service
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
4545e0ff95
|
Adding request defaults to index utils module
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
3890ba9a11
|
Wrapping pending changes service in a class
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
8f94390363
|
Moving a bunch of index related services from general admin module into indexUtils
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
a873278881
|
Moving line-item-upd-attr to indexUtils module, renaming to obj-for-update
|
2015-05-13 12:44:35 +10:00 |
|
Rob Harrington
|
2afd501af3
|
Wiring up update action for customers controller
|
2015-05-13 12:44:34 +10:00 |
|
Rob Harrington
|
8f35ccf007
|
Adding quick search and column dropdown to customers index
|
2015-05-13 12:44:34 +10:00 |
|
Rob Harrington
|
79d50a64ae
|
BPE uses columns controller from intex utils
|
2015-05-13 12:44:34 +10:00 |
|
Rob Harrington
|
3e7d331892
|
BOM uses columns controller from index utils module
|
2015-05-13 12:44:34 +10:00 |
|
Rob Harrington
|
3b7ab086c9
|
Fix module name
|
2015-05-13 12:44:34 +10:00 |
|
Rob Harrington
|
69ba8540c1
|
Moving toggle_column directive to index_utils
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
5bd842fe1a
|
Moving toggle_column directive to dropdown module
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
f5c0ae0f41
|
Moving dropdown to its own module folder and renaming
|
2015-05-13 12:44:33 +10:00 |
|
Rob Harrington
|
1c03e27686
|
Moving dropdown to its own folder
|
2015-05-13 12:44:33 +10:00 |
|