Commit Graph

817 Commits

Author SHA1 Message Date
Jori Lallo
2fddbbf21d Don't count a view when entering editing 2017-09-13 22:47:42 -07:00
Tom Moor
2bfeb78359 Merge pull request #234 from jorilallo/tommoor-patch-1
Update Heading.js
2017-09-13 20:06:30 -07:00
Tom Moor
2d979c3def Merge branch 'master' into tommoor-patch-1 2017-09-13 19:32:51 -07:00
Tom Moor
0d36fa8b3e Merge pull request #214 from jorilallo/split-collection-actions
Split collection modals
2017-09-13 19:24:35 -07:00
Tom Moor
00d18ceda3 Merge master 2017-09-13 19:18:49 -07:00
Tom Moor
42972fda39 Update Heading.js 2017-09-13 19:11:55 -07:00
Jori Lallo
85fc377566 Merge pull request #227 from jorilallo/jori/document-state
Refactored document setState to mobx & cancel reload
2017-09-12 23:52:24 -07:00
Jori Lallo
4555ef7ff1 Merge branch 'master' into jori/document-state 2017-09-12 23:52:02 -07:00
Jori Lallo
dca4f52325 Merge pull request #211 from jorilallo/jori/document-move
WIP Document move
2017-09-12 23:39:53 -07:00
Jori Lallo
c02bc04fd2 small refactor, lint and fixes 2017-09-12 23:30:18 -07:00
Jori Lallo
2cfe36dd35 styling 2017-09-12 22:58:33 -07:00
Jori Lallo
86a1792c8a Added keyboard shortcut for move 2017-09-12 22:58:33 -07:00
Jori Lallo
483bf29cc4 Workable document moving 2017-09-12 22:58:33 -07:00
Jori Lallo
70d352e193 ChevronIcon 2017-09-12 22:46:20 -07:00
Jori Lallo
688d84392b removed useless editCache set 2017-09-12 20:55:05 -07:00
Jori Lallo
c194667b6f removed useless async 2017-09-12 20:52:17 -07:00
Jori Lallo
e6f99bc3fb Added edit cache for canceling edit changes 2017-09-12 20:48:33 -07:00
Jori Lallo
16ce387d18 Merge pull request #228 from jorilallo/issue-220
Fixes no formatting toolbar on selecting heading
2017-09-12 20:28:02 -07:00
Jori Lallo
89ae5dcbd2 Merge pull request #229 from jorilallo/jori/document-create-sidebar
Fixes to document/collection state
2017-09-12 20:26:23 -07:00
Jori Lallo
76afaacc6e Moved url updating to a helper function 2017-09-12 20:14:14 -07:00
Tom Moor
c0b0711a7d Merge branch 'master' into issue-220 2017-09-12 19:58:40 -07:00
Jori Lallo
5c43e12218 Moved document matching to use urlId to prevent issues with renamed documents 2017-09-12 19:55:01 -07:00
Jori Lallo
e40d9cebda Trigger collection update when document gets updated (renamed) 2017-09-12 19:54:22 -07:00
Tom Moor
406e94372f Fixes no formatting toolbar on selecting heading 2017-09-12 07:59:01 -07:00
Jori Lallo
ce5b6e6ac8 Return updated collection on document move 2017-09-12 00:11:53 -07:00
Jori Lallo
917c5c4923 Return updated collection on document create 2017-09-12 00:10:02 -07:00
Jori Lallo
0071e09d7e refactored document setState to mobx & cancel reload 2017-09-11 23:59:35 -07:00
Tom Moor
72b10787e5 Connecting modals where needed 2017-09-11 23:41:12 -07:00
Jori Lallo
f3cb17046d Fix to webpack plugin 2017-09-11 23:32:26 -07:00
Jori Lallo
a7fa8c0dca Merge pull request #225 from jorilallo/jori/extract-text-css
Bring back extract text webpack plugin
2017-09-11 23:19:47 -07:00
Jori Lallo
9808c1cdf5 Bring back extract text webpack plugin 2017-09-11 23:18:44 -07:00
Tom Moor
cbf87e9dbe Merge master 2017-09-11 22:49:53 -07:00
Jori Lallo
f9ec9d7b15 Fixed cancel on publishing new documents 2017-09-11 22:37:14 -07:00
Jori Lallo
2a8f3a7e28 Merge pull request #217 from jorilallo/jori/cosmetics
Cosmetics tweaks
2017-09-11 22:14:47 -07:00
Jori Lallo
f31e4f61d8 Merge pull request #216 from jorilallo/jori/rm-sass
Remove SASS
2017-09-11 22:14:37 -07:00
Jori Lallo
d16cbb1958 Merge branch 'master' into jori/rm-sass 2017-09-11 22:14:29 -07:00
Jori Lallo
17d5697265 Fixed font size 2017-09-11 22:13:16 -07:00
Jori Lallo
98175c3d99 make the star smaller 2017-09-11 22:08:47 -07:00
Jori Lallo
aa9478d878 Added a missing key 2017-09-11 00:17:07 -07:00
Jori Lallo
c44c25b53e Fix Icon prop warning 2017-09-11 00:15:27 -07:00
Jori Lallo
57853861e5 LinkToolbar fixes 2017-09-11 00:07:51 -07:00
Jori Lallo
2fc0aee1b7 Linting 2017-09-10 23:33:07 -07:00
Jori Lallo
429f0be939 Fill starred star 2017-09-10 23:23:28 -07:00
Jori Lallo
d73f2e856e Fixed collaborator avatars 2017-09-10 23:14:32 -07:00
Jori Lallo
9aa49deeeb Fixes discoloration on menuitems 2017-09-10 23:01:22 -07:00
Jori Lallo
14b7f07e7f Load dashboard items in one 2017-09-10 22:59:14 -07:00
Jori Lallo
f3112d1393 Allow help text select 2017-09-10 22:38:20 -07:00
Jori Lallo
8cce45035f Merge pull request #215 from jorilallo/jori/document-404
Document 404
2017-09-11 01:31:35 -04:00
Jori Lallo
a552b7bb39 Merge branch 'master' into jori/document-404 2017-09-11 01:31:29 -04:00
Tom Moor
4cec8e69ed WIP 2017-09-10 22:27:23 -07:00