Rob Harrington
|
05c350b5ff
|
Refactoring unitsCtrl
|
2015-04-24 11:27:47 +10:00 |
|
Rob Harrington
|
c66a7e44b6
|
Updating product model specs to reflect changes to properties
|
2015-04-23 15:37:41 +10:00 |
|
Rob Harrington
|
9eb99d1c4a
|
Merge branch 'master' into properties
|
2015-04-23 14:18:30 +10:00 |
|
Rob Harrington
|
57be445bd4
|
Merge branch 'master' into require_standard_variant
|
2015-04-23 14:18:11 +10:00 |
|
Rob Harrington
|
6cde1f7732
|
Add tooltip with value for selectors
|
2015-04-23 14:11:50 +10:00 |
|
Rob Harrington
|
7b83438b5e
|
Pulling property values into the shopfront
|
2015-04-23 13:51:49 +10:00 |
|
Rob Harrington
|
e6a98747b4
|
correction in read only logic for filter selectors
|
2015-04-23 13:32:56 +10:00 |
|
Rob Harrington
|
ed15b95de0
|
Adding properties and taxons to producer modal
|
2015-04-23 12:31:20 +10:00 |
|
Rob Harrington
|
3df2720b31
|
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
|
2015-04-23 12:31:06 +10:00 |
|
Maikel Linke
|
eff8681d9b
|
Merge branch 'master' into single-order-patches
|
2015-04-23 12:11:44 +10:00 |
|
Maikel Linke
|
a937fd3c61
|
Using variant overrides in variant seach on order edit page
|
2015-04-23 11:37:10 +10:00 |
|
Maikel Linke
|
3412bc25bf
|
Edit Orders: more variant info in variant search
Displaying variant's full name and the producer's name.
|
2015-04-23 10:17:01 +10:00 |
|
Maikel Linke
|
f1a8011e13
|
Documentation of Variant.full_name
The code was confusing for all developers here. Maybe a bit of doco
helps.
|
2015-04-23 10:02:32 +10:00 |
|
Rohan Mitchell
|
f70bfee481
|
Merge branch 'master' into require_standard_variant
|
2015-04-23 09:56:41 +10:00 |
|
Rohan Mitchell
|
92e03e208f
|
Extract load_environment method
|
2015-04-23 07:23:34 +10:00 |
|
Rob Harrington
|
76d6345ab5
|
Merge remote-tracking branch 'origin/master' into require_standard_variant
|
2015-04-22 21:02:47 +10:00 |
|
Rob Harrington
|
0251d8962d
|
Adding sku to BPE
|
2015-04-22 21:02:07 +10:00 |
|
Rob Harrington
|
1c617994fc
|
User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from
|
2015-04-22 21:02:07 +10:00 |
|
Rob Harrington
|
4a4b3da551
|
Using properties_including_inherited for product properties on the shop page
|
2015-04-22 21:02:07 +10:00 |
|
Rob Harrington
|
e546388784
|
Rename properties_h to properties_including_inherited
|
2015-04-22 21:02:07 +10:00 |
|
Rob Harrington
|
976c24cf4c
|
properties_h uses inherit_properties flag, and returns property id rather than presentation
|
2015-04-22 21:02:07 +10:00 |
|
Rob Harrington
|
f610a709e1
|
Adding inherits_properties to BPE
|
2015-04-22 21:02:06 +10:00 |
|
Rob Harrington
|
5d6f265c0a
|
Moving spree namespaced serializers into admin
|
2015-04-22 21:02:06 +10:00 |
|
Rob Harrington
|
1f293bb787
|
Adding inherits properties flag to products
|
2015-04-22 21:02:06 +10:00 |
|
Rob Harrington
|
a4a41ae26a
|
Refactor properties_h
|
2015-04-22 21:02:06 +10:00 |
|
Rohan Mitchell
|
7aeeb6d18f
|
Add script to run JS specs in CI
|
2015-04-22 16:36:31 +10:00 |
|
Rohan Mitchell
|
7a78f4870a
|
Use phantomjs for js specs, so we can run them in CI
|
2015-04-22 16:33:44 +10:00 |
|
Rohan Mitchell
|
28c79cdb50
|
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
|
2015-04-22 15:01:22 +10:00 |
|
Rohan Mitchell
|
b9e3ff54b8
|
Add build script to merge to master
|
2015-04-22 14:47:54 +10:00 |
|
Rohan Mitchell
|
0c0be0112e
|
Update paths to include ci
|
2015-04-22 14:31:30 +10:00 |
|
Rohan Mitchell
|
883a2e0a0e
|
WIP: Move CI scripts to their own folder
|
2015-04-22 14:29:59 +10:00 |
|
Rohan Mitchell
|
6c81109b17
|
Local branch isn't checked out, so we need to test remote branch
|
2015-04-22 14:17:07 +10:00 |
|
Rohan Mitchell
|
1c9a95b3d6
|
Set execute bit
|
2015-04-22 13:19:17 +10:00 |
|
Rohan Mitchell
|
53c4c8b5b7
|
Push to staging fails unless master has been merged into current branch
|
2015-04-22 13:16:39 +10:00 |
|
Rohan Mitchell
|
d406f9ccdf
|
Tests fail unless master has been merged into current branch
|
2015-04-22 13:14:51 +10:00 |
|
Rohan Mitchell
|
7d4a4f8f9d
|
Pushing to staging first loads staging baseline data
|
2015-04-22 12:55:36 +10:00 |
|
Rohan Mitchell
|
35536a629c
|
Set execute bit
|
2015-04-22 12:55:36 +10:00 |
|
Rob Harrington
|
699a28e14c
|
Merge branch 'master' into require_standard_variant
|
2015-04-22 10:58:43 +10:00 |
|
Rohan Mitchell
|
7b8938b5f6
|
Run password reset job for spec that requires it
|
2015-04-22 07:32:22 +10:00 |
|
Rohan Mitchell
|
b2717ffca0
|
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
|
2015-04-21 16:40:45 +10:00 |
|
Rohan Mitchell
|
700cb73b8f
|
Send enterprise confirmation emails asynchronously
|
2015-04-21 16:19:02 +10:00 |
|
Rohan Mitchell
|
9d225142c8
|
Send password reset instructions asynchronously
|
2015-04-21 16:10:40 +10:00 |
|
Rohan Mitchell
|
998288e21f
|
Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs.
|
2015-04-21 15:37:36 +10:00 |
|
Rohan Mitchell
|
9f93c9f221
|
Swap Jenkins build badge out for Buildkite
|
2015-04-21 15:17:34 +10:00 |
|
Rohan Mitchell
|
22127b2d18
|
Use progress formatter for less verbose CI output. I miss Fuubar formatter, though.
|
2015-04-21 15:17:34 +10:00 |
|
Rohan Mitchell
|
692e58e8f7
|
Output spec-by-spec results to track specs-hanging-at-90-percent issue
|
2015-04-21 10:52:14 +10:00 |
|
Rohan Mitchell
|
4158663e9a
|
Pushing to production saves staging baseline data
|
2015-04-21 10:47:36 +10:00 |
|
Rob Harrington
|
a75a76840d
|
Merging master into require_standard_variant
|
2015-04-17 21:18:24 +10:00 |
|
Rob Harrington
|
ff2e6d9ca4
|
Test deletion rather than destruction on variant model spec
|
2015-04-17 17:25:13 +10:00 |
|
Maikel Linke
|
893b743973
|
tidy (rm comment)
|
2015-04-17 17:00:18 +10:00 |
|