Commit Graph

551 Commits

Author SHA1 Message Date
53cda8ce2b Merge pull request #374 from jorilallo/jori/colorpicker
Color picker
2017-10-31 22:04:09 -07:00
980ad792c5 addressed comments 2017-10-31 21:55:46 -07:00
c9fc880137 include user id in the uploads path 2017-10-30 22:35:30 -07:00
27fd10f2a6 Prefix s3 user uploads with uploads/ 2017-10-29 23:52:09 -07:00
e70a8c2495 color editing 2017-10-29 23:23:16 -07:00
84c82c31a9 Shared assets, cleanup for initial deploy 2017-10-29 15:02:24 -07:00
e370676b49 Homepage skeleton 2017-10-26 23:02:45 -07:00
fc45d6a180 Sharing global styles 2017-10-26 22:42:08 -07:00
aa34db8318 Merge branch 'master' of github.com:jorilallo/atlas into tom/static 2017-10-25 22:48:28 -07:00
c6537279ba Fixes for empty document 2017-10-22 22:20:53 -07:00
524afd8b44 SignIn / SignOut working 2017-10-22 20:29:27 -07:00
802ce10f14 POC 2017-10-22 17:16:57 -07:00
aceaf261d2 Working on 'static' pages 2017-10-22 16:33:10 -07:00
4d53c4aa00 Merge master 2017-10-21 21:12:56 -07:00
7c1e80cf42 Merge pull request #329 from jorilallo/jori/avatar-s3
Upload avatars to S3
2017-10-19 23:39:16 -07:00
1fdbf256a7 review comments 2017-10-19 23:30:31 -07:00
c1a8e15a52 flow 2017-10-19 23:00:40 -07:00
d0dbe4cf02 Fixes: Adding Slack command 2017-10-19 21:02:39 -07:00
255d7564c5 Upload avatar to s3 on login 2017-10-19 00:49:22 -07:00
150771ee88 removed dependencies, html/preview 2017-10-16 23:35:56 -07:00
36d46533b6 Added simple revisions API 2017-10-16 22:36:44 -07:00
06def29564 Merge pull request #304 from jorilallo/jori/rm-navigationtree
Removed legacy navigationtree
2017-10-15 18:42:49 -07:00
75bf265bd5 Removed legacy navigationtree 2017-10-15 18:35:28 -07:00
275e754bf1 Moved Bugsnag token into envvar 2017-10-15 16:51:25 -07:00
d4dc6f2a28 separated bugsnag token 2017-10-15 16:37:10 -07:00
42ed9616b5 Added cookie to indicate logged in status 2017-10-11 00:14:45 -07:00
7c3cfbc9da Added Event model and logging to Collection 2017-10-09 23:27:34 -07:00
dd0588d760 Several fixes + refactor to Collection methods 2017-10-09 00:05:15 -07:00
7081291ed6 Merge pull request #288 from jorilallo/jori/move-tweaks
Refactored document move
2017-10-07 16:07:12 -07:00
34dd1f1409 Dropped whitelisting 2017-10-04 01:17:30 -07:00
ccec69d431 Final fixes to document move 2017-10-01 23:42:17 -07:00
a5a1e286d4 Addressed user feedback 2017-09-24 13:51:33 -07:00
229cd3271a Fixes: 500 error when attempting to load a deleted document from view 2017-09-13 23:04:58 -07:00
483bf29cc4 Workable document moving 2017-09-12 22:58:33 -07:00
5c43e12218 Moved document matching to use urlId to prevent issues with renamed documents 2017-09-12 19:55:01 -07:00
ce5b6e6ac8 Return updated collection on document move 2017-09-12 00:11:53 -07:00
917c5c4923 Return updated collection on document create 2017-09-12 00:10:02 -07:00
9f7fbbd1d3 Merge branch 'master' into dashboard-improves 2017-09-09 07:35:24 -07:00
7e82fd944e allow-null-username 2017-09-04 13:27:29 -07:00
dc3ebf0c27 Quick fixes from last PR 2017-09-04 12:26:00 -07:00
432b7afede Refactor Slack signin codE 2017-09-03 17:08:56 -07:00
6cb740f18c Merge branch 'master' into dashboard-improves 2017-09-03 14:23:09 -07:00
6c93bfda1d WIP 2017-09-03 14:12:37 -07:00
95182057a6 💚 2017-09-02 18:44:41 -07:00
b9b2769563 Fixes: Documents marked as starred incorrectly 2017-09-02 16:58:24 -07:00
28956b98fa migration-fixes 2017-09-01 08:46:39 -07:00
41f47f3f2f Migrations fix 2017-08-31 19:41:10 -07:00
8558b92cae Edit collection (#173)
* Collection edit modal

* Add icon

* 💚

* Oh look, some specs

* Delete collection

* Remove from collection

* Handle error responses
Protect against deleting last collection

* Fix key

* 💚

* Keyboard navigate documents list

* Add missing database constraints
2017-08-29 08:37:17 -07:00
ca35cee841 Move star out of editor into documentpreview (#174)
* Move star out of editor into documentpreview

* 💚
2017-08-02 20:45:09 -07:00
297bf850c2 Align title correctly when first character is emoji 2017-07-29 16:15:04 -07:00