Commit graph

851 commits

Author SHA1 Message Date
Joseph Schorr
666114dea4 Add defcon1 banner
Fixes #771
2015-11-20 16:13:50 -05:00
Quentin Machu
2a1cee4f43 Make vulnerability tag UI more clair 2015-11-20 11:31:53 -05:00
Joseph Schorr
3b0e1cca2f Better scheduled downtime information
Fixes #819
2015-11-13 15:45:06 -05:00
Joseph Schorr
166d237072 Switch blog and docs to https 2015-11-13 12:29:48 -05:00
Joseph Schorr
7816b0c657 Merge master into vulnerability-tool 2015-11-12 21:52:47 -05:00
Joseph Schorr
3b3f101ea6 Vulnerability UI part 2
Fixes #860
Fixes #855
2015-11-12 16:59:36 -05:00
Joseph Schorr
76ce63895f New Quay Sec UI and fix some small bugs
Fixes #855
2015-11-11 18:15:58 -05:00
Joseph Schorr
ca7d736db2 Only send vulnerability events if the minimum priority is gte to that specified
Fixes #770
2015-11-10 16:05:55 -05:00
Silas Sewell
e826b14ca4 Merge pull request #725 from coreos-inc/setup-tool-georeplication
superuser: add storage replication config
2015-11-09 17:43:38 -05:00
Silas Sewell
5000b1621c superuser: add storage replication config 2015-11-09 17:34:22 -05:00
Matt Jibson
b0ec7074d0 Pass down page size from the scope
Instead of duplicating it here and in repo-panel-tags.js.
2015-11-09 15:17:34 -05:00
Joseph Schorr
b408cfd2cc Ready for demo 2015-11-09 12:51:05 -05:00
Joseph Schorr
8c144397e9 WIP: UI for QuaySec 2015-11-09 12:50:39 -05:00
Joseph Schorr
0f3db709ea Add a vulnerability_found event for notice when we detect a vuln
Fixes #637

Note: This PR does *not* actually raise the event; it merely adds support for it
2015-11-06 15:22:18 -05:00
josephschorr
11be448d75 Merge pull request #773 from coreos-inc/imageload
Never load the full repo image list
2015-11-04 16:29:20 -05:00
Joseph Schorr
4f41f79fa8 Never load the full repo image list
Always make smaller queries per tag to ensure we scale better

Fixes #754
2015-11-04 15:53:00 -05:00
Matt Jibson
0e68918748 Use 7 chars for git short SHAs
fixes #713
2015-11-04 14:08:10 -05:00
Joseph Schorr
f6a53f7cc5 Change all Quay.io references to Quay, fix tour and change logo
Fixes #741
2015-11-02 14:37:48 -05:00
Joseph Schorr
cca18f8ede Shoutout to QE on non-QE pages
Fixes #361
2015-11-02 14:34:19 -05:00
Joseph Schorr
f867ac5bfe Change to new logo 2015-11-02 14:34:16 -05:00
Joseph Schorr
4f06c40c9d Hide Run button on triggers not created by the current user
Fixes #726
2015-10-27 12:57:24 -04:00
Joseph Schorr
f49375949f Make teams UI more descriptive
Fixes #646
2015-10-15 12:05:55 -04:00
Silas Sewell
dd3d939b31 Update tag validation
Fixes #536
2015-10-05 19:32:10 -04:00
Joseph Schorr
4829ec51ca Better UX for build logs when switching focus back to tab
Currently, build logs are not loaded when the tab is in the background. However, when switching back to the tab, there is no indication that logs have not loaded, and it can take up to the poll duration (5s) before we even start loading the logs. This change adds a message displayed for the user before the logs start to load to indicate they are being refreshed and also *immediately* starts the loading of the logs when the tab is made visible.

Fixes #501
2015-09-17 14:24:34 -04:00
Joseph Schorr
2739cf47ba Prevent change visibility of a repo in the UI when disallowed by billing plan
Fixes #486

- Extracts out the check plan logic and UI from the new repo page into its own directive (repo-count-checker)
- Adds the new directive to the repo settings panel
- Some additional UI improvements for the repo settings panel
2015-09-16 14:00:06 -04:00
Joseph Schorr
6f2271d0ae Add support for direct download in Swift storage engine
Fixes #483
2015-09-14 18:00:03 -04:00
Joseph Schorr
c0286d1ac3 Add support for Dex to Quay
Fixes #306

- Adds support for Dex as an OAuth external login provider
- Adds support for OIDC in general
- Extract out external logins on the JS side into a service
- Add a feature flag for disabling direct login
- Add support for directing to the single external login service
- Does *not* yet support the config in the superuser tool
2015-09-04 17:05:06 -04:00
Joseph Schorr
587ef85c7f Allow users to choose the version of Swift to use
Fixes #442
2015-09-02 17:46:14 -04:00
Joseph Schorr
f22d585b7a Slightly better build logs error message 2015-08-28 11:49:29 -04:00
Joseph Schorr
a030ffc110 Only hide the Create Triggers button in XS mode (mobile) 2015-08-26 12:08:59 -04:00
Joseph Schorr
c0aca54e32 Allow users to choose trigger or manual in the build dialog
Fixes #379
2015-08-21 14:22:48 -04:00
Joseph Schorr
b3fcd3f84e Better build dialog UX
We now automatically validate the chosen Dockerfile/archive, and automatically check to see if a robot is needed
2015-08-20 13:41:08 -04:00
Joseph Schorr
84276ee945 Better notifications UI
Fixes #369
2015-08-17 17:08:58 -04:00
Joseph Schorr
3ca9dad2dd Fix tour content page: Was missing a </div> 2015-08-13 12:23:52 -04:00
Jake Moshenko
ec6bee35b6 Allow a stripe plan to be superseded
If a plan has a direct corrolary, show that one as the selected plan
instead of showing the plan as deprecated even though it has the same
details
2015-08-12 15:01:15 -04:00
Joseph Schorr
5044a4d58b Add public access to time machine
Fixes #333
2015-08-07 13:32:45 -04:00
Joseph Schorr
8a8955d234 Add documentation search to the main search bar 2015-08-03 17:15:53 -04:00
Jimmy Zelinskie
3613707c50 Merge pull request #298 from coreos-inc/removebex
Bex no longer exists; replace with Aptible
2015-08-03 15:02:55 -04:00
Joseph Schorr
3f814336a1 Bex no longer exists; replace with Aptible 2015-08-03 15:02:05 -04:00
Jimmy Zelinskie
8e6a0fbbee Merge pull request #294 from coreos-inc/logsload
Switch to using an aggregated logs query and infinite scrolling
2015-08-03 14:52:04 -04:00
Joseph Schorr
3d6c92901c Switch to using an aggregated logs query and infinite scrolling
This should allow users to work with large logs set.

Fixes #294
2015-07-31 16:38:02 -04:00
Joseph Schorr
4160b720f9 UI and API improvements for working with large repositories
- Change the tag check bar to only select the current page (by default), but allow for selecting ALL tags
- Limit the number of tags compared in the visualization view to 10
- Fix the multiselect dropdown to limit itself to 10 items selected
- Remove saving the selected tags in the URL, as it is too slow and overloads the URLs in Chrome when there are 1000+ tags selected
- Change the images API to not return locations: By skipping the extra join and looping, it made the /images API call 10x faster (in hand tests)

Fixes #292
Fixes #293
2015-07-31 16:31:29 -04:00
Jimmy Zelinskie
242c322850 Merge pull request #267 from coreos-inc/deletethrob
Add a throbber and better dialog for deleting repo
2015-07-23 11:28:06 -04:00
Joseph Schorr
b7581a8d3f Add a throbber and better dialog for deleting repo
Fixes #265
2015-07-22 17:03:47 -04:00
Joseph Schorr
ede9936722 Add a proper throbber to the repo list table 2015-07-22 16:59:31 -04:00
Joseph Schorr
2ff1dfc8b7 Switch to log base for the repo popularity 2015-07-22 14:20:46 -04:00
Joseph Schorr
687bab1c05 Support invite codes for verification of email
Also changes the system so we don't apply the invite until it is called explicitly from the frontend

Fixes #241
2015-07-22 13:41:27 -04:00
Jake Moshenko
5d86fa80e7 Merge pull request #197 from coreos-inc/keystone
Add Keystone Auth
2015-07-22 13:38:47 -04:00
Jimmy Zelinskie
7311f2e600 Merge pull request #253 from coreos-inc/uiimp
Small set of UI improvements
2015-07-21 16:52:41 -07:00
Jimmy Zelinskie
486ac45783 Merge pull request #226 from coreos-inc/robotadd
Feedback bar for showing response to user actions
2015-07-21 16:47:27 -07:00
Joseph Schorr
2ab3376729 Nicer strength indicators 2015-07-20 14:56:04 -04:00
Joseph Schorr
2704441eed Make empty repo table a bit nicer 2015-07-20 14:43:13 -04:00
Joseph Schorr
066637f496 Basic Keystone Auth support
Note: This has been verified as working by the end customer
2015-07-20 10:55:21 -04:00
Joseph Schorr
634190d1f9 Better messaging when creating a user on the landing page
Fixes #230
2015-07-14 14:00:29 +03:00
Joseph Schorr
ab47089872 Add feedback to prototype manager, application manager and the builds tab 2015-07-14 12:39:49 +03:00
Joseph Schorr
fd354469da Add feedback to the teams manager 2015-07-14 12:28:53 +03:00
Joseph Schorr
d74da9a3db Update styling of feedback bar to use the alert styles and string builder 2015-07-14 12:22:18 +03:00
Joseph Schorr
dcf8922799 Feedback bar for showing response to user actions
Fixes #215
2015-07-14 12:02:57 +03:00
Jimmy Zelinskie
cf4800c06c Merge pull request #213 from coreos-inc/orgmember
Add a secondary tab to Teams for managing org members
2015-07-06 11:48:40 -04:00
Jimmy Zelinskie
e199e19374 Merge pull request #217 from coreos-inc/robotspace
Remove space in robot names in the robots manager
2015-07-03 02:37:55 -04:00
Joseph Schorr
750b6ec287 Remove space in robot names in the robots manager
Fixes #216
2015-07-03 09:06:01 +03:00
Jimmy Zelinskie
3e29420718 Merge pull request #201 from coreos-inc/basepullissue
Record phase information and make better error messages on pull failure
2015-07-02 11:26:40 -04:00
Joseph Schorr
3a59c99b08 Add a secondary tab to Teams for managing org members
Also adds the ability to completely remove a user from an organization (repo permissions and teams), in a single click

Fixes #212
2015-07-02 17:06:36 +03:00
Joseph Schorr
b535e222b8 Have the fetch tag dialog show a warning for robot accounts without access
Before this change, we'd show the squash pulling command with the proper credentials, but it then 403s on the end user.
2015-07-01 19:37:52 +03:00
Jake Moshenko
411ddceee0 Merge pull request #195 from coreos-inc/tidy
Delete all the old UI code and branches for new UI
2015-06-30 14:34:43 -04:00
Joseph Schorr
e06435fee4 Record phase information and make better error messages on pull failure 2015-06-30 18:04:44 +03:00
Joseph Schorr
67208046bc Merge branch 'master' of github.com:coreos-inc/quay 2015-06-29 21:28:16 +03:00
Joseph Schorr
d4b6ea3893 Fix missing > 2015-06-29 21:28:05 +03:00
Joseph Schorr
2b1bbcb579 Add a table view to the repos list page
Fixes #104
2015-06-29 21:12:53 +03:00
Jimmy Zelinskie
7043ddc935 Merge pull request #187 from coreos-inc/adblock
Add messaging when archived build logs loads fail.
2015-06-29 13:34:42 -04:00
Jimmy Zelinskie
756d6784ca Merge pull request #192 from coreos-inc/sqlssl
Allow SSL cert for the database to be configured
2015-06-29 13:33:31 -04:00
Joseph Schorr
dc5af7496c Allow superusers to disable user accounts 2015-06-29 18:40:52 +03:00
Joseph Schorr
3342f2392d Remove long build descriptions (not properly used in the new UI) 2015-06-29 12:36:39 +03:00
Joseph Schorr
ff3d8bb013 Delete the old UI! 2015-06-29 12:33:00 +03:00
Joseph Schorr
bb07d0965f Allow SSL cert for the database to be configured
This change adds a field for the SSL cert for the database in the setup tool. Fixes #89
2015-06-29 08:08:10 +03:00
Joseph Schorr
094c94c0fb Add messaging when archived build logs loads fail.
This code also checks for an ad blocker, and adjusts the message accordingly.

Fixes #184
2015-06-28 09:14:48 +03:00
Joseph Schorr
f0f864a375 Fix handling of long build commit messages
Fixes #175
2015-06-26 16:09:35 -04:00
Joseph Schorr
0baaacb0a6 Change delete tags dialog to show tabs in a row
Fixes #177
2015-06-25 16:19:40 -04:00
Joseph Schorr
2ef105dd8c Change binds on the tags page to bindonce
This makes building the DOM in Angular faster
2015-06-25 16:19:40 -04:00
Joseph Schorr
672e8a5ba9 Add pagination to the tags view 2015-06-25 16:19:39 -04:00
Joseph Schorr
0d133b0fa4 appLinkTarget needs to be lazy 2015-06-25 16:19:36 -04:00
Joseph Schorr
43330bcfad Make loading of the tags tab async 2015-06-25 16:19:04 -04:00
Joseph Schorr
9e785ab019 Make multiselect dropdown faster and nicer for large lists 2015-06-25 16:19:04 -04:00
Joseph Schorr
07439328a4 Remove user_exists endpoint from all auth systems 2015-06-23 17:33:51 -04:00
Jimmy Zelinskie
66450d4810 Merge pull request #152 from coreos-inc/branchtag
Allow manual triggering of both branches and tags
2015-06-22 15:37:03 -04:00
Joseph Schorr
744f462b96 Only show "New Dockerfile Build" when user has write permission
Fixes #156
2015-06-22 12:17:14 -04:00
Joseph Schorr
143036be9c Allow manual triggering of both branches and tags
Fixes #100
2015-06-19 14:38:26 -04:00
Joseph Schorr
96bcfa84ae Add better messaging around squashed fetching when the user is not a namespace admin
Fixed #147
2015-06-17 16:38:31 -04:00
Joseph Schorr
b2d2fbe18f Fix bug in the logs view UI 2015-06-15 17:26:58 -04:00
Jimmy Zelinskie
ae779cade2 Merge pull request #130 from coreos-inc/setupbuildnow
Add button for running a newly setup trigger
2015-06-15 15:53:50 -04:00
Joseph Schorr
16a205c108 Add button for running a newly setup trigger
This allows users quick access to test their new trigger they just setup

Fixes #125
2015-06-12 17:02:58 -04:00
Joseph Schorr
e7fa560787 Add support for custom fields in billing invoices
Customers (especially in Europe) need the ability to add Tax IDs, VAT IDs, and other custom fields to their invoices.

Fixes #106
2015-06-12 16:45:01 -04:00
Joseph Schorr
de2a64e066 Fix documentation link for JWT auth 2015-06-05 15:21:57 -04:00
Jake Moshenko
2a2414d6af Merge pull request #60 from coreos-inc/jwtauthentication
Add support for an external JWT-based authentication system
2015-06-05 13:37:42 -04:00
Joseph Schorr
8aac3fd86e Add support for an external JWT-based authentication system
This authentication system hits two HTTP endpoints to check and verify the existence of users:

Existance endpoint:
GET http://endpoint/ with Authorization: Basic (username:) =>
    Returns 200 if the username/email exists, 4** otherwise

Verification endpoint:
GET http://endpoint/ with Authorization: Basic (username:password) =>
    Returns 200 and a signed JWT with the user's username and email address if the username+password validates, 4** otherwise with the body containing an optional error message

The JWT produced by the endpoint must be issued with an issuer matching that configured in the config.yaml, and the audience must be "quay.io/jwtauthn". The JWT is signed using a private key and then validated on the Quay.io side with the associated public key, found as "jwt-authn.cert" in the conf/stack directory.
2015-06-05 13:20:10 -04:00
Joseph Schorr
4347e2f344 Tutorial improvements
- Skip the build-related tutorial steps when builds are disabled
- Make the styling of the tutorial more consistent with the new layout
2015-06-04 14:15:47 -04:00
josephschorr
63f289a8cb Merge pull request #59 from jzelinskie/custom-git-fix
triggers: metadata.commit_sha -> metadata.commit
2015-06-02 16:10:26 -04:00
Jimmy Zelinskie
7f4dd7d42f triggers: backwards compatible schema for metadata 2015-06-02 16:05:17 -04:00
Jimmy Zelinskie
e01bdd4ab0 triggers: metadata.commit_sha -> metadata.commit
This resolves an issue where the custom-git trigger's public facing
schema was not the same as the internal metadata schema. Instead of
breaking users, we rework the internal metadata schema to be the same as
the custom-git JSON schema. This commit also updates everything that
used `metadata.commit_sha` including the test database.
2015-06-02 15:32:28 -04:00
Joseph Schorr
c0e995c1d4 Merge branch 'master' into nolurk 2015-06-02 13:55:16 -04:00
Joseph Schorr
e22e94d609 Add a note to the badges section about tokens
This alerts users to the fact that the tokens for badges are safe to share
2015-05-27 15:27:08 -04:00
Joseph Schorr
bd262bbb3f Make sure there is always a way to create a repo notification
Before this change, the button was hidden on small sizes, but the link was only shown on extra-small sizes, leaving a small window where there was no way to create a new notification
2015-05-26 18:29:04 -04:00
Joseph Schorr
9888c3ad9b Add an endpoint for downloading the logs of a build. 2015-05-26 17:24:18 -04:00
Jimmy Zelinskie
5db790bb30 setup-tool: add HSTS info box 2015-05-26 16:05:37 -04:00
Joseph Schorr
5845e37e32 Add Swift storage library 2015-05-26 16:05:21 -04:00
Joseph Schorr
54992c23b7 Add a feature flag for disabling unauthenticated access to the registry in its entirety. 2015-05-19 17:52:44 -04:00
Joseph Schorr
28bd9af4ff Fix tutorial 2015-05-13 14:55:39 -04:00
Joseph Schorr
30608366d7 Update screenshots and tour content 2015-05-13 14:24:12 -04:00
Joseph Schorr
efab02ae47 LDAP improvements:
- Better logging
  - Better error messages
  - Add unit tests
  - Clean up the setup tool for LDAP
2015-05-11 21:23:18 -04:00
Joseph Schorr
4feb2a2032 Hide unneeded user elements when in LDAP 2015-05-11 13:32:24 -04:00
Joseph Schorr
3627de103c Minimize the queries used when retrieve builds. Previously, we'd call out to SQL extra times per build. 2015-05-07 21:11:15 -04:00
Joseph Schorr
2105ad90a0 Show the billing options in the user and org views 2015-05-07 16:43:45 -04:00
Joseph Schorr
23fafa6b4a Make images loaded lazily on the repo tags page, as they will not be needed in the read-only (common) case. 2015-05-07 15:51:49 -04:00
Joseph Schorr
c04cb4e988 Change the repo view page to minimize the number of API calls necessary until such time as the information is needed (lazy load everything). Also increase the build timer to 30s. 2015-05-06 18:16:03 -04:00
Joseph Schorr
70cc895b95 Fix JS NPEs 2015-05-04 09:17:58 -07:00
Joseph Schorr
7ec0ad45fc Fix team linking in the robots manager 2015-05-03 19:18:04 -07:00
Joseph Schorr
cd6a74a489 Fix description icons 2015-05-03 17:44:04 -07:00
Joseph Schorr
7e2dd369a3 Hide the search result scores 2015-05-03 17:22:37 -07:00
Joseph Schorr
65bce31d96 Enable new layout everywhere and fix SCM icons 2015-05-03 16:54:27 -07:00
Joseph Schorr
abe43e758a Make instructions on gitlab setup a bit easier 2015-05-03 12:02:07 -07:00
Joseph Schorr
4f2a1b3734 Add setup UI for the new trigger types (bitbucket and gitlab) and add validation 2015-05-03 11:50:26 -07:00
Joseph Schorr
c8d3ded95a Fix icons for gitlab and some spacing 2015-05-03 10:43:08 -07:00
Joseph Schorr
d07f9f04e9 UI and code improvements to make working with the multiple SCMs easier 2015-05-03 10:38:11 -07:00
Joseph Schorr
f091aaa07e Get basic support for GitLab working in the UI 2015-05-03 09:58:48 -07:00
Joseph Schorr
e3aededcbc Merge branch 'master' into gitlab 2015-05-03 12:13:09 -04:00
Jimmy Zelinskie
7426a540dd initial gitlab angular stuff 2015-05-02 13:31:54 -04:00
Joseph Schorr
b96e35b28c Merge master into bitbucket 2015-04-30 15:52:08 -04:00
Joseph Schorr
b7317f894b UI fixes for all the new trigger stuff 2015-04-30 15:33:19 -04:00
Joseph Schorr
de29a441c8 Work in progress: UI fixes for the new trigger type 2015-04-29 19:50:13 -04:00
Joseph Schorr
6479f8ddc9 Work In Progress!
Get the full activation and deactivation cycle working for bitbucket.
2015-04-28 18:15:12 -04:00
Joseph Schorr
a03a327748 Fix timestamps on the build logs 2015-04-28 13:26:21 -04:00
Joseph Schorr
5741656411 Get a nice dropdown of tags working on the visualize tags tab 2015-04-27 17:36:31 -04:00
Joseph Schorr
be9906167a Make repo pull and push counts on the info page be abbreviated 2015-04-27 14:43:55 -04:00
Joseph Schorr
1979f87384 Switch spinners to loaders in the billing manager 2015-04-27 14:40:41 -04:00
Joseph Schorr
526f9c07b9 Hide images in search result descriptions and make the descriptions align better 2015-04-27 14:31:49 -04:00
Joseph Schorr
4834dbd7c9 Add confirmation for deleting a robot 2015-04-27 14:19:50 -04:00
Joseph Schorr
6581a024bc Make add tag be at the top of the tags operations menu 2015-04-27 14:17:55 -04:00
Joseph Schorr
1d9466a9af Make the title box more responsive 2015-04-27 14:11:05 -04:00
Joseph Schorr
3ac108ddae Make the notifications bubble clickable 2015-04-27 14:09:00 -04:00
Joseph Schorr
f60e56c056 Fix text only links and some spacing in FF 2015-04-27 14:02:55 -04:00
Joseph Schorr
5cc91ed202 Work in progress: bitbucket support 2015-04-24 18:36:48 -04:00
Joseph Schorr
c480fb2105 Work in progress: bitbucket support 2015-04-24 15:13:08 -04:00
Jimmy Zelinskie
6caa6657a7 fix manual upload build description 2015-04-24 13:20:03 -04:00
Jimmy Zelinskie
2a13eade80 Merge pull request #22 from coreos-inc/git
git's a pretty cool guy
2015-04-23 17:33:36 -04:00
Joseph Schorr
8663bcd1c7 Switch to the new robot icon 2015-04-23 16:41:47 -04:00
Joseph Schorr
b02b98def3 Fix bug in robots manager around adding a new robot and make the robots listing using bind once to reduce the number of listeners 2015-04-23 13:56:25 -04:00
Joseph Schorr
518419097f Really sort robots by name. Also sort teams by name and fix team create. 2015-04-23 13:20:03 -04:00
Joseph Schorr
4deacf11d6 Entity search menu improvements: sorting and max height 2015-04-23 12:12:54 -04:00
Jimmy Zelinskie
352371431b ng-switch for pullInfo.status 2015-04-22 17:22:29 -04:00
Jimmy Zelinskie
07b730c7ad generic trigger credentials 2015-04-22 17:07:16 -04:00
Jimmy Zelinskie
9703850e8f enforce short SHAs throughout build pipeline 2015-04-22 13:22:04 -04:00
Jimmy Zelinskie
02498d72ba almost all PR discussion fixes 2015-04-21 18:04:25 -04:00
Joseph Schorr
d4b593cada Hide empty message when loading 2015-04-21 16:32:56 -04:00
Joseph Schorr
afa59da8d6 Make the org and user views more performant by only loading teams and robots when requested, making some loads async, and skipping others entirely on mobile 2015-04-21 16:07:24 -04:00
Joseph Schorr
9b277a7260 Make the repo tokens table slightly nicer. This UI is deprecated anyway, so it doesn't need to be perfect 2015-04-21 15:15:11 -04:00
Joseph Schorr
8f736e67e8 Small UI fixes 2015-04-21 15:13:29 -04:00
Joseph Schorr
0cb05436f7 Make scores smaller for mobile 2015-04-21 12:26:03 -04:00
Joseph Schorr
496cf03373 Handle read-only in the new role group UI 2015-04-21 12:23:41 -04:00
Joseph Schorr
4b9225748d Enable search on mobile mode 2015-04-21 12:21:32 -04:00
Joseph Schorr
1b32baf837 Small UI fixes and improvements 2015-04-21 12:16:32 -04:00
Joseph Schorr
54097c351e Finish work on the new role group and make sure it only appears when the new layout is enabled 2015-04-21 12:02:59 -04:00
Joseph Schorr
a4cacd7307 Start on mobilification of repo view 2015-04-20 17:42:33 -04:00
Joseph Schorr
6c21dc788e Small UI fixes 2015-04-20 14:20:29 -04:00
Joseph Schorr
f1ea20315a Finish mobilification of org view 2015-04-20 14:00:10 -04:00
Joseph Schorr
f8192a1140 Merge master into ibranch 2015-04-20 13:23:02 -04:00
Joseph Schorr
72abd80f08 Make robot accounts filter rather than display the dialog when "showRobot" is passed to the manager 2015-04-20 13:11:21 -04:00
Joseph Schorr
ecf1135dcd Clarify the robot permissions 2015-04-20 13:01:51 -04:00
Jimmy Zelinskie
93cd459460 Merge branch 'master' into git 2015-04-20 10:58:49 -04:00
Joseph Schorr
56f8bd1661 Clarify the empty message on the tag timeline 2015-04-19 18:13:13 -04:00
Joseph Schorr
2815ea2723 Merge branch 'master' of github.com:coreos-inc/quay 2015-04-19 15:16:39 -04:00
Joseph Schorr
8714eb207a Merge branch 'actioncount' 2015-04-19 15:12:44 -04:00
Joseph Schorr
443cea28df Mobile layout fixes for authorized apps and external logins 2015-04-19 15:11:58 -04:00
Joseph Schorr
32635cc641 - Make robots manager fully responsive
- Add a cor-table which automatically stacks and collapses on mobile views
2015-04-17 16:43:53 -04:00
Joseph Schorr
a904cdbcbf Make tabs responsive 2015-04-17 14:24:59 -04:00
Joseph Schorr
e381d8cc81 Better handling of title actions on mobile devices 2015-04-17 12:27:25 -04:00
Joseph Schorr
dca6b93592 Responsive new repo page 2015-04-17 12:17:44 -04:00
Jimmy Zelinskie
ba2cb08904 Merge branch 'master' into git 2015-04-16 17:38:35 -04:00
Joseph Schorr
f19d2f684e Add ability to revert tags via time machine 2015-04-16 17:18:00 -04:00
Jimmy Zelinskie
de3fa5f42d directives: ssh-key-dialog -> trigger credentials 2015-04-16 14:58:25 -04:00
Jimmy Zelinskie
2236270741 add webhook URL to custom trigger dialog 2015-04-16 12:06:48 -04:00
Joseph Schorr
2a77bd2c92 - UI improvements in prep for adding undo ability
- Move the tag history into its own directive and clean up the code
2015-04-15 18:39:05 -04:00
Joseph Schorr
daa2ce19aa Fix typo 2015-04-15 15:38:59 -04:00
Joseph Schorr
f8c80f7d11 Add a history view to the tags page. Next step will add the ability to revert back in time 2015-04-15 15:21:09 -04:00
Jimmy Zelinskie
876d9c53f2 View SSH Key modal 2015-04-14 14:11:02 -04:00
Jimmy Zelinskie
f4ba7b41b3 custom trigger post activation now warning 2015-04-13 17:36:30 -04:00
Joseph Schorr
657c9d1cc9 Make the search results only show the first line, properly marked down, for repositories 2015-04-13 14:24:52 -04:00
Jimmy Zelinskie
222101482f add post-activation trigger setup dialog 2015-04-13 13:45:34 -04:00
Joseph Schorr
dddab60058 Better empty messages on billing, prototype and application managers. Also properly handles the 404 for the invoices manager. 2015-04-09 16:25:10 -04:00
Joseph Schorr
3a2f271362 Slight UI improvements to the teams page: sort members by whether they are a robot, reduce the number displayed to 20, and make users clickable 2015-04-09 15:12:03 -04:00
Joseph Schorr
c2e4cbe95b Nicer handling of robots: sort the robots by name and add a filtering box 2015-04-09 15:03:07 -04:00
Joseph Schorr
5ae2975134 Properly debounce searching and make sure to only show results matching the current query. 2015-04-08 16:40:22 -04:00
Joseph Schorr
e23155b75d Redo styling of the tutorial page 2015-04-08 15:19:01 -04:00
Joseph Schorr
2e3704f7ba Redo header bar to trim options when we can and make the repositories page the default landing page for logged in users 2015-04-08 15:15:21 -04:00
Joseph Schorr
af468a8c6a - UI feedback fixes: text cutoffs, misformatting fixes, etc
- Add hotkey support for searching and creating repositories
- Make search animations significantly faster
2015-04-08 14:39:52 -04:00
Joseph Schorr
7bdd7c5f82 Remove some code duplication by moving the robot and team creation dialogs to the create service 2015-04-08 11:54:04 -04:00
Joseph Schorr
4b64236d8e Get new docker file build action working 2015-04-07 18:38:58 -04:00
Joseph Schorr
d09f2f6e22 Get the new context-sensitive new menu working 2015-04-07 18:33:43 -04:00
Joseph Schorr
55a2c54ab6 Better keyboard handling and show score on results 2015-04-07 12:11:16 -04:00
Joseph Schorr
951b0cbab8 Start on new interactive search 2015-04-06 19:17:18 -04:00
Jimmy Zelinskie
6465e7492a trigger service: trimsubdir helper method 2015-04-06 15:10:03 -04:00
Jimmy Zelinskie
c8b931609e unsupported alert for robot selection 2015-04-06 14:53:54 -04:00
Joseph Schorr
cafc96fe28 Switch the "Account Settings" link to the new user view page's settings tab 2015-04-03 17:56:08 -04:00
Joseph Schorr
5ed900c9bc Add new co-alert CSS styles and fix some other UI issues 2015-04-03 17:47:39 -04:00
Jimmy Zelinskie
7d72608006 add custom trigger build description 2015-04-03 17:20:31 -04:00
Jimmy Zelinskie
15ffec4678 custom trigger: fix git url regex 2015-04-03 17:20:30 -04:00
Jimmy Zelinskie
f4948efe7b repo-panel-builds: fix subdir 2015-04-03 17:20:30 -04:00
Jimmy Zelinskie
58b21fbd4f trigger-description: fix ng-if 2015-04-03 17:20:30 -04:00
Joseph Schorr
f46d9c88cf Link to the user pages now that they exist 2015-04-03 14:58:13 -04:00
Joseph Schorr
2d8237bd83 Fix avatar in the user view 2015-04-03 12:34:52 -04:00
Joseph Schorr
f67eeee8c8 Start conversion of the user admin/view 2015-04-02 16:34:41 -04:00
Joseph Schorr
1deb5121b8 Merge branch 'orgview' 2015-04-01 15:12:15 -04:00
Joseph Schorr
c31eea8f79 Restyle the billing invoices tab 2015-04-01 15:04:01 -04:00
Joseph Schorr
393e91098c Restyle the applications manager 2015-04-01 14:49:15 -04:00
Joseph Schorr
b240af6d7c Redo styling of the default permissions manager 2015-04-01 14:41:41 -04:00
Joseph Schorr
5fc8e632d6 Redo the permissions table to have different sections for users and robot accounts 2015-04-01 14:23:39 -04:00
Jonathan Boulle
0cb717bd22 Fix some typos in static site 2015-04-01 11:21:19 -07:00
Joseph Schorr
5cd500257d Merge branch 'master' into orgview 2015-04-01 13:56:49 -04:00
Joseph Schorr
fde9666647 Add the team membership to the robots view 2015-04-01 13:56:30 -04:00
Jimmy Zelinskie
7352bee8c6 trigger description: custom trigger support 2015-04-01 13:32:16 -04:00
Jimmy Zelinskie
4e097c1f9d custom trigger: build trigger config 2015-04-01 13:31:51 -04:00
Joseph Schorr
e6354571f6 Link repos under the robots manager to the settings tab 2015-04-01 11:31:26 -04:00
Joseph Schorr
1f5e6df678 - Fix tests
- Add new endpoints for retrieving the repo permissions for a robot account
- Have the robots list return the number of repositories for which there are permissions
- Other UI fixes
2015-03-31 18:50:43 -04:00
Jimmy Zelinskie
d2f9a8838c custom trigger: more wizard progress 2015-03-31 17:12:40 -04:00
Joseph Schorr
9018cf14eb Better UI for the permissions table in the repository, as well as fix some other avatar issues 2015-03-31 14:36:09 -04:00
Joseph Schorr
27a9b84587 Switch avatars to be built out of CSS and only overlayed with the gravatar when a non-default exists 2015-03-30 17:55:04 -04:00
Jimmy Zelinskie
7d1d53ebcb custom trigger: initial setup wizard 2015-03-27 17:07:06 -04:00
Joseph Schorr
02bafb1613 Fix language in the config setup tool 2015-03-26 16:31:19 -04:00
Joseph Schorr
aaf1b23e98 Address CL concerns and switch to a real encryption system 2015-03-26 15:10:58 -04:00
Joseph Schorr
e4b659f107 Add support for encrypted client tokens via basic auth (for the docker CLI) and a feature flag to disable normal passwords 2015-03-25 18:43:12 -04:00
Joseph Schorr
6d0855f4fc Small UI improvements to the teams tab 2015-03-25 16:30:13 -04:00
Joseph Schorr
2459b6b467 Start on new org view 2015-03-25 15:31:05 -04:00
Joseph Schorr
d9c3c6689a - Upgrade angular-strap to fix an NPE
- Start the download of the rest of the repo information after the repo itself loads
2015-03-23 16:10:33 -04:00
Joseph Schorr
85d6500daa Merge resistanceisfutile into master 2015-03-23 15:39:08 -04:00
Joseph Schorr
049148cb87 Work in progress: new image view 2015-03-20 17:46:02 -04:00
Joseph Schorr
3959ea2ff9 Add ability to add/move a tag in the tag view 2015-03-19 15:23:34 -04:00
Joseph Schorr
c066df6d21 Clarify pull text 2015-03-19 15:10:16 -04:00
Joseph Schorr
70aec00914 Add a fetch tag dialog 2015-03-19 15:08:18 -04:00
Joseph Schorr
c1d58bdd6c Make messaging around the connected user invoking builds better 2015-03-18 16:26:27 -04:00
Joseph Schorr
99c56b7f98 Delink the build-mini-status if the user is not the repo admin 2015-03-18 15:43:53 -04:00
Joseph Schorr
ab2331a486 Performance improvements for the repo API and the new repo UI 2015-03-18 14:47:53 -04:00
Joseph Schorr
bc6baae050 Add scheduled scheduled maintenances to the status bar 2015-03-18 13:49:34 -04:00
Joseph Schorr
cea8b03872 Fix titles on small devices 2015-03-18 13:42:48 -04:00
Joseph Schorr
704b60e5ce Reorder the columns in the builds list 2015-03-18 12:13:07 -04:00
Joseph Schorr
ced7c0ab49 Fix throbber location on the builds list in the info tab 2015-03-18 12:11:40 -04:00
Joseph Schorr
e58144eec5 Add selection of images by railroad track 2015-03-18 12:06:47 -04:00
Joseph Schorr
699cb9a5da Fix last modified date time handling for tags with no date times, and fix the sort ordering 2015-03-17 16:49:22 -04:00
Joseph Schorr
3c305beeea Merge branch 'tagview' 2015-03-16 17:14:43 -04:00
Joseph Schorr
5479ffdf32 Small fixes 2015-03-16 17:09:46 -04:00
Joseph Schorr
31480de8c1 Get the remainder of the repo settings panel working 2015-03-16 17:03:26 -04:00
Joseph Schorr
32956b6713 Finish permissions table support 2015-03-16 14:49:57 -04:00
Joseph Schorr
360aa69d92 Fix LDAP error and url handling to be more clear for the end user 2015-03-16 14:33:53 -04:00
Joseph Schorr
dc5d40ddc3 Start work on the repo permissions table 2015-03-16 14:17:27 -04:00
Joseph Schorr
1b6fc60c10 Grammar fix 2015-03-13 15:39:59 -07:00
Joseph Schorr
1a3bcb0f8d Add ability to resume trigger setup 2015-03-13 15:37:43 -07:00
Joseph Schorr
333e0acd6d Add the builds tab 2015-03-13 15:34:28 -07:00
Joseph Schorr
347bf31f2d Have tags selected be handled universally throughout the entire repository view page. 2015-03-12 12:22:47 -07:00
Joseph Schorr
ea61a68bcb Add missing files from last commit (stupid SourceTree...) 2015-03-11 17:47:12 -07:00
Joseph Schorr
89e71b75dd Fix title location on small viewports 2015-03-10 17:30:09 -07:00
Joseph Schorr
002dc083f2 Get the main repo page design working 2015-03-10 17:22:46 -07:00
Joseph Schorr
3d3c8ca198 Some improvements to image tracks in the repo list view 2015-03-10 11:00:11 -07:00
Joseph Schorr
afc8e95e19 Start on new tag view 2015-03-09 22:03:39 -07:00
Joseph Schorr
6a625ba9e6 Fix build logs date/time 2015-03-06 14:22:19 -05:00
Joseph Schorr
91ea6b5a45 Only show the "Waiting" message if we are actually waiting 2015-03-06 14:10:07 -05:00
Joseph Schorr
36b6ec5813 Only show status bar if there are any incidents 2015-03-06 14:06:20 -05:00
Joseph Schorr
12b458780b Handle loading status better for each namespace displayed in the repo list and update the database we use for testing 2015-03-05 16:25:16 -05:00
Joseph Schorr
43ab838998 Merge branch 'newbuildview' 2015-03-05 16:17:29 -05:00
Joseph Schorr
86447c0a99 Merge branch 'master' into pagesnew 2015-03-05 14:22:10 -05:00
Joseph Schorr
08f006a90c Add the namespaces box to the right hand side and make other small UI improvements to the repo list view 2015-03-05 14:21:46 -05:00
Joseph Schorr
785de61c59 Start on updated repo list view 2015-03-05 12:00:36 -05:00
Jimmy Zelinskie
507d3fb973 fix repos not loading when signed in on repo list 2015-03-04 15:54:47 -05:00
Joseph Schorr
4ca5d9b04b Add support for filtering github login by org 2015-03-03 19:58:42 -05:00
Joseph Schorr
ed46d37ea7 - Add copy button to the build logs
- Add support for timestamps in the build logs
- Other small UI improvements to the build view
2015-02-27 16:00:32 -05:00
Joseph Schorr
e227d7e526 Start on the new build view 2015-02-26 17:45:28 -05:00
Joseph Schorr
d8048b09d2 Make the hip chat setup field show more help information if the user enters a room name instead of a number 2015-02-26 12:35:28 -05:00
Joseph Schorr
258e879d11 Fix default mail sender field in the setup tool 2015-02-25 18:30:38 -05:00
Joseph Schorr
ace6da5514 Add a service status indicator to the footer and add a notification bar for any incidents 2015-02-24 17:41:30 -05:00
Joseph Schorr
afe6be0daf Put a message if the download link won't appear 2015-02-24 16:51:03 -05:00
Jimmy Zelinskie
758158391c css: prevent new UI css from breaking old css
This also breaks css out into directives.
2015-02-24 14:43:04 -05:00
Jimmy Zelinskie
e082b61b26 update gradient on starred repo list 2015-02-23 17:30:43 -05:00
Jimmy Zelinskie
498d0af6a4 directives: add optional placeholder for markdown 2015-02-23 16:43:59 -05:00
Jimmy Zelinskie
3dbaafbd60 Merge branch 'pagesnew' into star 2015-02-23 15:07:49 -05:00
Joseph Schorr
9b87999c1c Code cleanup part #1: move all the services and directive JS code in the app.js file into its own files 2015-02-19 16:21:54 -05:00
Jimmy Zelinskie
917dd6b674 Merge branch 'master' into star 2015-02-18 17:36:58 -05:00
Joseph Schorr
ea5b998168 Fix missed container 2015-02-18 15:51:57 -05:00
Joseph Schorr
c642cada00 Adjust CSS for new version of bootstrap 2015-02-17 19:37:37 -05:00
Joseph Schorr
ff7e97faf7 Merge branch 'master' into quark 2015-02-17 19:16:12 -05:00
Joseph Schorr
524705b88c Get dashboard working and upgrade bootstrap. Note: the bootstrap fixes will be coming in the followup CL 2015-02-17 19:15:54 -05:00
Joseph Schorr
83e05d2342 Add tracking of the kind of temporary access tokens, so we can display if a pull/push by token is for a build worker 2015-02-17 12:35:16 -05:00
Joseph Schorr
79f39697fe - Fix superuser panel for debugging
- Start work on the gauges panel
2015-02-17 11:31:50 -05:00
Joseph Schorr
fbdbc21eb1 Merge branch 'master' into quark 2015-02-13 16:24:53 -05:00
Joseph Schorr
9dfe523615 Merge master changes 2015-02-05 13:11:16 -05:00
Jimmy Zelinskie
8efdd95f6d partials: correct missing > 2015-01-29 12:45:34 -05:00
Jimmy Zelinskie
4ed9cc8c7f partials: fix ER logo not showing up 2015-01-29 12:29:42 -05:00
Joseph Schorr
d359c849cd Add the build worker and job count information to the charts 2015-01-28 17:12:33 -05:00
Joseph Schorr
63cd6ffcc3 Start on adding usage charts 2015-01-28 12:35:01 -05:00
Joseph Schorr
30b895b795 Merge branch 'grunt-js-folder' of https://github.com/coreos-inc/quay into ackbar 2015-01-23 17:26:14 -05:00
Joseph Schorr
c8229b9c8a Implement new step-by-step setup 2015-01-23 17:19:15 -05:00
Joseph Schorr
ca350f9808 Better styling for the updated build dialog. This is temporary until we redo the UI 2015-01-16 17:06:20 -05:00
Joseph Schorr
473a141835 Allow for building of Dockerfiles with pull robots 2015-01-16 17:01:14 -05:00
Joseph Schorr
3a3945779d Add checking for localhost in hostname fields. 2015-01-15 14:36:05 -05:00
Joseph Schorr
cc453e7d10 Fix some issues around validation in the config forms 2015-01-14 17:04:02 -05:00
Jimmy Zelinskie
1b34ea13c9 Merge branch 'master' of github.com:coreos-inc/quay 2015-01-13 11:03:16 -05:00
Jimmy Zelinskie
f268a5d661 Fix twitter-view once and for all!
One image URL was broken and it was accidentally using the avatar
directive, so the class has been changed to 'twitter-avatar' and made
explicit.
2015-01-13 11:02:08 -05:00
Jimmy Zelinskie
3da0228aaa Add repo-list-grid directive 2015-01-12 17:43:36 -05:00
Joseph Schorr
7d412a5b68 Fix plans manager on mobile 2015-01-12 12:35:06 -05:00
Joseph Schorr
2878fd28c6 Fix header and some other minor fixes on mobile 2015-01-12 12:26:57 -05:00
Joseph Schorr
5a0277b465 Fix plans table on mobile 2015-01-12 12:17:00 -05:00
Joseph Schorr
6d604a656a Move config handling into a provider class to make testing much easier 2015-01-09 16:23:31 -05:00
Jimmy Zelinskie
5a05c6560b Always use default twitter image for twitter-view.
It was generating a very low resolution (16x16) avatar for the null user
and blowing it up to fit. It's much better to just use what would've
been the fallback.
2015-01-08 16:23:43 -05:00
Joseph Schorr
c0c27648ea Clarify where the configuration is saved 2015-01-08 16:16:22 -05:00
Joseph Schorr
65989ac1fb Fix bug where deleting the server hostname removed the entire form 2015-01-08 16:06:20 -05:00
Joseph Schorr
0a82f669ae Require that all form fields marked 'required' are filled out before we allow config validation 2015-01-08 15:58:35 -05:00
Joseph Schorr
bfd273d16f - Make validation a bit nicer:
- Add timeout to the DB validation
  - Make DB validation exception handling a bit nicer
  - Move the DB validation error message

- Fix bug around RADOS config default for Is Secure
- Allow hiding of the validation box
2015-01-08 15:27:49 -05:00
Joseph Schorr
5e0ce4eea9 Add validation of github to the config tool 2015-01-08 13:26:24 -05:00
Joseph Schorr
63504c87fb Get end-to-end configuration setup working, including verification (except for Github, which is in progress) 2015-01-07 16:20:51 -05:00
Joseph Schorr
825455ea6c Get the contacts field partially working 2015-01-05 17:10:01 -05:00
Joseph Schorr
32c0a14d96 Get mapped fields (Github and Redis) working 2015-01-05 15:18:01 -05:00
Joseph Schorr
219730c341 Better config defaults and remove some unneeded code 2015-01-05 13:01:32 -05:00
Joseph Schorr
1bf25f25c1 WIP 2015-01-04 14:38:41 -05:00
Joseph Schorr
77278f0391 Some UI improvements 2014-12-26 19:18:00 -05:00
Joseph Schorr
1142b1bc18 Start on config setup tool. This tool is not yet functional. 2014-12-26 16:54:36 -05:00
Joseph Schorr
5c7a9d0daf Add the ability to view the system logs in the superuser endpoint 2014-12-23 11:40:51 -05:00
Joseph Schorr
1f9f4ef26b - Switch font to Source Sans Pro, like CoreUpdate
- Add support for the new cor-tabs
- Add support for title-based layouts
- Switch super user layout to the new tabs UI in prep for adding setup support
2014-12-22 15:13:23 -05:00
Joseph Schorr
107847a4bb Fix Slack notification setup to support the new slack web hook format and convert all existing data to use the new format (so we only have one code path) 2014-12-16 14:34:43 +02:00
Jake Moshenko
79b61e7709 Allow for configurable logo in the top left corner using ENTERPRISE_LOGO_URL parameter. 2014-12-12 18:25:30 -05:00
Joseph Schorr
73131e57cc Remove "Quay.io" from the team-view-add dialog 2014-12-10 00:19:56 +02:00
Joseph Schorr
bab1b183e6 Make the add member dialog in the team view more clear about email addresses 2014-12-09 23:39:08 +02:00
Jimmy Zelinskie
f3259c862b Merge branch 'koh'
Conflicts:
	auth/scopes.py
	requirements-nover.txt
	requirements.txt
	static/css/quay.css
	static/directives/namespace-selector.html
	static/js/app.js
	static/partials/manage-application.html
	templates/oauthorize.html
2014-12-01 12:30:09 -08:00
Joseph Schorr
72d613614d Merge branch 'bagger' 2014-12-01 12:48:59 -05:00
Joseph Schorr
52b7896835 Further fixes to make everything work nicely with Github Enterprise 2014-11-26 12:54:02 -05:00
Joseph Schorr
e9cac407df Add a configurable avatar system and add an internal avatar system for enterprise 2014-11-24 19:25:13 -05:00
Jimmy Zelinskie
716d7a737b Strip whitespace from ALL the things. 2014-11-24 16:07:38 -05:00
Joseph Schorr
b8e873b00b Add support to the build system for tracking if/when the build manager crashes and make sure builds are restarted within a few minutes 2014-11-21 14:27:06 -05:00
Joseph Schorr
3e79379942 - Make the OAuth config system centralized
- Add support for Github Enterprise login
2014-11-05 16:43:37 -05:00
Joseph Schorr
109850b428 Add a basic usage counter for enterprise 2014-10-28 16:33:13 -04:00
Joseph Schorr
793b6f543c Make github trigger setup a bit nicer when there are a lot of repos 2014-10-27 17:05:16 -04:00
Joseph Schorr
fb2470615b Add support for filtering based on tags, in addition to branches 2014-10-23 16:39:10 -04:00
Joseph Schorr
c3171a2690 Redo the UI for the trigger setup dialog and add the ability for github triggers to be filtered using a regex on their branch name. 2014-10-14 15:46:35 -04:00
Joseph Schorr
f38ce51943 Merge master into laffa 2014-10-07 14:03:17 -04:00
Joseph Schorr
773c9ac0ee Clarify the language around default permissions 2014-10-06 16:56:43 -04:00
Joseph Schorr
c682899861 Add a feature flag to disable user creation 2014-10-02 14:49:18 -04:00
Joseph Schorr
039d53ea6c - Fix initdb
- Add ability to specific custom fields for manual running of build triggers and add a "branch name" selector for running github builds
2014-09-30 16:29:32 -04:00
Joseph Schorr
e11c140fc8 Fix the org members logs view 2014-09-29 14:08:16 -04:00
Joseph Schorr
3a356c6aab Make sure the team add UI handles the no mailing case as well 2014-09-23 11:19:50 -04:00
Joseph Schorr
f3b03ebc34 Add a feature flag for disabling all emails 2014-09-22 19:11:48 -04:00
Joseph Schorr
05bb710830 - Add a shared AUFS utility lib and change both changes and streamlayerformat to use it
- Add UI for selecting whether to pull the tag, the repo, or the squashed tag
2014-09-18 15:56:59 -04:00
Joseph Schorr
77bf10323c Fix JS error due to merge and show a spinner in the sign in form when signing in 2014-09-16 00:23:56 -04:00
Jake Moshenko
c5ca46a14b Merge remote-tracking branch 'origin/master' into comewithmeifyouwanttowork
Conflicts:
	data/model/legacy.py
	static/js/app.js
2014-09-12 11:03:30 -04:00
Jake Moshenko
da3d58890e Slight tweak in the text of the 403 pull base image error. 2014-09-12 10:46:35 -04:00
Jake Moshenko
5388633f9a Merge remote-tracking branch 'origin/master' into pullfail 2014-09-12 10:36:38 -04:00