fix bid dropdown dismissal #1230
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
acjay
commented
Apr 13, 2017
| @@ -11,6 +11,9 @@ helpers = require './helpers.coffee' | |||
| metaphysics = require '../../../../../lib/metaphysics.coffee' | |||
| template = -> require('./templates/index.jade') arguments... | |||
|
|
|||
| LOT_STANDING_MAX_POLLS = 10 | |||
| LOT_STANDING_POLL_INTERVAL = 1000 | |||
There was a problem hiding this comment.
My version of the Damassi Transform is giving names to magic numbers 😄
There was a problem hiding this comment.
Yeah, this is definitely clearer 👍
| @@ -23,7 +26,7 @@ module.exports = class ArtworkAuctionView extends Backbone.View | |||
| 'change .js-artwork-auction-max-bid': 'setMaxBid' | |||
|
|
|||
| initialize: ({ @data }) -> # | |||
| setInterval before(10, @updateBidLabel), 1000 | |||
There was a problem hiding this comment.
I wanted to change this pattern, because the way it was before, the timer keeps on firing. It's better to clean up after ourselves by scheduling only the number of calls we want to make, rather than squelch the function calls beyond the ones we want.
| @data = extend data, user: CURRENT_USER? | ||
| @render() | ||
|
|
||
| @render() unless isEqual(old_data, data) |
There was a problem hiding this comment.
Apparently isEqual does a deep compare, which is handy here. It's still not great that we re-render a component that the user might be in the middle of interacting with. But comparing the data driving the render seemed like the easiest partial fix.
| @@ -23,7 +26,7 @@ module.exports = class ArtworkAuctionView extends Backbone.View | |||
| 'change .js-artwork-auction-max-bid': 'setMaxBid' | |||
|
|
|||
| initialize: ({ @data }) -> # | |||
| setInterval before(10, @updateBidLabel), 1000 | |||
| @updateBidLabel LOT_STANDING_MAX_POLLS | |||
There was a problem hiding this comment.
I want to make sure the first call happens immediately, so that we hopefully get into steady state ASAP, and the user can interact away.
|
Looks good, though a test is failing somewhere in that view: https://circleci.com/gh/artsy/force/822#tests/containers/2 |
acjay
force-pushed
the
1229_fix_bid_dropdown_dismissal
branch
from
2498eb6 to
0c5d91a
Compare
acjay
commented
Apr 14, 2017
| setInterval before(10, @updateBidLabel), 1000 | ||
| # Defer until next tick. This really just gets the sequence right for | ||
| # testing to work. This doesn't feel like a great justification, though. | ||
| setTimeout (=> @updateBidLabel LOT_STANDING_MAX_POLLS), 0 |
There was a problem hiding this comment.
The before hook in the tests uses a __set__ mechanism I'm not sure I understand to affect the value of AUCTION in the scope of the class, but this only takes effect after instantiation of the class. I work around this by deferring to next tick. Open to better suggestions.
There was a problem hiding this comment.
This should get you what you need: https://github.com/artsy/force/blob/master/desktop/apps/artwork/client/test/index.coffee#L18 -- benv's expose function.
There was a problem hiding this comment.
Hmm, so maybe if I add artwork_id to it, it'll work. I'll try!
|
LGTM 👍 |
craigspaeth
added a commit
to craigspaeth/force
that referenced
this pull request
Apr 27, 2017
commit ce6f95c2c8750a0a48149f6fa5e7294e2606dde4
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 27 16:58:47 2017 -0400
Leave out rollupify for now
commit 669c646d9dcb79b823ac8d1c0f162a4ec3296055
Merge: 22401ff 1b3adec
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 27 16:56:08 2017 -0400
Merge branch 'master' of github.com:artsy/force into remove-unused
Conflicts:
package.json
yarn.lock
commit 1b3adecf96561e37f25b8488ef3d2f7bc56f2955
Merge: 6e9eb83 7d267ca
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Thu Apr 27 12:04:53 2017 -0700
Merge pull request #1314 from sweir27/conditional-logger
@damassi => only load redux logger in dev and staging
commit 7d267ca9a4e7daf2e768904e6304ab42e4d6efd5
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 26 17:18:56 2017 -0400
only load logger in dev and staging
commit 6e9eb83591f7f5bd0e95b31dc1a9f5818a29ac52
Merge: 636066a 35b2483
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Thu Apr 27 12:54:12 2017 -0400
Merge pull request #1318 from eessex/finished-cover
@kanaabe => [Venice] Completed video cover
commit 636066a12fdffbf5346c6eeb285a352e9aaff33a
Merge: 712bef0 9964fc4
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 27 10:56:22 2017 -0400
Merge pull request #1313 from cavvia/search-results
@sweir27 : search static pages in global search
commit 35b2483e9ba4206b2c11b268899fb34be0275fba
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 27 09:51:58 2017 -0400
video cover is displayed on video completion
commit 9964fc468c7d23779d4510aa94361545ccd5dfa6
Author: Anil <anil@cavvia.net>
Date: Thu Apr 27 12:00:56 2017 +0200
fix static page thumbnails not showing in global search bar
commit 880770020170880dfd537f80fe8cc16c553ec2c3
Author: Anil <anil@cavvia.net>
Date: Wed Apr 26 20:33:00 2017 +0200
search static pages in global search
commit 712bef018774e225dc72b9f27e9d1a546819371d
Merge: b13cce5 ed9e8fd
Author: Eve Essex <eve.essex@gmail.com>
Date: Thu Apr 27 04:48:03 2017 -0400
Merge pull request #1317 from kanaabe/last-features
@eessex => [Venice] Video close, ready, adaptive streaming, smooth scrubbing
commit ed9e8fd057daf9ea5968fd0688e32fc03099504d
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 21:22:53 2017 -0400
Smooth out scrubber
commit b13cce51ae8351752bdff134ba4cfcb96732dd58
Merge: ce352b3 f0e2848
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 26 20:50:57 2017 -0400
Merge pull request #1316 from craigspaeth/circle-script
Update circle script with new assets script
commit f0e2848f0dd0b01b9483619cedae99acd108cc34
Author: Artsy <craigspaeth@gmail.com>
Date: Wed Apr 26 20:33:34 2017 -0400
Fixed circle script
commit d4b4addecc2a56901c2fea61ac3c767afd1c8159
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 20:24:54 2017 -0400
Adds tests
commit 977f6dddff692b3d47f3f0560a695ad1545c2711
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 19:41:36 2017 -0400
Loading message
commit e1b4a25d546b5e897e62554cfa996bd1d2d77d1c
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 18:28:38 2017 -0400
Fix issue with loading video from unpublished section
commit 311e77f875ec2b5b46a0f0547d9ffef1994a421e
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 17:43:49 2017 -0400
Adaptive streaming for non-iOS mobile
commit 76008554333c7831488a1d987993a3ba97c7c175
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 17:13:33 2017 -0400
Close button
commit 93a622bd0fbb2b175823a14f5906a9a2787cfc2c
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 16:09:51 2017 -0400
listenTo VeniceVideoView
commit ce352b3fabf8e1aab09361a81ef78dceacc8372f
Merge: 3d47df1 9dcb1dc
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 26 20:24:46 2017 -0400
Merge pull request #1315 from damassi/update-contributing-docs
@craigspaeth => Update CONTRIBUTING.md
commit 9dcb1dcf8b51da9e3be67d46e6916ebf7328b1b2
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 26 16:24:07 2017 -0700
Update CONTRIBUTING.md
commit 3d47df18ff11d32b3a764e1bf91d25e0d94b5045
Merge: 4d57d6e 35ef16b
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 26 16:16:25 2017 -0700
Merge pull request #1311 from craigspaeth/assets
@damassi: Add bundle splitting via factor-bundle
commit 35ef16beed9e83a2ce44b425e875d1f946cf4b02
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 26 18:16:45 2017 -0400
Simplified public folder glob
commit 6b0c34da7b86e130fafd689d6791137c1da8b358
Merge: 3036c07 4d57d6e
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 26 18:11:52 2017 -0400
Merge branch 'master' of github.com:artsy/force into assets
Conflicts:
package.json
scripts/deploy.sh
commit 3036c0750703cc42f3b815676ab95be65ab9677e
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 26 18:10:13 2017 -0400
Removed ezel-assets in favor of a shell script that uses factor-bundle
commit 4d57d6ed8939ed6d8fe332cb5f4f7d5499915551
Merge: f9e8ef1 8d12274
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Wed Apr 26 17:52:52 2017 -0400
Merge pull request #1310 from kanaabe/fix-test
@craigspaeth => [Venice] Fixes test and onbeforeunload tracking
commit 8d12274f6f6f536a86b989c4ae739e2dfb82185b
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 17:29:08 2017 -0400
Fix mobile shows test
commit fec3ad42aeb949d5494ff686dceb1c1f1b3979a6
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 17:14:00 2017 -0400
Fixes how-auctions-work
commit e0e4c245d0145ae28a3cc6f47fb25043755a4475
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 16:57:56 2017 -0400
Attempt to fix mobile auctions test
commit e2b38d9204e65d05111138390b5a191c8c2990f4
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 16:32:01 2017 -0400
Fix video test
commit 46abfb80e74a2860410d37923b7d38441cb06a4e
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 15:43:57 2017 -0400
Try and fix the test
commit 2444128603006bebcad6d6118b62502141a54a82
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 26 11:44:30 2017 -0400
Fixes test and onbeforeunload tracking
commit f9e8ef1b45b88db1dc0a00c1b03e57e895096018
Merge: 2b0726a 78f40ab
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 26 12:48:41 2017 -0700
Merge pull request #1312 from sweir27/auction-analytics-qa
@damassi => Auction analytics QA items
commit 78f40ab04a41c5ad80c7ec30c00829ee0b252235
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 26 15:25:07 2017 -0400
renaming
commit fdc064fd1349e537516ae2c6709610f3d6a8f9a2
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 26 13:02:41 2017 -0400
adds tests
commit 2b0726a2413961cf616db1fd1a084a745e93cab6
Merge: 5edf918 0fa309f
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Wed Apr 26 12:08:52 2017 -0400
Merge pull request #1309 from eessex/venice-styles
@kanaabe => Venice style QA
commit ec5559f12dc8b83d5bd3abb2f511f61142c3d5b5
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 25 18:39:28 2017 -0400
adds analytics middleware for changed params
commit 5edf91887dd71e2be21bcdcab09fb878a2e84e58
Merge: bea01f1 ee47529
Author: Eve Essex <eve.essex@gmail.com>
Date: Wed Apr 26 10:03:19 2017 -0400
Merge pull request #1308 from kanaabe/venice-qa
@eessex => [Venice] Style QA
commit 0fa309f0cf0d9d2d3cedd70191332c285e6269d2
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 26 10:02:37 2017 -0400
qa style updates
commit bea01f10f87b90c8f194403b636131cbe9ba2c0d
Merge: 1233c69 22e21d3
Author: Luc Succes <luc@tryoften.com>
Date: Wed Apr 26 09:50:45 2017 -0400
Merge pull request #1297 from gnilekaw/package_json
Fix mocha tests in package.json
commit 1233c69bf75b2134bd36a7784e57635754aa87a3
Merge: fa5dc76 fa148ab
Author: Eve Essex <eve.essex@gmail.com>
Date: Wed Apr 26 05:36:41 2017 -0400
Merge pull request #1306 from kanaabe/analytics
@eessex => [Venice] Analytics
commit ee47529c3eef24b3faa8ce7fe0a313104d1c5327
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 25 18:51:13 2017 -0400
QA
commit fa5dc76428bd9f0f9b01bf92b172a81db607dd1a
Merge: a02298d 937ad2c
Author: Christina <c.thompsonms@gmail.com>
Date: Tue Apr 25 18:10:44 2017 -0400
Merge pull request #1307 from l2succes/upgrade-reaction-force
Upgrades reaction-force
commit 937ad2cb63c97614912f1e8acac4c826d2690d22
Author: Luc Succes <l2succes@gmail.com>
Date: Tue Apr 25 17:51:31 2017 -0400
bump reaction-force
commit fa148abd3f729a403e766d223cf1cdea05a61727
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 25 17:14:47 2017 -0400
Remove unnecessary analytics setup
commit 33e5757de07a3c2d0524af096347ce7f24708a18
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 25 17:00:52 2017 -0400
Hook for dropoff
commit 04e65be417b48d177afd00b884f2537b2ba47c17
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 25 16:42:23 2017 -0400
Analytics tests
commit 8e788243cbceb81b5f1d4a52a67e14cc1fb74b7b
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 25 12:41:34 2017 -0400
analytics for auction page qa
commit 6b176b6ed0ceb51b103f74b19b7d60e7639c76bf
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Tue Apr 25 12:24:48 2017 -0400
Added analytics
Signed-off-by: Eve Essex <eve.essex@gmail.com>
commit a02298daa8402ff24e92396f240771f0451a7a7e
Merge: 8d0dcfb 4714c93
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 25 09:55:25 2017 -0400
Merge pull request #1302 from cavvia/search-results
@sweir27 : support for static internal pages in search
commit 8d0dcfb51d57863c24fb0c98c09a5828efdeeb78
Merge: 88e89ce f02cd0a
Author: Eve Essex <eve.essex@gmail.com>
Date: Tue Apr 25 07:20:44 2017 -0400
Merge pull request #1296 from eessex/venice-follow
@kanaabe => Artist follow buttons
commit f02cd0a65ad951849e19a31c1830e2d4be433dc0
Author: eessex <eve.essex@gmail.com>
Date: Tue Apr 25 07:09:52 2017 -0400
move mixins to separate file, update tests
commit 4714c93d7d1ddd9cfdacfa3d0e3cf41a5a8e6a0f
Author: Anil <anil@cavvia.net>
Date: Tue Apr 25 12:45:46 2017 +0200
support for static internal pages in search
commit d2cf12683aa3ba08dfd8b7c791d4d08304aae509
Merge: fffc5ad 88e89ce
Author: eessex <eve.essex@gmail.com>
Date: Tue Apr 25 05:22:00 2017 -0400
merge changes
commit 88e89cebb29e2d2614f5ac63367cd8dfee755781
Merge: 46bb3d2 9f5bd67
Author: Eve Essex <eve.essex@gmail.com>
Date: Tue Apr 25 05:02:36 2017 -0400
Merge pull request #1301 from kanaabe/mute
@eessex => [Venice] Mute button, responsive carousel
commit 9f5bd67b94258d10845e0e6c550419b69157e076
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 24 23:19:38 2017 -0400
Adds back sd.APP_URL for easier development
commit b7fd0914bc23ab92b7e75773718bae27ace12360
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 24 23:14:10 2017 -0400
Adds mute/unmute icons
commit 7b186c566ab8edada28ee58dfe30bcb308ba3e80
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 24 16:32:03 2017 -0400
Adds mute button
commit df5ef0cb5a83fbe9856ec2ef549a06a93d7d13c2
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 24 15:45:11 2017 -0400
More responsive carousel
commit 46bb3d224dff48d88be2afe8a41709f2be526f62
Merge: f3fddb8 bea6dbf
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Mon Apr 24 17:58:25 2017 -0400
Merge pull request #1299 from nicholassewitz/page
WIP PR:3 Rethinking Marketo Analytics: Implementing Munchkin Tracking
commit bea6dbf7b68f3157a213ad3f272c25a7aad2587b
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Mon Apr 24 17:37:39 2017 -0400
moved marketo munchkin into head
commit 0175bcb3f886a9aa80485d1cd70e83c2091f946e
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Mon Apr 24 16:19:52 2017 -0400
fix coffee grammer using coffeelint
commit bbcb8eee8d048715f0f9b85768603ab7c318927c
Merge: b5ca620 f3fddb8
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Mon Apr 24 16:07:28 2017 -0400
Merge branch 'master' of github.com:artsy/force into page
commit b5ca6205dd80a01015cbabbae12df850e4bdb2e6
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Mon Apr 24 16:07:21 2017 -0400
beginning of munchkin
commit 69f0135f851b007bbc463545e4611f2d1fd2abca
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Mon Apr 24 15:00:41 2017 -0400
remove Marketo from analytics.page tracking
commit f3fddb84004d240b3ac30148e2638f9c79ee0028
Merge: 96fc770 5b494db
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Mon Apr 24 12:48:23 2017 -0400
Merge pull request #1284 from eessex/swap-description
@kanaabe => [Venice] WIP - Swap video descriptions
commit 22e21d3497fcfb2f46fef3b5186ddf568c1660ef
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 24 12:15:42 2017 -0400
Use source-map-support with mocha.sh
commit 96fc77036bdff79b8a86d12f2bcfef7ef726d259
Merge: 78a3a99 5ffd30a
Author: Eve Essex <eve.essex@gmail.com>
Date: Mon Apr 24 12:23:49 2017 -0400
Merge pull request #1295 from kanaabe/venice-updates
@eessex => [Venice] Multi-video support and route fix
commit 25ca6929fea3dc0d8b4fdaa210a17d4e34065d69
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 24 12:12:31 2017 -0400
Add source-map-support for better stack traces on CI
commit 6af5ef956db2fed95a0b673dd39a52cd62ad9f8a
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 24 09:54:07 2017 -0400
Format line breaks
commit 33d3bda8caa76e58bee92be3c415952633d58197
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 24 09:26:55 2017 -0400
Accept filenames for scripts/mocha.sh
commit 9e3b28aa6f749a82f14f141ad1d07d7653c7b3cb
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 24 08:51:29 2017 -0400
Use the correct value for "mocha" property
This was set to run the acceptance script before :(
commit fffc5adce09c9c29844a0f7a5d867b47829000a3
Author: eessex <eve.essex@gmail.com>
Date: Mon Apr 24 07:44:05 2017 -0400
video descriptions have follow buttons
commit 5b494dbce16ab8a4f300eb9318eeb7a1da36a609
Author: eessex <eve.essex@gmail.com>
Date: Mon Apr 24 04:48:38 2017 -0400
fix tests
commit 445f2a9a37e64ac9b7e4cdc0873d776326aff13b
Merge: f52b656 78a3a99
Author: eessex <eve.essex@gmail.com>
Date: Mon Apr 24 04:29:04 2017 -0400
merge upstream
commit 78a3a991dedbf759abfa6e9c444019a895da9d0e
Merge: 300dc45 bd0138c
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Sat Apr 22 12:06:43 2017 -0700
Merge pull request #1289 from sweir27/fix-price-filter
@damassi => correctly handle the upper bound of the estimate range filter
commit 300dc45a29237db7547cffc3b68612de4bf4fa48
Merge: 886cf49 80445b6
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Sat Apr 22 10:52:58 2017 -0400
Merge pull request #1288 from craigspaeth/proxy-reflection
Use Node HTTP proxy for Reflection proxying
commit 5ffd30a22157e48dce0d6dfdb783863ae9d0aba7
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 21 18:59:27 2017 -0400
Support various video files
commit 886cf49fb0062df32357e4e654edc33d3a59314a
Merge: 57aaa1c 27d9b5f
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Fri Apr 21 18:25:32 2017 -0400
Merge pull request #1294 from l2succes/upgrades-reaction-force
Upgrades reaction-force
commit 27d9b5fcb257d1e5d3a2b8ef9d2c04ae9fc00c50
Author: Luc Succes <l2succes@gmail.com>
Date: Fri Apr 21 18:02:24 2017 -0400
Upgrades reaction-force
commit 57aaa1cf2deab1a56a550fb4a1139577a7b03e91
Merge: c84ebf5 9751e2f
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 21 16:26:23 2017 -0400
Merge pull request #1200 from gnilekaw/package_json
Spin off package.json scripts into a new directory
commit c84ebf554bdc54e279a37221d16819a89510bfc8
Merge: 021b443 443bd20
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 21 16:24:55 2017 -0400
Merge pull request #1291 from nicholassewitz/master
Rethinking Marketo Analytics Implementation PR: 1
commit f2cb54412cf329c3ac832522fc202fe34e95054e
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 21 15:23:59 2017 -0400
Fix route
commit 443bd2046c318eedc6de719ca7c9a9c3a4116dbb
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Fri Apr 21 14:36:51 2017 -0400
fix marketo identify removal on page load
commit 9751e2f4d11ae18288d92cdf1f006bdeacf18865
Author: Lance W <lwakeling@gmail.com>
Date: Fri Apr 21 14:25:37 2017 -0400
Remove the `&& \`s
commit 84a3ca755d728758613cd7bf25c3675f24ebf58a
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Fri Apr 21 14:15:58 2017 -0400
finish new marketo identify flow
commit bd0138c8ed719832cf9476e057070053190fb474
Author: sweir27 <sweir27@gmail.com>
Date: Fri Apr 21 13:43:00 2017 -0400
correctly handle the upper bound of the estimate range filter
commit 946ba2619795426483cc265e0cf96918cd51caee
Author: Lance W <lwakeling@gmail.com>
Date: Fri Apr 21 13:34:15 2017 -0400
Un-update .env.test path
commit 866315e0131cbf53a9d72a955453ee33b3dcf564
Author: Nicholas Sewitz <nicholassewitz@Nicholass-MacBook-Pro.local>
Date: Fri Apr 21 13:20:04 2017 -0400
marketo identify path
commit 32bb8bfa61fb29522c7387a848f3fd71327cb467
Author: Lance W <lwakeling@gmail.com>
Date: Fri Apr 21 13:01:13 2017 -0400
Update .env.test path
commit f79d0e0128b771ea3b5a494a6405941b0c03c74e
Author: Lance W <lwakeling@gmail.com>
Date: Fri Apr 21 12:55:45 2017 -0400
Add `set -e -x` to scripts
Since I've been sitting on this PR so long, I also had to update
the scripts files. Thanks for the suggestion @alloy
commit 80445b650447251dd3fcfb0d02f7ace831f1bb3d
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 21 12:54:08 2017 -0400
Added Node HTTP proxy for Reflection proxying
commit 021b443eae427f5d0d75cbe2cdd74f0561d4dc7f
Merge: 9bed853 442a820
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Fri Apr 21 12:53:27 2017 -0400
Merge pull request #1283 from eessex/vid-templates
@kanaabe => [Venice] Unpublished video covers
commit 41605b98ba392bab67cb61a2f5413e997120e5a9
Author: Lance W <lwakeling@gmail.com>
Date: Tue Apr 11 09:56:34 2017 -0400
Adds all other package.json scripts
commit 79a43fd441c2eed9c259d23aa736f58b6a338840
Author: Lance W <lwakeling@gmail.com>
Date: Tue Apr 11 09:34:03 2017 -0400
Add acceptance.sh to scripts
commit ad9d87162015c205eb83a9cb49d54675bdf371b2
Author: Lance W <lwakeling@gmail.com>
Date: Mon Apr 10 09:44:41 2017 -0400
Add scripts/test.sh to simplify package.json
commit 9bed8532ff5905a7cd0ef3acf291133edac4b32f
Merge: 4348d1d 266ded6
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Fri Apr 21 12:31:29 2017 -0400
Merge pull request #1287 from artsy/artsy-passport-update
@mzikherman: Update Artsy Passport and small UI tweak in error handler
commit 266ded675e1ad3de85db5fdd6d23f3fcac56ec89
Author: Matthew Zikherman <matt@bestvendor.com>
Date: Fri Apr 21 12:24:57 2017 -0400
Remove unneeded login analytics tracks
commit fac5486054b31947274bf1f96cf4447cb5c15a21
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 21 12:15:40 2017 -0400
Update Artsy Passport and small UI tweak in error handler
commit f52b656cc2b97a875fd4d7ef8d79de8d8531619e
Author: eessex <eve.essex@gmail.com>
Date: Fri Apr 21 08:59:29 2017 -0400
description template is rendered on clent
commit 442a8202b7abbb85ebd9f1f57811f9d09e9ac68e
Author: eessex <eve.essex@gmail.com>
Date: Fri Apr 21 08:34:26 2017 -0400
fix tests
commit 587469db41cdba3544c69773cbb893d890450b91
Author: eessex <eve.essex@gmail.com>
Date: Fri Apr 21 07:41:31 2017 -0400
unpublished video cover has subscribe form
commit 4348d1d08f8036d9aa76d03dfedd2c7887d05fd8
Merge: 15080d4 14f12ae
Author: Eve Essex <eve.essex@gmail.com>
Date: Fri Apr 21 04:36:02 2017 -0400
Merge pull request #1282 from kanaabe/user-agent
@eessex => [Venice] Carousel, url swaps, video swaps
commit 14f12ae8af3f7c9362df883969618f81a75b5f67
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 21 01:42:22 2017 -0400
More video tests
commit 13b3f79876ff2b5abbe0213e143537b5ad3f1063
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 21 01:35:30 2017 -0400
Adds tests and use flickity 'settle'
commit 6d3df03ed524a76bf8bb334a47b65283429c8982
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 19:20:11 2017 -0400
Cleanup
commit 7d101b31f0a773ed7c012500da933bcd56e24cb7
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 19:02:29 2017 -0400
Adds carousel
commit 15080d4ce4ec64b3af7b6efd960067e1a11fbf52
Merge: ef24f22 11d7825
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 20 18:10:09 2017 -0400
Merge pull request #1272 from craigspaeth/artsy-url
@ashfurrow: Switched ARTSY_URL config for APP_URL now that they're the same thing
commit f899f9c738c1d345383de1e51608a44602a96b0d
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 15:28:28 2017 -0400
Put icons in the same place
commit 5b276660c7a53e3a50c80c7c0c8d65d4a673c09e
Merge: 8d61006 ef24f22
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 15:21:39 2017 -0400
Merge branch 'master' of github.com:artsy/force into user-agent
commit 8d61006b3b64915b7c84198f128d55c05ec8e746
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 15:21:30 2017 -0400
Adds user-agent-js
commit ef24f22874a1bab4e27a3dd5b22c25779cf9adda
Merge: a65da33 82b6f83
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Thu Apr 20 14:25:36 2017 -0400
Merge pull request #1278 from eessex/venice-routing
@kanaabe => [Venice] Routes use slug
commit a65da33ed0b4ae370109338d66c2d2051fd9a4d0
Merge: 7c95fa0 78d3570
Author: Luc Succes <luc@tryoften.com>
Date: Thu Apr 20 14:05:44 2017 -0400
Merge pull request #1279 from l2succes/upgrades-reaction-force
Upgrades reaction force
commit 7c95fa0f55fb3f87ead4edca4c07b59ae48358a0
Merge: 06ab5fa e0f3dae
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 20 14:00:29 2017 -0400
Merge pull request #1240 from erikdstock/auctions-372-live-sale-bid-messaging
Auctions 372 live sale bid messaging
commit 78d357069e7b73eccd47e08de0e09fcec02949a7
Merge: 0098644 06ab5fa
Author: Luc Succes <l2succes@gmail.com>
Date: Thu Apr 20 13:58:53 2017 -0400
Merge branch 'master' of github.com:artsy/force
commit 82b6f8311bbd74dc850ab5cfa4ca390a98ef5d18
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 13:09:36 2017 -0400
fix tests
commit bf5728a15cfc821076ea2348099f4c4395b10126
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 12:53:51 2017 -0400
move redirect into success callback
commit c208502933ad45e55bc826a72c080e5720f0abb8
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 12:37:23 2017 -0400
use redirect for bad slug, update tests
commit 009864447f75aab7cd98d9c312ddfa87c0eb6820
Author: Luc Succes <l2succes@gmail.com>
Date: Thu Apr 20 12:22:03 2017 -0400
Upgrades reaction-force
commit 4fe3a0a323b33869236bc4b873dc7031698107b6
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 12:04:47 2017 -0400
routes use slug
commit 06ab5fa841440fb7d72d6b9d2bcb8af4638d7cca
Merge: 008e916 19438fb
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Thu Apr 20 11:32:03 2017 -0400
Merge pull request #1277 from eessex/venice-merge
@kanaabe => [Venice] Responsive body styles
commit 008e91674901df7b571e0ae5c321820bdd6d6aa6
Author: Anandaroop Roy <anandaroop.roy+github@gmail.com>
Date: Thu Apr 20 11:26:35 2017 -0400
@dblock => Update city sitemap (#1276)
commit 19438fb332bfaf35c83f7bbe9100b4a4561a0021
Merge: e450490 bd3c765
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 10:55:36 2017 -0400
merge changes
commit e4504905afff69d8990226400677532e8b9d5753
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 10:49:53 2017 -0400
move body styles into own file
commit 1c0496fd6afe0a8666ed8a6bd2f12bcf97ac6aaa
Author: eessex <eve.essex@gmail.com>
Date: Thu Apr 20 09:18:34 2017 -0400
add responsive styles
commit bd3c76528c6c12582f070ccaf73a3612a79bd281
Merge: 88364e4 4490c5e
Author: Eve Essex <eve.essex@gmail.com>
Date: Thu Apr 20 09:19:44 2017 -0400
Merge pull request #1275 from kanaabe/completed-video
@eessex => [Venice] Responsive player and cover
commit 4490c5e9afc958d8b6670e96ee5467d4ede49780
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 09:10:36 2017 -0400
Remove expression
commit 074c21b0884ccedf29e730d1d4e5b31d7c6b264c
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 08:58:26 2017 -0400
Remove subtitle
commit 74f2678bf8b6b58e0c63a137f17e0c5c317f4bc0
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 08:54:13 2017 -0400
Make vanity proxy simpler
commit 35d85b182e8cc4e10943c1c979280de77a7ee347
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 20 00:25:16 2017 -0400
Adds some carousel thoughts
commit 9209e3ef40c93a30e5d3123ca4fa6fe3a40946ab
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 19:00:59 2017 -0400
Update tests
commit a4bfece316e791296df432e72ef6710e956d3dc7
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 18:50:43 2017 -0400
Remove pause -- vrview autopauses now
commit b5e0e95b5e3cd5682602bc911bdfb5dba9397749
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 17:12:47 2017 -0400
Responsive player
commit 88364e4359c7c3b5608e9efcd683e4a2b855b101
Merge: 5344cbf 84036bd
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 19 18:09:29 2017 -0400
Merge pull request #1274 from artsy/revert-1273-upgrade-reaction-force
Revert "Upgrade reaction-force"
commit 84036bde110953db391e79333d2518ae8cdba0fd
Author: Luc Succes <luc@tryoften.com>
Date: Wed Apr 19 18:01:08 2017 -0400
Revert "Upgrade reaction-force"
commit 5344cbf6c50a1a879b7091dd5114df0367d90a1e
Merge: 89903dc a5b8362
Author: Luc Succes <luc@tryoften.com>
Date: Wed Apr 19 17:08:32 2017 -0400
Merge pull request #1273 from l2succes/upgrade-reaction-force
Upgrade reaction-force
commit a5b83629ddf10e6b3ea11de284a473aebedeb08a
Author: Luc Succes <l2succes@gmail.com>
Date: Wed Apr 19 17:01:00 2017 -0400
Upgrade reaction-force
commit 957d4d866367d2ad54da1f22df976a8adfd61684
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 15:46:51 2017 -0400
Use production id for EF_VENICE
commit 11d7825ec947e4526f9d7de45950b7866f6cb6b6
Author: Artsy <craigspaeth@gmail.com>
Date: Wed Apr 19 15:30:01 2017 -0400
Switched ARTSY_URL config for APP_URL now that they're the same thing
commit 89903dc882de1bdc5ba2e2d4a5343e94d3a83c3c
Merge: c29705c d6ffb2d
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 19 12:27:27 2017 -0700
Merge pull request #1271 from craigspaeth/sentry-bugs
@damassi: Fixed .match of undefined bug in locals middleware
commit d6ffb2d3ee8f9646286580cb27692e2bb84b2c5a
Author: Artsy <craigspaeth@gmail.com>
Date: Wed Apr 19 15:16:00 2017 -0400
Fixed .match of undefined bug and run deep root-level lib tests
commit e0f3dae9394d3f3cab83411d1591c9e54e573ac6
Author: Erik Stockmeier <erik@artsymail.com>
Date: Wed Apr 19 13:13:03 2017 -0400
fix wrong property name slug- should be id
commit c29705c909cb625edc614a92a6cc9898e03aaf43
Merge: b329874 3c457ff
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Wed Apr 19 13:02:05 2017 -0400
Merge pull request #1267 from eessex/venice-layouts
@kanaabe => [Venice] Initial layouts
commit 2defa49bf097c7319a21ec9e457a71466c258149
Author: Erik Stockmeier <erik@artsymail.com>
Date: Wed Apr 19 12:50:43 2017 -0400
remove error messages that are functions capability from error handling form
commit b3298741194a04e963c771ca41f53e8e0d368163
Merge: e18b0c6 5ee312b
Author: Eve Essex <eve.essex@gmail.com>
Date: Wed Apr 19 12:11:26 2017 -0400
Merge pull request #1269 from kanaabe/fix-eoy
@eessex => Fix init on EOY page
commit 3c457ff30499dcc9666b9d371f5347043c5ca6f7
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 12:10:52 2017 -0400
fix client tests
commit 5ee312bafc84bdb97cd1dbe8dd083fba07ae9ecd
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 11:55:01 2017 -0400
Evoke init
commit 00ffd213f95de508d573ce6e73d931890b3803b9
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 11:45:30 2017 -0400
add after block to tests
commit a00d2cf00690d6e5656ebab0140be45a1190e63e
Author: Erik Stockmeier <erik@artsymail.com>
Date: Wed Apr 19 11:13:38 2017 -0400
update error message
commit 730da0a8c45df035f14fb00aa7d0ad21cfd57f1c
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 11:28:55 2017 -0400
move backbone stub out of before
commit ab2d90b171d004d823c2c29641aaf370b07fcd08
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 11:19:17 2017 -0400
add routing tests
commit 1f46a797852e9dc59b2e68e3416e4bb74ccc087f
Merge: 4ec5110 e18b0c6
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 11:02:07 2017 -0400
merge conflicts
commit e18b0c613fed4a4b7ac60bfda8a9c984a99bd530
Merge: 5ba5f1a 55a5eb1
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Wed Apr 19 10:46:50 2017 -0400
Merge pull request #1266 from kanaabe/video-controls
@eessex => Video controls
commit 55a5eb193dfb1b9ef1b61abdfa53697a42081ff0
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 09:40:59 2017 -0400
Move vr icon to non-public folder
commit 4ec511070e90ea00ed202012349d86602742104e
Merge: 9c73e59 5ba5f1a
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 06:31:24 2017 -0400
merge conflicts
commit 9c73e59b12a7550deb8934ab4a2b2aff2a8e07f5
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 06:24:24 2017 -0400
footer styles, youtube prompt
commit e65aabfd3f496435e288fef1e6cb178eb6bafc57
Author: eessex <eve.essex@gmail.com>
Date: Wed Apr 19 06:02:06 2017 -0400
sections can display description and share buttons
commit 87adf8e26c7b0bea592a23132f3edae92927248c
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 19 00:54:40 2017 -0400
Adds tests
commit f490a1d7d7fa48d380668db80bfd2955cc23ef63
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 18 18:04:04 2017 -0400
Adds nouislider as scrubber
commit ccc942f11ce75261458eca7178de8d423db69408
Author: Erik Stockmeier <erik@artsymail.com>
Date: Tue Apr 18 17:30:55 2017 -0400
account for sarahs suggestions and new error messages
commit 5ba5f1aaab78502cebf0b6cedb0945b128906bb3
Merge: 043d18f 0c5d91a
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Tue Apr 18 13:52:44 2017 -0700
Merge pull request #1230 from acjay/1229_fix_bid_dropdown_dismissal
fix bid dropdown dismissal
commit 043d18fa7fafefa395b3386385c9845c98fa4848
Merge: f7a9d70 c80bf68
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Tue Apr 18 13:42:55 2017 -0700
Merge pull request #1264 from sweir27/little-fixes-everywhere
@damassi => little auction fixes across the board
commit c80bf6804434c7e34724b816777d114b020e294b
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 18 16:08:52 2017 -0400
fixing specs
commit 7c1621b3feea8ed83411aa0135bfe0e72c3e4c4e
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 18 15:02:26 2017 -0400
little auction fixes
commit f7a9d70501f1b97c746e27f9366230269cc6a09e
Merge: 755dfe7 2b7a119
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Tue Apr 18 15:44:11 2017 -0400
Merge pull request #1263 from damassi/add-sentry-error-reporting
@craigspaeth => Remove Sentry user context reporting
commit 2b7a119603fdb63f41bc50469229ef452b0278ce
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Tue Apr 18 11:26:15 2017 -0700
Remove Sentry user context reporting
commit 755dfe70534eb995076c60e51800aea426d32714
Merge: fc31fc6 b4c83f3
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Tue Apr 18 15:10:40 2017 -0400
Merge pull request #1255 from damassi/add-sentry-error-reporting
@craigspaeth => Add Sentry error reporting
commit 031fe296c90045686eab04e956e1b784ec75143e
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 18 14:27:32 2017 -0400
Adds venice to auction reminder blacklist
commit b4c83f36f479f3634fb9033486dbd052ed407610
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Tue Apr 18 11:26:15 2017 -0700
Simplify DSN vars by environment
commit 82f98f9f725bc9eb67eaefdfa8ea840100a79b18
Author: kanaabe <kanakoabe5@gmail.com>
Date: Tue Apr 18 14:25:43 2017 -0400
Adds working scrubber info
commit fc31fc674ae2a74c960d98e4956849bbe6ef3c49
Merge: 653d0c5 f6545a6
Author: Eloy Durán <eloy.de.enige@gmail.com>
Date: Tue Apr 18 19:50:04 2017 +0200
Merge pull request #1180 from dblock/hide-empty-collection
@alloy => Fix: hide rails when empty.
commit 653d0c5b1d748fa500595d3cd905d6d7710c0aff
Merge: df61fea 357527a
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Tue Apr 18 12:39:41 2017 -0400
Merge pull request #1262 from l2succes/update-reaction-force
Upgrade reaction-force
commit d1631052a9b90f6aedb232d4753904ac1e3267fc
Author: eessex <eve.essex@gmail.com>
Date: Tue Apr 18 12:26:31 2017 -0400
force fetches curation, layout series info
commit 357527a3f8815035fa419bde61ac5ea0c529dcc0
Author: Luc Succes <l2succes@gmail.com>
Date: Tue Apr 18 12:23:38 2017 -0400
Upgrade reaction-force
commit df61fea7633b490fb37e9e4eb5a4d62c76a70aa7
Merge: 40680f0 6e42071
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Tue Apr 18 11:00:28 2017 -0400
Merge pull request #1257 from xtina-starr/fair-organizer-pages
@mzikherman: fix typo
commit 6e420719a1d068bdc6155ccc90ee14b41aeb9f7f
Author: xtina-starr <c.thompsonms@gmail.com>
Date: Tue Apr 18 10:46:18 2017 -0400
fix typo
commit 3a3404c778428950add5119ff0b918106cca8242
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 17 21:07:09 2017 -0400
Adds video controls
commit f30f1117765b70d0b985f2be977277234129b564
Merge: a3e91dd 40680f0
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Mon Apr 17 15:19:36 2017 -0700
Merge branch 'master' into add-sentry-error-reporting
commit a3e91dd87a443c371e85e2cabc169acbc9fd837b
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Mon Apr 17 15:04:18 2017 -0700
Add Sentry error reporting
commit 6666b5a2f0dc05caa6481c2049c69749bb67f8ad
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 17 17:55:03 2017 -0400
Support more browsers with indexOf
commit 40680f0a55c09d43d9221630212c1555946b5752
Merge: e573ff3 5db427b
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Mon Apr 17 17:49:58 2017 -0400
Merge pull request #1253 from kanaabe/venice-video
@craigspaeth => Initial Venice Biennale Layout
commit 8a44f616b8f5dc400c830fe03c7d9b1f666c2eab
Author: Erik Stockmeier <erik.d.stock@gmail.com>
Date: Fri Apr 14 12:15:25 2017 -0500
Match on error message text to redirect bidders into live sales
commit fb698124dae146451e6f55c70c3edcd2a758fd38
Author: Erik Stockmeier <erik.d.stock@gmail.com>
Date: Wed Apr 12 14:33:58 2017 -0500
re-fetch sale model to determine sale closed/live messaging
allow functional error messages
commit e573ff3671c33796e1df36672841dc43b0500f38
Merge: b8203e8 c0b3d77
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Mon Apr 17 16:56:55 2017 -0400
Merge pull request #1252 from xtina-starr/fair-organizer-pages
@mzikherman: display fair year-round link when the profile is visible to the public
commit 5db427be66fd96bbf30070ae8415e8e3786e6ce4
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 17 16:30:54 2017 -0400
Adds cover image
commit c0b3d77df19d3ded03d1df47262857b90c6e3cfd
Author: xtina-starr <c.thompsonms@gmail.com>
Date: Mon Apr 17 16:07:55 2017 -0400
display fair year-round link when the profile is visible to the public
commit b8203e8b7823c6098ffc0bd9e95be2a0da664906
Author: Erik <erikdstock@users.noreply.github.com>
Date: Mon Apr 17 12:57:57 2017 -0400
sort [mobile] auction lots by position, not lot_label (#1250)
commit 6e7bb1aaed94df9cb2c358eec9773a1ec830e7b8
Merge: 7212952 f052cec
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Mon Apr 17 12:18:56 2017 -0400
Merge pull request #1236 from craigspaeth/noindex-tag
@kanaabe: Added noindex meta tags to articles tagged with noindex
commit 7212952f9bca4c4a2a510c8c5a54c31f9a64db25
Merge: b68ce03 b9b3383
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Mon Apr 17 11:50:25 2017 -0400
Merge pull request #1249 from kanaabe/amp-fix
@eessex => Use mobile footer without svg
commit b9b33832e3ed9ab99469da3c60c713a35bdb2bc9
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 17 11:18:55 2017 -0400
Use mobile footer without svg
commit e669d8fd605c5412f5f688f6c304d82a3ee4bfbf
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 17 11:12:44 2017 -0400
Remove demos and add in initial page layout
commit b68ce03b5ad97b22e35ecb09a33325127bd80b96
Merge: 87ff114 baa3e62
Author: Luc Succes <luc@tryoften.com>
Date: Mon Apr 17 10:15:21 2017 -0400
Merge pull request #1248 from l2succes/update-reaction-force
Upgrades reaction-force
commit baa3e62ac93f9bd65e3b8c50f9e8534a198bbadd
Author: Luc Succes <l2succes@gmail.com>
Date: Mon Apr 17 10:06:38 2017 -0400
Upgrades reaction-force
commit 87ff114810f830c6877a3d5a0ae225945eef17dd
Merge: bcfaec2 c422ad5
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Sun Apr 16 19:03:03 2017 -0400
Merge pull request #1246 from craigspaeth/forever
@sweir27: Pre-compiling the error page stylus to avoid CPU usage
commit c422ad56b9becc66e8a227d6b9102f2c4fe476d8
Author: Artsy <craigspaeth@gmail.com>
Date: Sun Apr 16 18:30:57 2017 -0400
Pre-compiling the error page stylus to avoid CPU usage
commit bcfaec200a0e92be72d5d6b2ae293b77c45beb5d
Merge: 0966d8b 18bcdcd
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Sun Apr 16 16:59:45 2017 -0400
Merge pull request #1244 from craigspaeth/forever
@damassi: Added forever to start script
commit 18bcdcd2ab8869ba2b7ee82a236c8efe93dbb4e4
Author: Artsy <craigspaeth@gmail.com>
Date: Sun Apr 16 16:50:09 2017 -0400
Added forever to start script
commit 0966d8bc1d5ded677d4a073caf37a8c9fd396d76
Merge: 800c290 851baf6
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 14 19:59:37 2017 -0400
Merge pull request #1241 from damassi/remove-acceptance-update-proptypes
@craigspaeth => Remove acceptance tests and add prop-types package
commit 851baf6f79e4795fb687117b66e5a63f8220d529
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Fri Apr 14 16:25:00 2017 -0700
Remove acceptance tests; update propTypes
commit 800c29002d0e64b660b029faf9ebe3b75be631cb
Merge: 0526884 a75344d
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Fri Apr 14 14:05:19 2017 -0700
Merge pull request #1234 from craigspaeth/start-script
@damassi: Removed flash middleware and loosened up memory flags
commit 0526884861dcf09103e1396f90eee60207c4969d
Merge: 7ba2dfe 9bca3fb
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Fri Apr 14 17:02:11 2017 -0400
Merge pull request #1238 from kanaabe/vanity-proxy
@craigspaeth => Vanity proxy and video tests
commit 9bca3fbda5c80b5c8df3ab20d3fc9d917093ecf7
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 14 16:54:22 2017 -0400
Expand Google Viewer
commit 12b3d99f94606e924f88e2c96549a6d778f4b50e
Author: kanaabe <kanakoabe5@gmail.com>
Date: Fri Apr 14 16:11:33 2017 -0400
Cleanup
commit 909d7fdbf87ffdd96007f399426ea53394f18286
Author: kanaabe <kanakoabe5@gmail.com>
Date: Wed Apr 12 16:14:17 2017 -0400
Adds more player options
commit 37cd0e02a764371870b77681ffa5e88eb4bb0c85
Author: kanaabe <kanakoabe5@gmail.com>
Date: Mon Apr 10 20:07:46 2017 -0400
Adds vanity proxying and a video test
commit 7ba2dfe2279fd5a906e2239f306d29fd5221a506
Merge: 5e47bd5 35a30e8
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Fri Apr 14 15:32:03 2017 -0400
Merge pull request #1231 from kanaabe/test-morgan
@izakp => Adds artsy-morgan
commit a75344d6ffab176dd95b3cdf38838da81c416680
Merge: 0fea355 5e47bd5
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 14 14:59:20 2017 -0400
Merge branch 'master' of github.com:artsy/force into start-script
Conflicts:
yarn.lock
commit 5e47bd5f2745d7aa830c151e731ca7b39373ab1e
Merge: ffc278d ed17363
Author: Eloy Durán <eloy.de.enige@gmail.com>
Date: Fri Apr 14 19:59:12 2017 +0200
Merge pull request #1235 from l2succes/update-reaction-force
Upgrades reaction-force and remounts the loyalty app
commit f052cec04cdbae3778a6bd4727bf8c2edc17d2c0
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 14 13:56:33 2017 -0400
Added noindex meta tags to articles tagged with noindex
commit 0fea35563e468258c09bffcd02b34e865916b9df
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Fri Apr 14 13:27:41 2017 -0400
Removed flash middleware and loosened up memory flags
Monkey patching with flash caused `No default engine was specified`.
commit ed173630f5a4326607aa4eaaf9c8bf65b9515424
Author: Luc Succes <l2succes@gmail.com>
Date: Fri Apr 14 12:57:52 2017 -0400
Upgrades reaction-force and remounts the loyalty app
commit 0c5d91a08b217b296ac5b79a940af509c1880633
Author: Alan Johnson <alan@breakrs.com>
Date: Fri Apr 14 00:32:14 2017 -0400
fix test
commit ffc278d9ece45480635dde73601dbc67323637b8
Merge: 5f9188a 76bbdc9
Author: Kana Abe <kanakoabe5@gmail.com>
Date: Thu Apr 13 20:58:06 2017 -0400
Merge pull request #1233 from sweir27/remount-consign2
@kanaabe => puts auction mounting above profile fetch
commit 76bbdc9aece467662969feff22ecba075ded874d
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 13 19:52:28 2017 -0400
remounts consign2 and puts auction mounting above profile fetch
commit 5f9188a8b1469b20cfed15f99f179925c8749c22
Merge: 8d5b215 325a470
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 13 20:15:52 2017 -0400
Merge pull request #1232 from craigspaeth/timeout
@sweir27: Clean up investigative code
commit 8d5b21597c3ad3ff583c0c2050dd07fcd86ecb8c
Merge: 9ba5cf8 2edb8be
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 13 19:53:28 2017 -0400
Merge pull request #1176 from erikdstock/bugfix-bid-registration
Bugfix - duplicate bidder registration on combo form
commit 325a470b7e9774b39b4bef011caf3863593299f5
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 19:34:08 2017 -0400
Cleaned up investigative logging and such code
commit 35a30e84bff6ac90cf8facbccda40d306e9b32b3
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 13 19:30:14 2017 -0400
Remove morgan dependency
commit 964b22c777a5386599423396f22ddb66ba82b10f
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 13 19:03:18 2017 -0400
Upgrade artsy-morgan
commit 77ad094b10206cc5cc0c09bcb0c2e6d07fa6d5ff
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 13 18:36:35 2017 -0400
Remove logger format file
commit b372941815fd0d9a3f17b229616361bf90495efe
Author: Alan Johnson <alan@breakrs.com>
Date: Thu Apr 13 18:29:20 2017 -0400
dont delay first call for update
commit 43230edf7d430fb804f4c6f35b61ebd9504a0bd3
Author: Alan Johnson <alan@breakrs.com>
Date: Thu Apr 13 18:21:03 2017 -0400
fix bid dropdown dismissal
commit 9ba5cf8589819d7cee87c44c474b82db16624ea7
Merge: ca8a9c6 fc3d325
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 18:15:58 2017 -0400
Merge pull request #1227 from craigspaeth/timeout
@sweir27: Use res.render to leverage view caching for error page
commit fc3d3250a5c7d7a018e52033f891a130d6d0ad98
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 18:10:11 2017 -0400
Added 404 handler in-app
commit 47dd613517293d5cb9b34428d201ce111906630f
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 18:00:26 2017 -0400
Use Express's render function to leverage view caching
commit c76453352d21ff242e1a9976a1a06bbecff7de42
Author: kanaabe <kanakoabe5@gmail.com>
Date: Thu Apr 13 17:01:02 2017 -0400
Use artsy-morgan
commit a97768ebeaea5d235888d26004a2c5e5eb5bb4dc
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 16:48:04 2017 -0400
Fresh lockfile
commit ca8a9c61db2a99de74c7cd31efb2ec60d919baa1
Merge: ac24a3c d6c013f
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 16:46:07 2017 -0400
Merge pull request #1224 from craigspaeth/timeout
@sweir27: Removing instrumentation, some updated deps, timeout and logging
commit d6c013ff2d0b9e865ae83840f6b3d055d35a2ced
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 16:29:54 2017 -0400
Added react test renderer for Enzyme
commit bc77b5f9d2a6374c035bb7a22ecfce0c0c517bbd
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 16:19:50 2017 -0400
Re lock file
commit 694ae29342178aec79457916f89f26c55117794f
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 16:13:32 2017 -0400
Removed Reaction Force and put memory profiler under a config var.
commit 1daa30ca869617b16a9b0ff9dc53cbc0744bb614
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 15:18:59 2017 -0400
Removed memory instrumentation & New Relic. Added timeout middleware & logging.
commit ac24a3c2ef5db90c23cdee815ee20d90a9dd3690
Merge: cdc6b5c 288b1a1
Author: Yuki Nishijima <mail@yukinishijima.net>
Date: Thu Apr 13 11:59:37 2017 -0400
Merge pull request #1223 from xtina-starr/remove-exhibtor-count-mobile
@yuki24: remove exhibitor count on mobile
commit 288b1a1df40127c44661575ff3af3f5e0392537e
Author: xtina-starr <c.thompsonms@gmail.com>
Date: Thu Apr 13 11:42:14 2017 -0400
remove exhibitor count on mobile
commit cdc6b5c0d6035d56c57a6ca0ec4cc65a8091125e
Merge: d7598bf 2c5b440
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Thu Apr 13 10:49:21 2017 -0400
Merge pull request #1221 from sweir27/try-to-fix-deploy
@craigspaeth => revert some potential issues with last deploy
commit 2c5b440ebc0321e0eeb6cde7c32c57af474770cc
Author: sweir27 <sweir27@gmail.com>
Date: Thu Apr 13 10:40:30 2017 -0400
revert some potential issues
commit d7598bf2174a7fbf4723736323f5d54c127e39ed
Merge: 78842e5 561089e
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 12 19:57:16 2017 -0400
Merge pull request #1220 from damassi/add-missing-auction-image
Add missing auction iphone image
commit 561089e547b7f0f60cf544f43dbd2adb3016ee03
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 12 15:29:12 2017 -0700
Add missing auction iphone image
commit 78842e520e18f6652b9e2304e81337989790ee9b
Merge: a80d591 d1c19d4
Author: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed Apr 12 15:18:14 2017 -0700
Merge pull request #1219 from sweir27/fix-follow-link
@damassi => fix link to works by artists you follow
commit d1c19d41c7c08c00a7ad67369c9c2be3ebc50bc5
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 12 17:53:19 2017 -0400
fix link to works by artists you follow
commit a80d5913c40ec857294c423c413f6042cf514320
Merge: 8506dba 9886ab3
Author: Yuki Nishijima <mail@yukinishijima.net>
Date: Wed Apr 12 17:08:10 2017 -0400
Merge pull request #1218 from xtina-starr/remove-exhibitor-count
@yuki24: remove exhibitor count
commit 8506dba560b5e0c8632ec84bc9b6086608c1a744
Merge: aac0b54 83dd815
Author: Chung-Yi Chi <cychi1210@gmail.com>
Date: Wed Apr 12 16:47:47 2017 -0400
Merge pull request #1213 from anandaroop/fix-empty-primary-carousel
@starsirius => Fix occasionally empty primary carousel
commit 83dd815c8d19c03e080290db82d67455b82fc3dd
Author: Anandaroop Roy <anandaroop.roy+github@gmail.com>
Date: Wed Apr 12 15:41:47 2017 -0400
Only render the carousel body if there profiles to show
commit c5490467ce7ac6ab1830bf882ddfb8f8fb5168df
Author: Anandaroop Roy <anandaroop.roy+github@gmail.com>
Date: Tue Apr 11 17:31:22 2017 -0400
Be more defensive about missing profiles
This may only be an issue with staging data(?) but I got tripped up
frequently by missing profiles causing dereferencing errors, so
this just shows a stripped down partner cell in the case of such a
missing profile.
commit 9886ab31540f32f49f26511838d31992ec5852de
Author: xtina-starr <c.thompsonms@gmail.com>
Date: Wed Apr 12 15:09:57 2017 -0400
remove exhibitor count
commit aac0b547c620336e42a211c80a53d35b052a862b
Merge: d8febf3 39c044c
Author: Christina <c.thompsonms@gmail.com>
Date: Wed Apr 12 14:34:33 2017 -0400
Merge pull request #1216 from artsy/fix-1215
Fixed an issue where Users can't click on the middle part of the 'SIGN UP' button on "/collect-art"
commit 39c044c0248975dfc09a46acd00da9250c4edd87
Author: Yuki Nishijima <mail@yukinishijima.net>
Date: Wed Apr 12 14:18:01 2017 -0400
Fixed an issue where Users can't click on the middle part of the 'SIGN UP' button on /collect-art
closes #1215
commit d8febf3b0329a6e82c0f757e999406597be323fb
Merge: 2d1ee40 9d56282
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 12 13:04:29 2017 -0400
Merge pull request #1214 from sweir27/fix-contact-gallery
@erikdstock => fix contact gallery showing up on mobile web
commit 9d562822c0eebe53aac6a339671dcbc869e42dbe
Author: sweir27 <sweir27@gmail.com>
Date: Wed Apr 12 11:44:24 2017 -0400
fix contact gallery showing up on mobile web
commit 2d1ee403d585d73023cff7ce759a988eb4e7f6d3
Merge: e78bd9c 9619495
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Wed Apr 12 11:38:32 2017 -0400
Merge pull request #1209 from sweir27/consignments2-base
@craigspaeth => adds consignments2 base
commit e78bd9c4ced302ca704a896f359b264c94412572
Merge: d21d106 ece0ff7
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Tue Apr 11 18:46:07 2017 -0400
Merge pull request #1208 from craigspaeth/err-page
@mzikherman: Refactored error page
commit d21d1065d26d91331a9b91b2442ccd3fb880be3b
Merge: 7968ac0 da2dd0f
Author: Matt Zikherman <mzikherman@gmail.com>
Date: Tue Apr 11 18:39:39 2017 -0400
Merge pull request #1164 from artsy/extensions
[Dev] Add recommended extensions for Force
commit 2edb8beaf4779a18845cb627cad05bbdf4100e8e
Author: Erik Stockmeier <erik.d.stock@gmail.com>
Date: Tue Apr 11 17:02:30 2017 -0500
move things around to preserve loading spinner correctly
commit 96194952405b5046ab448245cd8ae24a83b6a0f8
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 11 17:44:05 2017 -0400
cleanup
commit e5fed814cf8fcbe15fa4d921041595355fd35b8e
Author: Erik Stockmeier <erik.d.stock@gmail.com>
Date: Tue Apr 11 16:25:57 2017 -0500
cleanup
commit b4e6d54e8d616013cb502315760fed4ff5ba4eac
Author: sweir27 <sweir27@gmail.com>
Date: Tue Apr 11 17:23:54 2017 -0400
adds consignments2 subfolder
commit ece0ff74d81c1a351a23ced8a6647f297e6fe1ea
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Tue Apr 11 17:11:04 2017 -0400
Link the minimal header logo to the homepage.
commit 154b5646f22bb1bcf7f21607a775825ec48e12f7
Author: Craig Spaeth <craigspaeth@gmail.com>
Date: Tue Apr 11 17:02:10 2017 -0400
Refactored error page to reduce dependencies so it can render any error.
commit 78b002d13b9b28460ee43ac33c734d9672f36a17
Author: Erik Stockmeier <erik@artsymail.com>
Date: Tue Apr 4 16:43:05 2017 -0400
form cleanup, undelegate registration form events in register-bid flow
commit f6545a6abd5d2fe743fed1bb2fc524587e0019a4
Author: dblock <dblock@dblock.org>
Date: Fri Apr 7 10:34:17 2017 -0400
Don't display empty headers.
commit da2dd0f4a5f18ca5bbe4a5e325f668b1812a1e75
Author: Orta Therox <orta.therox@gmail.com>
Date: Tue Apr 4 11:34:04 2017 +0100
[Dev] Add recommended extensions for Force
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For issue #1229, the problem is multiple re-renders of the component containing the dropdown.
This doesn't fully fix the problem, because there will still be one re-render. Definitely a good candidate component to Reactify.