Commit graph

2219 commits

Author SHA1 Message Date
Joseph Schorr
4480d2d8e2 Merge branch 'master' into touchdown 2014-04-24 00:40:01 -04:00
Joseph Schorr
e29a183fd9 Commit changes before a merge 2014-04-24 00:34:25 -04:00
Joseph Schorr
c6a189001a Make the title of the stripe dialog's subscribe button say "Start Free Trial" if there isn't already a valid credit card on file 2014-04-23 13:01:27 -04:00
Joseph Schorr
8f66c39ff5 Use the customer information, not an existing subscription, to determine whether the button should say "Start Free Trial" or "Subscribe" 2014-04-23 01:17:34 -04:00
Joseph Schorr
a5c2fc7185 Add a display alert that shows when the trial period ends (if applicable). Also change the name of the Subscribe buttons to "Start Trial" when no existing subscription is found 2014-04-23 01:10:31 -04:00
jakedt
189903ffe9 Send an email automatically when a payment fails. 2014-04-22 13:56:34 -04:00
jakedt
58dbb540a1 Run a worker task immediately when it starts. 2014-04-22 13:55:54 -04:00
jakedt
9b3f61e410 Add robots.txt and update the sitemap. 2014-04-21 19:46:00 -04:00
jakedt
db70175a9f Install a more modern version of phantomjs that can run on 12.04 headless. 2014-04-21 18:53:03 -04:00
Joseph Schorr
09e26010c9 Merge branch 'master' of https://bitbucket.org/yackob03/quay 2014-04-18 18:38:16 -04:00
Joseph Schorr
8527dbe64e Clarify the language in the build trigger setup dialog 2014-04-18 18:37:45 -04:00
jakedt
2bc3d24543 Update the build worker to remove all tags from expired images. 2014-04-18 18:36:11 -04:00
Joseph Schorr
7399f5db54 Have the landing page reuse the normal header, restyled 2014-04-18 17:33:50 -04:00
Joseph Schorr
e66ac8425e Make the new landing page handle the signed in user better 2014-04-18 17:18:35 -04:00
jakedt
242d7e3c41 Merge branch 'master' of ssh://bitbucket.org/yackob03/quay 2014-04-18 11:02:21 -04:00
jakedt
99fd8baf39 Add stripe back into the libraries loaded. 2014-04-18 11:02:13 -04:00
jakedt
0cbcc5baef Remove the no longer used nginx config. 2014-04-18 11:01:59 -04:00
Joseph Schorr
4d7ff4e108 Dropdown buttons in the repo controls bar need some margin 2014-04-17 17:27:30 -04:00
Joseph Schorr
50d73a1d03 Merge branch 'master' of https://bitbucket.org/yackob03/quay 2014-04-17 16:53:55 -04:00
jakedt
5a2a64074f Make the command portion of the dockerfile parser case insensitive. 2014-04-17 16:49:04 -04:00
jakedt
0d8725e778 Update the instructions for starting and running the workers. 2014-04-17 16:18:53 -04:00
jakedt
a0cbead5aa Update the subscription change webhook to be more friendly and not send emails for payments. 2014-04-17 16:18:37 -04:00
Joseph Schorr
d8efb399b0 Merge branch 'tagyourit' 2014-04-17 14:20:28 -04:00
jakedt
05b3851a54 Make sure we update libssl inside the image to fix heartbleed. 2014-04-17 13:04:35 -04:00
jakedt
56a19aa24e Merge remote-tracking branch 'origin/peon'
Conflicts:
	Dockerfile
2014-04-17 13:03:40 -04:00
jakedt
9e88414773 Move the pid files inside the container so they don't conflict. 2014-04-17 12:29:23 -04:00
Joseph Schorr
91c1342ffb Switch to having GitHub login off in the default config, since the keys are empty anyway 2014-04-16 22:51:56 -04:00
Joseph Schorr
975de452d7 Merge branch 'master' of https://bitbucket.org/yackob03/quay 2014-04-16 22:48:09 -04:00
Joseph Schorr
a3bd2a065a Merge branch 'githublogin' 2014-04-16 22:48:03 -04:00
jakedt
a2e0804960 Merge branch 'master' of ssh://bitbucket.org/yackob03/quay 2014-04-16 22:44:03 -04:00
jakedt
893e5136a0 Make the local userfiles 404 if the file is not there. Remove some extraneous logging from the trigger. 2014-04-16 22:43:57 -04:00
Joseph Schorr
5da3ffcb66 Add a null check to make sure we don't try to update the tree before it has rendered 2014-04-16 22:43:13 -04:00
jakedt
be728ceccb Fix the implementation of local userfiles and switch master_branch to default_branch to match the github api. 2014-04-16 22:35:47 -04:00
Joseph Schorr
63cf8beb26 - Fix trigger setup to… work…
- Make sure new manual builds are added to the repo build list immediately
2014-04-16 17:50:25 -04:00
jakedt
0a9ee6c49f Bust the dockerfile build cache across repository lines. 2014-04-16 15:45:41 -04:00
jakedt
de044e9d5f Merge branch 'peon' of ssh://bitbucket.org/yackob03/quay into peon 2014-04-16 14:23:29 -04:00
jakedt
31aab09be5 Sort the files before we send them to the template renderer. Remove a stack symlink if present to avoid interfering with the volume. 2014-04-16 14:23:22 -04:00
Joseph Schorr
2ae48f7c15 Fix test multiple import issue 2014-04-15 18:51:12 -04:00
Joseph Schorr
da30cd86d5 Add steps to the Dockerfile to build the frontend bundles 2014-04-15 17:14:19 -04:00
jakedt
d95c321e28 Respond to subscription change events so I can stop polling the stripe event list. 2014-04-15 17:00:32 -04:00
Joseph Schorr
ede8ed21f4 Enable DEBUGGING mode, which loads the individual script files rather than the minimized bundles created by grunt 2014-04-15 16:35:15 -04:00
Joseph Schorr
9e4a8097af - Fix directive path in popup-input-button
- Add template caching to the combined JS bundle
- Load momentjs from the combined CDN
2014-04-15 16:19:08 -04:00
jakedt
3f42d15335 Merge remote-tracking branch 'origin/master' into tagyourit
Conflicts:
	static/css/quay.css
	static/js/graphing.js
	static/partials/view-repo.html
	test/data/test.db
2014-04-15 15:58:30 -04:00
Joseph Schorr
5fa4733a2f - Enable minification for the frontend JS bundle
- Make sure we are pegged to version 3.3.3 of D3
2014-04-15 15:58:00 -04:00
Joseph Schorr
7aab6a9fdd Get basic grunt-ified CSS and JS working. Note that this currently uses the dist bundles for both prod and debug. 2014-04-15 15:51:32 -04:00
jakedt
27072d4a2d Fix the deployment instructions. 2014-04-15 15:37:22 -04:00
Joseph Schorr
cbd0f30070 Start work on getting grunt setup for the Quay frontend. Note that this change is NOT working code 2014-04-15 15:14:14 -04:00
jakedt
a03fd73b04 Add instructions for how to build quay and push it to quay. 2014-04-15 14:27:14 -04:00
jakedt
dcc993a20e Fix the cache buster. 2014-04-15 14:27:00 -04:00
jakedt
5a1bb9988f Merge remote-tracking branch 'origin/master' into ncc1701 2014-04-15 14:14:56 -04:00