raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,573 Commits 18 Branches 453 Tags
ee2da3e00822a0855a8bdb11d187e689a52d419a
Commit Graph

1573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob H
ee2da3e008 Toggle new view controls on BPE 2014-01-10 00:26:54 +08:00
Rohan Mitchell
c396c2a21f Improve speed of BPE specs 2014-01-09 12:37:43 +11:00
Rohan Mitchell
420ff37562 Provide explicit ordering for intermittently failing spec 2014-01-09 12:09:50 +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
Rob H
ac17502046 Fix test 2014-01-08 12:30:32 +08:00
Will Marshall
533a987684 Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom 2014-01-08 15:20:33 +11:00
Rohan Mitchell
c08c42b087 Fix inconsistent test fails - insignificant ordering 2014-01-08 15:11:46 +11:00
Will Marshall
e5514920c8 Fixing up the error messages in our specs 2014-01-08 15:11:23 +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
Will Marshall
7838d759ee Removing redundant functionality from the Order Populator 2014-01-08 14:45:40 +11:00
Rohan Mitchell
5f4d787d26 Fix sorting error in spec 2014-01-08 14:43:46 +11:00
Rohan Mitchell
c42d741d3d Remove browse product specs for removed feature 2014-01-08 14:41:06 +11:00
Rohan Mitchell
4a74c2624c Remove specs for removed features 2014-01-08 14:15:06 +11:00
Rohan Mitchell
ea3e697b73 Rename method for clarity, remove outdated specs for OrderPopulator 2014-01-08 14:14:45 +11:00
Rohan Mitchell
20ad906f7a Fix multicart use of OrderPopulator 2014-01-08 14:13:19 +11:00
Rohan Mitchell
dd16934496 Remove redundant serializer spec, reinstate creation of order distribution charges 2014-01-08 13:22:34 +11:00
Rohan Mitchell
4f7fdd430f Update failing controller spec - order needs distributor set 2014-01-08 11:58:53 +11:00
Rohan Mitchell
df53a14d4b Remove specs that are no longer relevant - distribution selection on product page no longer present 2014-01-08 11:51:26 +11:00
Rohan Mitchell
eda4f241e2 Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests 2014-01-08 11:39:05 +11:00
Rohan Mitchell
30eb11ad84 Allow select_distribution to take no order_cycle 2014-01-08 11:38:21 +11:00
Rohan Mitchell
ef56574d82 Pass quantity to OrderPopulator 2014-01-08 11:37:38 +11:00
Rohan Mitchell
458f91ef91 Add feature spec helper to select distributor and order cycle 2014-01-08 11:31:44 +11:00
Rohan Mitchell
2f98888acd Remove active model serializers gem 2014-01-08 11:31:05 +11:00
Will Marshall
5e041a6f4f Uncommenting the old OP code 2014-01-08 10:35:27 +11:00
Will Marshall
06ab4d5384 Patching some further regression bugs 2014-01-07 15:28:11 +11:00
Will Marshall
936d80b2c5 Removing a redundant test: no longer show current distributor and order cycle 2014-01-07 15:16:36 +11:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Will Marshall
32c7682da2 Removing the serializers to fix regression issues 2014-01-07 11:12:44 +11:00
Will Marshall
641b7dcdf4 Removing the image serializer, causing regression bugs 2014-01-07 11:05:10 +11:00
Will Marshall
8e0a7d9072 Pretties, fixing the email validation issue with admin authentication steps 2014-01-07 11:04:40 +11:00
Rob H
177782fac5 Status message works when updating products with filters applied 2014-01-06 18:20:00 +08:00
Will Marshall
9677ec7159 Starting to build mixins 2014-01-06 16:27:41 +11:00
Will Marshall
1264af584c Removing a pointless test 2014-01-06 15:56:28 +11:00
Will Marshall
dd1b3311d7 Removing all the old order populator stuff 2014-01-06 15:23:21 +11:00
Rob H
49b9b8f635 Add messages to BPE interface for cases when 0 or > 500 products are found 2014-01-05 19:17:50 +08:00
Rob H
2e56d7a551 Can remove filters from BPE 2014-01-05 17:53:32 +08:00
Rob H
fb9fd5089a WIP: Adding a hard filter to BPE works 2014-01-05 17:04:27 +08:00
Rob H
6445275530 Basic layout changes for BPE page 2014-01-05 00:37:36 +08:00
Rob H
a6d7044dfd WIP: Adding basic UI for applying hard filtering to BPE 2014-01-04 19:21:10 +08:00
Rob H
7ef358a476 Add basic hard filter adding js infrastructure for BPE 2014-01-04 16:44:00 +08:00
Rob H
687332d2b0 Add loading splash to BPE 2014-01-04 15:50:26 +08:00
Rob H
c6222f2180 BPE pagination works with filtering 2014-01-02 15:22:10 +08:00
Rob H
6b865aa38c Display BPE update message correctly 2014-01-02 13:10:06 +08:00
Rob H
ef78609049 Prevent page being orphaned when changing page size in BPE 2013-12-26 19:37:21 +08:00