Commit graph

1054 commits

Author SHA1 Message Date
Joseph Schorr
61dcf86d2a Fix NPE 2015-05-06 18:22:42 -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
df596edaac Fix property access issue 2015-05-05 12:19:56 -07:00
Joseph Schorr
7789e99b99 Fix another bug in user conversion 2015-05-05 11:59:31 -07:00
Joseph Schorr
3818593717 Add missing services 2015-05-05 09:38:35 -07:00
Joseph Schorr
0334d3a31a Fix NPE 2015-05-05 09:37:19 -07:00
Joseph Schorr
251a843d21 Add missing lib 2015-05-05 09:36:23 -07:00
Joseph Schorr
783beb91eb Fix another NPE 2015-05-04 09:29:56 -07:00
Joseph Schorr
70cc895b95 Fix JS NPEs 2015-05-04 09:17:58 -07:00
Joseph Schorr
e81acf7a71 Remove cookie check for the new layout 2015-05-03 18:36:06 -07:00
Joseph Schorr
835a4aeb9c Fix getDescription for logs view 2015-05-03 17:57:00 -07:00
Joseph Schorr
2a321ed920 Make sure to copy over the repository url 2015-05-03 17:45:50 -07:00
Joseph Schorr
65bce31d96 Enable new layout everywhere and fix SCM icons 2015-05-03 16:54:27 -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
0b990677a0 More code cleanup and fix bug around can_admin in the trigger_view 2015-05-03 11:02:05 -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
3ac884beb4 gitlab oauth 2015-05-02 17:54:48 -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
6673d90818 Fix builds tab to reload if a new build comes in 2015-04-30 13:01:40 -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
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
a507d7d5c6 Fix over usage notification to point to the new billing tabs 2015-04-27 14:38:12 -04:00
Joseph Schorr
4834dbd7c9 Add confirmation for deleting a robot 2015-04-27 14:19:50 -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
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
864bedf79b Make sure to support capital letters in the commit sha 2015-04-23 15:24:41 -04:00
Joseph Schorr
7b5c238572 Fix typo 2015-04-23 14:52:08 -04:00
Joseph Schorr
407bd0cd72 Make the image history tree more resistant to odd structures 2015-04-23 14:44:08 -04:00
Joseph Schorr
4dff6557ae Fix create robot and create team in the new layout "new" header button 2015-04-23 14:40:01 -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
67c70860c5 Add rocket fetch command to the fetch tag dialog 2015-04-23 12:18:54 -04:00
Jimmy Zelinskie
07b730c7ad generic trigger credentials 2015-04-22 17:07:16 -04:00
Joseph Schorr
75e32ad700 Fix tabs handling in the old layout. These shims are temporary. 2015-04-22 15:58:05 -04:00
Joseph Schorr
ee9d6ae66a Have entity reference link to the new user and org pages for showing robots 2015-04-22 15:26:01 -04:00
Joseph Schorr
d6a1493d52 Fix build logs on Safari by having the client JS handle the redirect manually, rather than the browser itself; Safari doesn't support 302 redirects to another domain inside an XHR. 2015-04-22 15:16:59 -04:00
Joseph Schorr
2128e39d77 Be more efficient when polling for build status in the repo view 2015-04-22 13:33:20 -04:00
Joseph Schorr
9f3395ada1 Fix docker file build form to read the files from its local uploader, rather than just the first one it finds 2015-04-22 13:22:09 -04:00
Jimmy Zelinskie
9703850e8f enforce short SHAs throughout build pipeline 2015-04-22 13:22:04 -04:00
Joseph Schorr
31389b9974 Fix CPU issues by removing constant digesting. We do so by:
- Fixing the title and description (meta) to only respond to a rootScope watch, rather than using a timer
  - Change the tabs listening code to be completely self contained
2015-04-22 13:16:10 -04:00
Jimmy Zelinskie
02498d72ba almost all PR discussion fixes 2015-04-21 18:04:25 -04:00
Joseph Schorr
70d5200858 JS scoping sucks sometimes 2015-04-21 16:21:26 -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
4d42431481 Redo manage application page 2015-04-21 15:39:11 -04:00
Joseph Schorr
48a8a8e65c Make tabs auto-close on mobile 2015-04-21 15:09:52 -04:00
Joseph Schorr
765492e882 Only disable tooltips themselves, not the entire provider 2015-04-21 15:06:12 -04:00
Joseph Schorr
dfc2b562e7 Disable tooltips on mobile, as they add an extra click that isn't really useful and is highly annoying 2015-04-21 14:56:48 -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
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
d714c00ddb Fix NPE 2015-04-20 12:01:17 -04:00
Joseph Schorr
a500477bbc Fix NPE 2015-04-20 12:00:26 -04:00
Jimmy Zelinskie
93cd459460 Merge branch 'master' into git 2015-04-20 10:58:49 -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
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
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
20b399318e Fix off by one issue 2015-04-15 16:11:04 -04:00
Joseph Schorr
0533130de3 Fix NPE 2015-04-15 15:23:50 -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
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
0f49beaaa8 Hide the squashed tag fetch when the user is not an admin on the repository 2015-04-08 15:49:32 -04:00
Joseph Schorr
b1cf180ab0 auto-select the first result in the search 2015-04-08 15:42:19 -04:00
Joseph Schorr
19e25ac340 Merge branch 'master' into bing 2015-04-08 15:23:36 -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
4ceb68d568 trigger-setup: set config to activated config 2015-04-06 16:30:42 -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
2ece1170a1 Update create organization page UI 2015-04-06 13:52:38 -04:00
Joseph Schorr
85cff9bd9d Slightly updated new repo view 2015-04-06 12:45:12 -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
Jimmy Zelinskie
1b953c8cd6 custom trigger: remove subdir rewrite 2015-04-03 17:20:31 -04:00
Jimmy Zelinskie
92a7e843fc trigger-service: rm branch run param 2015-04-03 17:20:30 -04:00
Jimmy Zelinskie
77ae613833 css: fix internalerror text color 2015-04-03 17:20:25 -04:00
Joseph Schorr
4cb7921c3a Make sure to show public repos on the user and orgs pages 2015-04-03 14:55:09 -04:00
Joseph Schorr
2d8237bd83 Fix avatar in the user view 2015-04-03 12:34:52 -04:00
Joseph Schorr
094f91fb8b Fix the tutorial's user events 2015-04-03 12:13:33 -04:00
Joseph Schorr
f67eeee8c8 Start conversion of the user admin/view 2015-04-02 16:34:41 -04:00
Joseph Schorr
bcd8a48159 Make sure to redraw the tree in the old repo view. Patches an issue where the tree won't show up sometimes 2015-04-02 11:37:30 -04:00
Joseph Schorr
e4fc18cbed Make the experiment reload the page automatically 2015-04-01 15:06:30 -04:00
Joseph Schorr
c31eea8f79 Restyle the billing invoices tab 2015-04-01 15:04:01 -04:00
Jimmy Zelinskie
5860721a9a trigger-service: manual trigger commit sha -> commit 2015-04-01 14:33:21 -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
Jimmy Zelinskie
818b76d825 custom trigger: rewrite / subdir to empty string 2015-04-01 14:12:20 -04: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
4e097c1f9d custom trigger: build trigger config 2015-04-01 13:31:51 -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
bb81c05c03 Add the new team view page 2015-03-31 15:58:23 -04:00
Joseph Schorr
24b9fe5e48 Fix tabs in the repo view 2015-03-31 14:40:34 -04:00
Joseph Schorr
805af1c0c0 Fix change org email tab 2015-03-30 18:44:23 -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
Jimmy Zelinskie
fba61d96dc callbacks: add proper custom git callback 2015-03-27 11:22:07 -04:00
Jimmy Zelinskie
998c6007cd trigger: initial custom git trigger 2015-03-26 16:20:53 -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
2459b6b467 Start on new org view 2015-03-25 15:31:05 -04:00
Joseph Schorr
a7a8571396 Fix width of the image history tree 2015-03-24 19:48:43 -04:00
Joseph Schorr
0d98776d54 Fix NPE and other small issues with the new image view 2015-03-24 19:28:24 -04:00
Joseph Schorr
2baa7fa14c Fix bug in the view array service 2015-03-24 16:43:44 -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
1ed814a469 Better filtering of repo builds 2015-03-23 15:44:17 -04:00
Joseph Schorr
85d6500daa Merge resistanceisfutile into master 2015-03-23 15:39:08 -04:00
Joseph Schorr
3f4801ea7e Switch the squashed image icon 2015-03-23 15:23:34 -04:00
Joseph Schorr
8042f1a985 - Finished new image view
- Add the CoreOS icon font
2015-03-23 15:22:22 -04:00
Joseph Schorr
049148cb87 Work in progress: new image view 2015-03-20 17:46:02 -04:00
Jimmy Zelinskie
f6f93e9079 consolidate everything into one GitHub trigger 2015-03-19 17:12:27 -04:00
Joseph Schorr
3959ea2ff9 Add ability to add/move a tag in the tag view 2015-03-19 15:23:34 -04:00
Jimmy Zelinskie
80ae3fd310 trigger-service: specific callback URLs for GH-git 2015-03-19 15:13:03 -04:00
Joseph Schorr
70aec00914 Add a fetch tag dialog 2015-03-19 15:08:18 -04:00
Jimmy Zelinskie
9c3655dc17 trigger-service: copy missing fields 2015-03-19 14:32:30 -04:00
Jimmy Zelinskie
5a29218c5c Merge branch 'master' into git 2015-03-19 12:10:34 -04:00
Jimmy Zelinskie
8b4af56b4a trigger-service: add github-git service 2015-03-19 12:06:58 -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
9254cda0db Fix NPE 2015-03-18 13:43:57 -04:00
Joseph Schorr
638ba39f7f Limit to 3 builds on the info panel 2015-03-18 12:14:30 -04:00
Joseph Schorr
e58144eec5 Add selection of images by railroad track 2015-03-18 12:06:47 -04:00
Joseph Schorr
e0f11f46e5 Fix since filter on the builds list 2015-03-18 11:59:22 -04:00
Joseph Schorr
3cd867b3ab Fix build view when job_config is missing 2015-03-17 16:56:21 -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
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
dc5d40ddc3 Start work on the repo permissions table 2015-03-16 14:17:27 -04:00
Joseph Schorr
958caa6fc7 Make sure we use the single-tag deletion path if only a single tag is selected 2015-03-13 15:39:14 -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
a18148b058 Get full actions working in the repo changes tab 2015-03-11 17:46:50 -07:00
Joseph Schorr
c4620a66a3 Reenable build polling 2015-03-10 17:27:19 -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
d963bf7159 Fix title handling 2015-03-06 14:23:33 -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
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
6b9258ef67 Better loading state for the repo-list page 2015-03-05 16:17:18 -05:00
Joseph Schorr
e674b2974c Fix JS minimization errors 2015-03-05 16:06:35 -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
2e840654d3 PR changes 2015-03-05 12:07:39 -05:00
Joseph Schorr
785de61c59 Start on updated repo list view 2015-03-05 12:00:36 -05:00
Joseph Schorr
b9e2863c94 Merge branch 'pagesnew' of github.com:coreos-inc/quay into pagesnew 2015-03-04 17:23:05 -05:00
Joseph Schorr
9ccd26cc74 Remove console log 2015-03-04 16:02:26 -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
Jimmy Zelinskie
e48b8b2cbf repo-list: deduplicate repos as they load 2015-03-02 13:28:38 -05:00
Joseph Schorr
07a921c92c Get dynamic title support working 2015-02-27 17:22:47 -05:00
Joseph Schorr
7460541c89 Work In Progress: Dynamic titles and descriptions 2015-02-27 16:52:56 -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
Jimmy Zelinskie
d4884d47b4 repo-list: dedupe repos 2015-02-26 13:58:29 -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
Jimmy Zelinskie
6e1877084d repo list: generic refresh stars function 2015-02-25 16:19:54 -05:00
Jimmy Zelinskie
fb0d3d69c2 changes to reflect PR comments (not finished) 2015-02-24 17:50:54 -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
45bb05894b Fix JS NPE 2015-02-24 15:42:31 -05:00
Joseph Schorr
13e362a1df JS NPE fix 2015-02-24 13:37:02 -05:00
Jimmy Zelinskie
498d0af6a4 directives: add optional placeholder for markdown 2015-02-23 16:43:59 -05:00
Jimmy Zelinskie
6bff3449aa js: continue merging pagesnew 2015-02-23 15:22:41 -05:00
Jimmy Zelinskie
3dbaafbd60 Merge branch 'pagesnew' into star 2015-02-23 15:07:49 -05:00
Joseph Schorr
5cc1c90021 Remove unused param 2015-02-23 14:55:55 -05:00
Joseph Schorr
83d25d8c2b Add a page for toggling the cookie used for the new layout experiment 2015-02-23 14:48:33 -05:00
Joseph Schorr
b66551ec48 Add titles and descriptions to the pages 2015-02-23 14:23:54 -05:00
Joseph Schorr
078f9c206f Add back in the about and security pages 2015-02-23 11:51:07 -05:00
Joseph Schorr
d6d11644d8 Move all controllers into page definitions and add support for layout profiles 2015-02-20 18:15:48 -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
89eb5bdcc5 Merge branch 'quark' 2015-02-18 15:59:36 -05:00
Jake Moshenko
2dd03f1bed Merge remote-tracking branch 'origin/master' into rockyhorror
Conflicts:
	test/data/test.db
2015-02-18 10:56:01 -05:00