Commit Graph

163 Commits

Author SHA1 Message Date
Jon Lambson c01fb9d53f pulling 2017-08-28 09:18:01 -06:00
aj f057087d15 add progress 2017-08-25 23:48:14 +00:00
Jon Lambson 9d379c759c asadf 2017-08-25 16:32:12 -06:00
Jon Lambson 8dad4edde6 fix merge conflicts 2017-08-25 09:24:39 -06:00
aj 419fd60f75 chimney (burning the logs) and combo box fixes 2017-08-25 01:40:22 +00:00
Jon Lambson bc14fc15d5 clean up 2017-08-24 16:54:42 -06:00
Jon Lambson 20a25c38e3 no clue what im doing 2017-08-24 16:51:19 -06:00
aj 0d67c0d10c Merge branch 'oauth3' of git.daplie.com:Daplie/walnut_launchpad into oauth3 2017-08-24 17:26:40 +00:00
aj 65cbb5dae4 can download website 2017-08-24 17:26:29 +00:00
Jon Lambson a566dbee9b combox added 2017-08-24 11:02:31 -06:00
Jon Lambson f59cdd96a0 fixed list, need to test 2017-08-23 17:56:18 -06:00
Jon Lambson 9403f90a7d fixing merge conflicts 2017-08-23 17:40:23 -06:00
Jon Lambson 441b38edcf added better fake data 2017-08-23 17:22:01 -06:00
Jon Lambson 2dc2dcf9fe added fake array 2017-08-23 17:07:15 -06:00
aj 16f44e72ae ability to upload file (without unpacking) to arbitrary locations 2017-08-23 22:12:57 +00:00
aj 3ba63bc818 options for path, unzip, and strip-root-path 2017-08-23 20:36:19 +00:00
Jon Lambson 75b72dd97a added angular module 2017-08-23 13:26:31 -06:00
aj 37734638b8 fix some state issues 2017-08-23 18:54:50 +00:00
aj 8a4b19928a can fully verify and upload a zipped website 2017-08-23 18:42:18 +00:00
aj 0c26190e2a Merge branch 'oauth3' of git.daplie.com:Daplie/walnut_launchpad into oauth3 2017-08-22 18:38:09 +00:00
aj 75a955d063 WIP add validation 2017-08-22 18:37:57 +00:00
Jon Lambson 070192c530 clean up 2017-08-21 17:01:04 -06:00
Jon Lambson 7c2cdd7042 cleanin gpu 2017-08-21 16:06:38 -06:00
Jon Lambson 4474e23042 asdf 2017-08-21 14:28:58 -06:00
Jon Lambson 198597dc3b fixed sign out function 2017-08-21 11:55:11 -06:00
Jon Lambson 47243870e2 fixing signout 2017-08-21 11:21:00 -06:00
Jon Lambson e29085b8c2 fixed logout 2017-08-18 16:58:17 -06:00
Jon Lambson b2759252e3 fixing loginCtrl; 2017-08-18 16:17:34 -06:00
Jon Lambson 0a63695869 fixing ctrl 2017-08-18 16:14:51 -06:00
Jon Lambson 13f981a7ae added accounts page 2017-08-18 15:13:43 -06:00
aj f920f0cccd upload now works 2017-08-18 20:12:22 +00:00
aj a6f17c7105 WIP website upload 2017-08-18 19:41:38 +00:00
aj a55aac6fc1 browse multiple sessions 2017-08-16 22:35:04 +00:00
aj 1ccf0dd71c handle multiple logouts 2017-08-15 17:40:10 +00:00
aj 0c69462255 add Auth to website 2017-08-15 16:56:46 +00:00
aj 783c4bd4ff Merge branch 'oauth3' of git.daplie.com:Daplie/walnut_launchpad into oauth3 2017-08-15 16:53:40 +00:00
aj 0748880d4a add oauth3 instance to Auth 2017-08-15 16:53:10 +00:00
Jon Lambson 48d58f24f2 cleaning up 2017-08-15 10:41:12 -06:00
Jon Lambson 648a69b25c added notifications 2017-08-15 10:14:27 -06:00
Jon Lambson 390273ecae fixing routing, and changing file names 2017-08-15 09:37:37 -06:00
aj ff8d740da1 making it better 2017-08-14 23:00:01 +00:00
aj a7d93827d1 typo fix 2017-08-14 20:04:44 +00:00
aj b3c6a7c54f add oauth3 to homeController 2017-08-14 19:54:42 +00:00
aj 2e29786fa1 no caps home controller 2017-08-14 19:50:26 +00:00
aj 856413a403 add some of the website logic 2017-08-14 19:45:19 +00:00
aj fc3f6c5403 merge with master 2017-08-14 19:35:53 +00:00
aj b41f0624b8 merge with master 2017-08-14 19:34:16 +00:00
Jon Lambson e704ff8d26 added website html 2017-08-14 13:32:23 -06:00
aj 79ae23c758 return promise from auth 2017-08-14 18:59:45 +00:00
aj 0ad5017ac9 add oauth3 2017-08-14 18:58:01 +00:00
Jon Lambson b4c5d8a2a2 think i finally fixed urls 2017-08-14 12:41:55 -06:00
Jon Lambson 5455b16ec7 change 2017-08-11 21:49:18 -06:00
Jon Lambson 8b91bd4d69 fixing routes 2017-08-11 15:37:06 -06:00
Jon Lambson ac7e30a111 fixing file structure 2017-08-11 15:18:26 -06:00
Jon Lambson 8f18104029 bring over some css 2017-08-11 13:21:35 -06:00
Jon Lambson b27ba889ba fixed controllers; 2017-08-11 09:09:41 -06:00
Jon Lambson 9788e73afb redirect almost working 2017-08-10 16:33:54 -06:00
Jon Lambson 3abdf1a606 changing ui.router version 2017-08-10 11:36:59 -06:00
Jon Lambson fa5568d9cb fixing login 2017-08-09 12:41:43 -06:00
Jon Lambson de8798f01b login and save localstorage 2017-08-09 11:28:36 -06:00
Jon Lambson a6344ce60c login redirect setup 2017-08-08 22:23:19 -06:00
Jon Lambson 84db0f96b1 controllers created 2017-08-08 14:54:25 -06:00
Jon Lambson 2fab69cfdc added ui.router 2017-08-08 00:35:11 -06:00