Joseph Schorr
|
7c45aca405
|
Code review changes
|
2014-09-08 17:20:01 -04:00 |
|
Joseph Schorr
|
63628678b8
|
Instead of sending DB IDs, send "internal IDs" which are DB IDs hashed. This way, we can still calculate the ancestors without hitting the DB further, but without leaking the size of the images table
|
2014-09-08 15:02:26 -04:00 |
|
Joseph Schorr
|
dd4037e324
|
Allow github trigger setup folder paths to be specified even if a Dockerfile is not found
|
2014-09-08 12:17:00 -04:00 |
|
Joseph Schorr
|
9eccdb7696
|
Fix NPE
|
2014-09-08 12:00:20 -04:00 |
|
Jake Moshenko
|
64480fd4ed
|
Merge remote-tracking branch 'origin/master' into yellowalert
Conflicts:
data/migrations/versions/82297d834ad_add_us_west_location.py
test/data/test.db
|
2014-09-05 11:30:30 -04:00 |
|
Jake Moshenko
|
3c57e612b3
|
Merge remote-tracking branch 'origin/zegooglesdosomething'
|
2014-09-04 20:10:16 -04:00 |
|
Joseph Schorr
|
4e04ad5ca7
|
Move the password check before we hide the modal
|
2014-09-04 20:05:21 -04:00 |
|
Joseph Schorr
|
f746eb3381
|
Make the fresh login dialog autofocus the input and make it handle the enter key properly.
|
2014-09-04 20:04:49 -04:00 |
|
Joseph Schorr
|
e028d4ae0a
|
Merge master into branch
|
2014-09-04 18:08:18 -04:00 |
|
Joseph Schorr
|
e783df31e0
|
Add the concept of require_fresh_login to both the backend and frontend. Sensitive methods will now be marked with the annotation, which requires that the user has performed a login within 10 minutes or they are asked to do so in the UI before running the operation again.
|
2014-09-04 14:24:20 -04:00 |
|
Joseph Schorr
|
1e7e012b92
|
Add a requirement for the current password to change the user's password or email address
|
2014-09-03 15:41:25 -04:00 |
|
Joseph Schorr
|
6c60e078fc
|
Fix NPE
|
2014-09-03 15:35:29 -04:00 |
|
Jake Moshenko
|
58b244ca8c
|
Merge remote-tracking branch 'origin/master' into whogoesthere
|
2014-09-03 12:34:07 -04:00 |
|
Joseph Schorr
|
232e3cc1da
|
Move cancelInterval into its own method to remove code duplication
|
2014-09-03 12:10:36 -04:00 |
|
Joseph Schorr
|
53939f596d
|
Properly escape the $ in $token for the auth dialog command
|
2014-09-02 16:45:25 -04:00 |
|
Joseph Schorr
|
2cfab6e252
|
Reshow the sign in button when the username is changed
|
2014-09-02 15:28:56 -04:00 |
|
Joseph Schorr
|
066b3ed8f0
|
Add client side handling of user login throttling
|
2014-09-02 14:26:35 -04:00 |
|
Joseph Schorr
|
07c7cdd51d
|
Fix PingService when loading results from cache
|
2014-08-29 16:25:11 -04:00 |
|
Joseph Schorr
|
417fec0b68
|
Fix namespace selector bug from the landing page and make the namespace selector update the URL if need be
|
2014-08-29 15:46:43 -04:00 |
|
Joseph Schorr
|
d1b2ff588a
|
Add a spinner when a tag is being deleted
|
2014-08-29 14:00:07 -04:00 |
|
Joseph Schorr
|
584f6b9635
|
Add a spinner when a tag is being deleted
|
2014-08-29 13:59:54 -04:00 |
|
Joseph Schorr
|
4a2a4d1b4c
|
Add email invite support
|
2014-08-28 23:46:27 -04:00 |
|
Joseph Schorr
|
3b72b26836
|
Merge branch 'master' into comewithmeifyouwanttowork
|
2014-08-28 20:50:13 -04:00 |
|
Joseph Schorr
|
ae92098b23
|
Add invite by email (WIP)
|
2014-08-28 20:49:11 -04:00 |
|
Joseph Schorr
|
f15b3f345e
|
Review updates
|
2014-08-28 19:07:22 -04:00 |
|
Joseph Schorr
|
7014e0b662
|
Fix hipchat icon
|
2014-08-28 16:14:19 -04:00 |
|
Joseph Schorr
|
5028172c51
|
Fix Stripe dialog in IE and mobile safari
|
2014-08-28 16:10:06 -04:00 |
|
Joseph Schorr
|
97aa2c5aaa
|
Make sure the regen confirm dialog result is actually used :-/
|
2014-08-27 13:04:31 -04:00 |
|
Joseph Schorr
|
6ec89bb179
|
Add Slack notification support
|
2014-08-26 22:09:56 -04:00 |
|
Joseph Schorr
|
d76d4704a0
|
Add pagination to the notifications API and make the UI only show a maximum of 5 notifications (beyond that, it shows "5+").
|
2014-08-26 15:19:39 -04:00 |
|
Joseph Schorr
|
a129aac94b
|
Add ability to regenerate robot account credentials
|
2014-08-25 17:19:23 -04:00 |
|
Joseph Schorr
|
837630359c
|
Really fix ZeroClipboard
|
2014-08-25 15:59:50 -04:00 |
|
Joseph Schorr
|
4b2a0b5063
|
Fix ZeroClipboard path for the new version
|
2014-08-25 15:33:48 -04:00 |
|
Joseph Schorr
|
99d75bede7
|
Handle error cases better for external services
|
2014-08-25 15:30:29 -04:00 |
|
Joseph Schorr
|
ee3ad9e7c3
|
Enable invoice views on all plans
|
2014-08-22 19:48:58 -04:00 |
|
Joseph Schorr
|
4140e115e5
|
Put building behind a feature flag
|
2014-08-22 18:03:22 -04:00 |
|
Joseph Schorr
|
34c6d7f5b4
|
Change the auth dialog to copy a full docker login command
|
2014-08-22 16:54:53 -04:00 |
|
Joseph Schorr
|
2a3094cfde
|
- Fix zero clipboard integration to properly hide the clipboard controls when flash is not available.
- Hide the download .dockercfg link in Safari, since it doesn't work there anyway
|
2014-08-22 15:24:56 -04:00 |
|
Joseph Schorr
|
d2880807b2
|
- Further fixes for license stuff
- Small fixes to ensure Quay works for Postgres
|
2014-08-21 19:21:20 -04:00 |
|
Joseph Schorr
|
32ea1d194f
|
Add support for the Hipchat room notification API
|
2014-08-19 17:40:36 -04:00 |
|
Joseph Schorr
|
35bd28a77e
|
Add support for the Flowdock Team chat API: https://www.flowdock.com/api/push
|
2014-08-19 14:33:33 -04:00 |
|
Joseph Schorr
|
daa43c3bb9
|
Add better messaging around pulling of base images when they fail due to invalid or missing credentials
|
2014-08-18 20:34:39 -04:00 |
|
Joseph Schorr
|
c4a27b2c7a
|
Add a unified error display method to make the code cleaner. Also fixes a UI issue in create org
|
2014-08-18 18:21:53 -04:00 |
|
Joseph Schorr
|
43b6695f9c
|
Get team invite confirmation working and fully tested
|
2014-08-18 17:24:00 -04:00 |
|
Joseph Schorr
|
9c560e8d7f
|
Fix possible NPE
|
2014-08-18 13:30:47 -04:00 |
|
Joseph Schorr
|
eefb7e1ec9
|
Add notification actions support
|
2014-08-15 21:56:29 -04:00 |
|
Joseph Schorr
|
c026782abb
|
Add new log event metadata
|
2014-08-15 21:25:41 -04:00 |
|
Joseph Schorr
|
de8bd4a92e
|
ng-include was breaking things, so we create a new ng-if to match based on media queries
|
2014-08-15 21:09:02 -04:00 |
|
Joseph Schorr
|
9a402ab0b1
|
Make the new team view UI to be properly reactive to the screen size
|
2014-08-15 21:00:12 -04:00 |
|
Joseph Schorr
|
7d7cca39cc
|
New team view interface
|
2014-08-15 20:51:31 -04:00 |
|
Joseph Schorr
|
8681dd9cb9
|
Add a new exposed 'unpacking' phase to the build and make sure that the unzip/untar/etc always occurs under a try-except
|
2014-08-15 17:58:11 -04:00 |
|
Joseph Schorr
|
56d7a3524d
|
Work in progress: Require invite acceptance to join an org
|
2014-08-15 17:47:43 -04:00 |
|
Joseph Schorr
|
f6f857eec2
|
Add US West region
|
2014-08-15 15:02:26 -04:00 |
|
Joseph Schorr
|
d1f6a815bd
|
Switch the ping view on the view repo page to always use HTTPS
|
2014-08-13 18:48:24 -04:00 |
|
Joseph Schorr
|
61bde6bb90
|
Fix tag-specific-image-view when moving a tag within its own ancestor path
|
2014-08-13 18:47:07 -04:00 |
|
Joseph Schorr
|
e7daca5d95
|
Add better messaging and UI around repos and images that are currently being pushed
|
2014-08-13 17:54:15 -04:00 |
|
Joseph Schorr
|
27c2680380
|
Plan update and fix about page
|
2014-08-13 14:25:48 -04:00 |
|
Joseph Schorr
|
087fa2a3bf
|
Remove unneeded UI in enterprise landing
|
2014-08-12 22:29:05 -04:00 |
|
Joseph Schorr
|
bb7d73cf71
|
Update the "About Us"
|
2014-08-12 21:18:32 -04:00 |
|
Joseph Schorr
|
80707d71d0
|
Minor UI fix and better logging when license cannot be found
|
2014-08-12 21:04:16 -04:00 |
|
Joseph Schorr
|
0fa2065f17
|
Update the screenshots once more
|
2014-08-12 17:18:13 -04:00 |
|
Joseph Schorr
|
fc8988baa3
|
Remove the extra white bar when logged in on the landing page
|
2014-08-12 17:15:46 -04:00 |
|
Joseph Schorr
|
6517a4ed7f
|
Tweak the Angular view array threshold to make it slightly slower but better for the UI thread
|
2014-08-12 17:09:51 -04:00 |
|
Joseph Schorr
|
456834d535
|
Further small UI fixes
|
2014-08-12 17:08:16 -04:00 |
|
Joseph Schorr
|
f3f4d06328
|
- Add text for the new CoreOS registry stuff to the plans page and the tour page
- Regenerate the screenshots
|
2014-08-12 15:17:48 -04:00 |
|
Joseph Schorr
|
8db889e2d4
|
Prevent the logs view table from normally growing too large
|
2014-08-12 14:30:59 -04:00 |
|
Joseph Schorr
|
ab68126d8a
|
Initial work in restyling Quay to be more like CoreOS styles
|
2014-08-11 21:47:04 -04:00 |
|
Joseph Schorr
|
389c88a7c4
|
Update federated login to store metadata and have the UI pull the information from the metadata
|
2014-08-11 18:25:01 -04:00 |
|
Joseph Schorr
|
2597bcef3f
|
Add support for login with Google. Note that this CL is not complete
|
2014-08-11 15:47:44 -04:00 |
|
Joseph Schorr
|
b9c6c4c2f2
|
Add missing kind of notification
|
2014-08-10 18:51:06 -04:00 |
|
Joseph Schorr
|
6f804c222a
|
Replace references seen in the enterprise version to "Quay.io" with a config-pulled value
|
2014-08-08 13:50:04 -04:00 |
|
Jake Moshenko
|
5aaa2163cb
|
Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
|
2014-08-06 16:18:31 -04:00 |
|
Joseph Schorr
|
09286d6234
|
Make the setup trigger dialog more clear on what the pull credentials actually mean
|
2014-08-06 16:01:19 -04:00 |
|
Joseph Schorr
|
d1c9108570
|
Fix setup trigger dialog to handle the case where the FROM image has a public base
|
2014-08-06 15:42:26 -04:00 |
|
Joseph Schorr
|
05a1413153
|
Handle UI for dangerous scopes
|
2014-08-05 21:21:22 -04:00 |
|
Joseph Schorr
|
b8979c0499
|
Be more resistant to invalid notification kinds
|
2014-08-05 18:20:04 -04:00 |
|
Joseph Schorr
|
eee6a38c5f
|
Auto-focus the tag name field in the add tag dialog
|
2014-08-05 18:16:30 -04:00 |
|
Joseph Schorr
|
7e8713171e
|
- Change updated_tags into the expected dict, not a list
- Update the event code on both sides to expect the dict
- Add filter support to the string builder
|
2014-08-05 17:45:40 -04:00 |
|
Jake Moshenko
|
0372013f70
|
Merge remote-tracking branch 'origin/redalert'
Conflicts:
app.py
|
2014-08-04 16:56:34 -04:00 |
|
Joseph Schorr
|
af32b53a4e
|
Fix create token form in the repo-admin view. We had to add type="button" to the delete-ui button so that clicking it doesn't submit the form (and keep the focus there)
|
2014-07-29 18:53:23 -04:00 |
|
Joseph Schorr
|
a2f0f57414
|
- Small title fix
- Make sure sample event data uses the real event data generation code
|
2014-07-29 13:39:26 -04:00 |
|
Joseph Schorr
|
32b2ecdfa6
|
Add ability to dismiss notifications
|
2014-07-28 18:23:46 -04:00 |
|
Joseph Schorr
|
34fc279092
|
Add e-mail authorization to the repository notification flow. Also validates the creation of the other notification methods.
|
2014-07-28 14:58:12 -04:00 |
|
Joseph Schorr
|
54ee94754e
|
- Add support for orgs in the entity search and the notification system
- Fix the titles/names of the different notification types
- Fix the styling of the options buttons on the notifications
|
2014-07-22 13:39:41 -04:00 |
|
Joseph Schorr
|
1ffbc77106
|
Make the web hook documentation link in the create dialog a bit smarter
|
2014-07-18 17:00:12 -04:00 |
|
Joseph Schorr
|
a5d9a2aee1
|
- Fix getting started links
- Add a link in the notifications menu for web hook documentation
|
2014-07-18 16:57:46 -04:00 |
|
Joseph Schorr
|
d5d9cb7a45
|
UI improvements to entity-search and the create-external-notification-dialog
|
2014-07-18 16:51:05 -04:00 |
|
Joseph Schorr
|
591cd020b8
|
Merge branch 'master' into redalert
|
2014-07-18 15:58:56 -04:00 |
|
Joseph Schorr
|
af31bde997
|
Add support for the remaining events to the frontend and the backend
|
2014-07-18 15:58:18 -04:00 |
|
Joseph Schorr
|
f7c154abb5
|
Get Quay notification support working in the notification methods
|
2014-07-18 14:12:20 -04:00 |
|
Joseph Schorr
|
3865e3b1b7
|
Refactor the entity-search directive/control to make its interface much cleaner and to add support for ng-model validity checking
|
2014-07-18 13:45:08 -04:00 |
|
Joseph Schorr
|
397af2ffc9
|
Fix tooltip in tag-specific-images-view to properly bind
|
2014-07-17 23:03:22 -04:00 |
|
Joseph Schorr
|
afebb7780d
|
Add an NPE check to lookup up a tag's image's ancestors
|
2014-07-17 23:02:18 -04:00 |
|
Joseph Schorr
|
566fda9351
|
Add an NPE check to loadImageChanges
|
2014-07-17 23:00:25 -04:00 |
|
Joseph Schorr
|
fc384b20a6
|
Fix missing change to code handling tags and images
|
2014-07-17 22:59:17 -04:00 |
|
Joseph Schorr
|
8d7493cb86
|
Convert over to notifications system. Note this is incomplete
|
2014-07-17 22:51:58 -04:00 |
|
Joseph Schorr
|
a45054bf2e
|
Change tag_view to avoid a DB lookup and only return the tag's image ID. We map the ID in the frontend based on the image data returned
|
2014-07-17 15:16:22 -04:00 |
|
Joseph Schorr
|
126371f8a1
|
Fix non-library Dockerhub links
|
2014-07-17 14:36:06 -04:00 |
|
Joseph Schorr
|
de8e898ad0
|
Add UI for managing repo notifications
|
2014-07-17 13:32:39 -04:00 |
|
Joseph Schorr
|
85ce3c6bb2
|
Remove the HTML escaping in the dockerfile-view directive; the text escaping is handled by the nested controls and Angular itself
|
2014-07-16 16:47:59 -04:00 |
|
Joseph Schorr
|
06350fb9ae
|
Add a list of licenses we use for the JS libs
|
2014-07-16 14:45:20 -04:00 |
|
Joseph Schorr
|
7ff1a9bdd9
|
Add a much smaller optimized version of the landing background image
|
2014-07-15 16:19:20 -04:00 |
|
Joseph Schorr
|
8502b590a3
|
The "visible" attribute name is getting removed by the grunt angular lib; rename it to fix the problem temporarily and filed a bug: https://github.com/ericclemmons/grunt-angular-templates/issues/97
|
2014-07-15 14:17:57 -04:00 |
|
Joseph Schorr
|
c9a33c60b2
|
Make sure the applications array is defined so that a new app can be created even before the existing list has loaded
|
2014-07-15 11:57:46 -04:00 |
|
Joseph Schorr
|
4abd1e8a9d
|
Add missing $scope to the on error callback
|
2014-07-14 17:24:25 -04:00 |
|
Joseph Schorr
|
a1755cfbf7
|
Fix linking to Docker Registry since their own redirects are messed up
|
2014-07-14 16:34:21 -04:00 |
|
Joseph Schorr
|
18ec8c0f93
|
Make build package UI a bit nicer and make sure it always executes via a scope apply
|
2014-07-14 16:33:00 -04:00 |
|
Joseph Schorr
|
75ec80ee6c
|
Fix TAR parsing by using a custom lib written based off of a public lib
|
2014-07-14 16:26:20 -04:00 |
|
Joseph Schorr
|
bebb02c800
|
Make sure all scope applies occur outside of the main digest loop
|
2014-07-10 16:38:41 -04:00 |
|
Joseph Schorr
|
c7cc3f72f8
|
- Fix error messages in new org creation
- Add the org name regex to the name field
|
2014-07-09 13:35:59 -04:00 |
|
Joseph Schorr
|
edf23e8b87
|
Fix CSS for the new repo box in Firefox
|
2014-07-09 13:31:53 -04:00 |
|
Joseph Schorr
|
cfba651495
|
Fix logo on enterprise landing page
|
2014-07-07 19:10:35 -04:00 |
|
Joseph Schorr
|
ff4efa481a
|
Match the create button style on the landing page to the other headings
|
2014-07-07 17:12:55 -04:00 |
|
Joseph Schorr
|
13de458320
|
Merge branch 'master' of https://bitbucket.org/yackob03/quay
|
2014-07-07 16:12:59 -04:00 |
|
Joseph Schorr
|
bcc45448ed
|
- Change logo on non-landing to be just the box and to have a slight border on the right
- Change the letter spacing on the landing page to make the header more readable
- Change the logo on the 500 page
|
2014-07-07 16:12:53 -04:00 |
|
Jake Moshenko
|
b9656185b9
|
Switch to the new logo for the favicon.
|
2014-07-07 16:01:47 -04:00 |
|
Jake Moshenko
|
c338b7d621
|
Merge remote-tracking branch 'origin/touchdown'
Conflicts:
static/css/quay.css
static/js/controllers.js
test/data/test.db
|
2014-07-07 15:33:51 -04:00 |
|
Joseph Schorr
|
64fe29698c
|
Add a PingService and make sure we use the average of at least three pings
|
2014-07-03 17:55:53 -04:00 |
|
Jake Moshenko
|
e68d6a7302
|
Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
|
2014-06-27 19:18:35 -04:00 |
|
Jake Moshenko
|
4e5e8a08de
|
Add a maintenance notification kind and make it of the level warning.
|
2014-06-27 19:18:27 -04:00 |
|
Joseph Schorr
|
6a57af092c
|
Make the solutions link to the proper area in the docs
|
2014-06-26 20:46:32 -04:00 |
|
Joseph Schorr
|
e3b939b42f
|
Switch styling and logo over to the new Quay logo
|
2014-06-26 20:45:41 -04:00 |
|
Joseph Schorr
|
ee0d483efd
|
Fix "Run Build Again" to send the tags to which we should push.
|
2014-06-26 19:55:16 -04:00 |
|
Joseph Schorr
|
76165b5d2b
|
Add API and UI support for displaying image locations
|
2014-06-24 18:48:42 -04:00 |
|
Joseph Schorr
|
2bf12996f5
|
Fix the case where someone tries the tour with an unsupported browser
|
2014-06-16 14:05:27 -04:00 |
|
Joseph Schorr
|
257b66fa2a
|
Make sure the repo exists when setting a tag
|
2014-06-10 14:43:52 -04:00 |
|
Joseph Schorr
|
bbb48b1235
|
Handle the case where the plans do not load correctly.
|
2014-06-04 16:27:45 -04:00 |
|
Joseph Schorr
|
4282977e90
|
Check on the builds array; it may not be present if the page has changed or the builds have not yet loaded
|
2014-06-04 16:08:26 -04:00 |
|
Joseph Schorr
|
8a374b1c34
|
- Fix landing page for enterprise
- Fix tour and tour content for enterprise
|
2014-06-03 14:09:38 -04:00 |
|
Joseph Schorr
|
c630d7e948
|
Merge branch 'master' into touchdown
Conflicts:
static/js/app.js
static/partials/organizations.html
test/data/test.db
|
2014-06-03 13:22:26 -04:00 |
|
Jake Moshenko
|
36435d38e3
|
Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
|
2014-06-02 15:00:12 -04:00 |
|
Joseph Schorr
|
59724f5ccb
|
Fix tooltip of the create repository icon
|
2014-06-02 14:37:29 -04:00 |
|
Jake Moshenko
|
a6fb64005d
|
Disable the other convert to organization button when using LDAP login.
|
2014-05-30 18:28:47 -04:00 |
|
Jake Moshenko
|
0057ced98c
|
Move GitHub build trigger behind a feature flag.
|
2014-05-30 18:28:18 -04:00 |
|
Jake Moshenko
|
8e6328a5f0
|
Merge branch 'driversed' of ssh://bitbucket.org/yackob03/quay into driversed
|
2014-05-29 11:24:44 -04:00 |
|
Jake Moshenko
|
0ba4201020
|
Add a module which will create notifications for all users when the license is at its expiration period, and terminate the process when the license expires.
|
2014-05-29 11:24:10 -04:00 |
|
Joseph Schorr
|
69be86be97
|
Add extra seat check in the user API call and turn off user->org conversion when authentication is LDAP
|
2014-05-28 15:53:53 -04:00 |
|
Joseph Schorr
|
205362bc7b
|
Add UI for handling the case when an enterprise has reached its maximum seat count
|
2014-05-28 15:22:36 -04:00 |
|
Joseph Schorr
|
404055decc
|
Make sure we always have a valid container element before calculating the dimensions of the various charts
|
2014-05-27 12:38:18 -04:00 |
|
Joseph Schorr
|
a9a8105fbc
|
Add credit card expiration date to the billing info screen
|
2014-05-22 16:52:51 -04:00 |
|
Joseph Schorr
|
d209929133
|
Make sure the scroll is at the top of the page on every route change
|
2014-05-21 15:28:38 -04:00 |
|
Joseph Schorr
|
e81d0a0514
|
Merge branch 'touchdown' of https://bitbucket.org/yackob03/quay into touchdown
|
2014-05-21 15:03:50 -04:00 |
|
Joseph Schorr
|
4c20e6bf62
|
Make sure namespaces in the drop down are always black
|
2014-05-21 15:03:06 -04:00 |
|
Jake Moshenko
|
8338d25c37
|
Merge branch 'touchdown' of ssh://bitbucket.org/yackob03/quay into touchdown
|
2014-05-21 14:57:34 -04:00 |
|
Joseph Schorr
|
60328e0b43
|
Add a testimonial to the features tour page
|
2014-05-21 14:56:43 -04:00 |
|
Jake Moshenko
|
ab75be3800
|
Merge branch 'master' into touchdown
|
2014-05-21 14:54:33 -04:00 |
|
Jake Moshenko
|
512a17363f
|
Update the screenshots.
|
2014-05-21 14:54:07 -04:00 |
|
Joseph Schorr
|
ea8f5ba59e
|
Add testimonial to the org tour page
|
2014-05-21 14:53:45 -04:00 |
|
Joseph Schorr
|
8117c5ead9
|
- Always show the tour link in the header
- Have organizations link to the tour when a user is not part of an org
|
2014-05-21 14:45:54 -04:00 |
|
Jake Moshenko
|
8c3448080c
|
Merge remote-tracking branch 'origin/master' into touchdown
Conflicts:
test/data/test.db
|
2014-05-21 14:43:57 -04:00 |
|