Commit Graph

2709 Commits

Author SHA1 Message Date
Andrew Brown
89bcceeeb2
Merge branch 'master' into may-11 2019-05-12 21:47:11 -05:00
Andrew Brown
9cfac97969 fix tests 2019-05-12 21:45:46 -05:00
Andrew Brown
f90ed2b153
Merge branch 'master' into may-11 2019-05-12 20:53:08 -05:00
Andrew Brown
ab8fa11d6a editor js 2019-05-12 20:52:13 -05:00
Andrew Brown
8fa7364e5b unnecessary hack 2019-05-12 20:28:43 -05:00
Andrew Brown
706f8b59af unnecessary code 2019-05-12 20:24:59 -05:00
Andrew Brown
afa0748010 whitespace 2019-05-12 20:23:26 -05:00
Andrew Brown
7a732d43e7 only mildly surprised this actually worked 2019-05-12 20:20:54 -05:00
Andrew Brown
dcf8eb2751 oops 2019-05-12 19:52:55 -05:00
Andrew Brown
612809e517 Re-enable linking to universes 2019-05-12 02:59:18 -05:00
Andrew Brown
175038c10c fix 500 when focused to universe 2019-05-12 02:54:56 -05:00
Andrew Brown
199bb5958a force dyno restart 2019-05-12 02:48:32 -05:00
Andrew Brown
36835495b7
Merge pull request #364 from indentlabs/may-3
Profile redesign
2019-05-12 01:56:52 -05:00
Andrew Brown
9abffa06af
Merge branch 'master' into may-3 2019-05-12 01:55:50 -05:00
Andrew Brown
751a6fe931
Merge pull request #360 from indentlabs/apr10-2
Add a quick create another button to content#show pages
2019-05-12 01:55:29 -05:00
Andrew Brown
f917ccf314 more code cleanup 2019-05-12 01:51:16 -05:00
Andrew Brown
823fd547a0 shaking more trees 2019-05-11 17:31:32 -05:00
Andrew Brown
2fcc5501b7 better flash messages on attribute category/field creations 2019-05-11 17:27:01 -05:00
Andrew Brown
65337dfc58 shaking trees 2019-05-11 16:56:41 -05:00
Andrew Brown
50eff7c273 hmmmmmmmmmmmmmmmmmmmmm 2019-05-11 16:38:29 -05:00
Andrew Brown
2df32cf73a clear email before deleting users 2019-05-10 16:55:29 -05:00
Andrew Brown
556ea04406 keep entities up to date on when their attributes were last edited 2019-05-10 16:45:00 -05:00
Andrew Brown
bafdbf9fa9 only show privacy tooltips to profile owner 2019-05-10 16:35:07 -05:00
Andrew Brown
e4d6dd691c polish 2019-05-10 16:07:09 -05:00
Andrew Brown
6e47a95794 use uploaded images on profile activity if they exist 2019-05-10 16:01:46 -05:00
Andrew Brown
b2ac9ca21f better stream query + better privacy indicator in stream 2019-05-10 15:52:27 -05:00
Andrew Brown
783893bd49 more profile improvements 2019-05-10 15:06:21 -05:00
Andrew Brown
90f70930da timestamps 2019-05-03 20:22:32 -05:00
Andrew Brown
82f72a4099 profile redesign wip 2019-05-03 20:02:41 -05:00
Andrew Brown
fe929df7cd don't allow text overlapping on small screens 2019-05-03 17:09:31 -05:00
Andrew Brown
0d6a0f1e24 various cleanups 2019-05-03 17:09:15 -05:00
Andrew Brown
b4842e5c1c cleaner permissions 2019-05-03 17:09:02 -05:00
Andrew Brown
22fd5b71a3 allow @mentioning universes 2019-05-03 16:49:02 -05:00
Andrew Brown
90c424e637 add migration to a rake task so we can schedule it on heroku 2019-05-03 16:35:08 -05:00
Andrew Brown
b1f62cccd2 redo the reverted commit 2019-05-03 16:29:17 -05:00
Andrew Brown
106daea496 Revert "code cleanup/naming"
This reverts commit 7e62a9e299.
2019-05-03 16:20:38 -05:00
Andrew Brown
a9389da76f wip migration 2019-05-03 15:08:19 -05:00
Andrew Brown
af04137657 audit field migration service 2019-05-03 12:46:00 -05:00
Andrew Brown
e230f11cd8 add migration shorthand for users 2019-05-03 12:34:29 -05:00
Andrew Brown
7e62a9e299 code cleanup/naming 2019-05-03 12:20:35 -05:00
Andrew Brown
47774e8d41 bundle update thredded 2019-05-03 11:27:50 -05:00
Andrew Brown
c1cf0fd57f Add a quick create another button to content#show pages 2019-04-10 14:40:59 -05:00
Andrew Brown
661a24c7ac
Merge pull request #359 from indentlabs/apr10
April 10 changes
2019-04-10 14:08:00 -05:00
Andrew Brown
8adf831dfb when js breaks, contain the slider to its window instead of overlapping forms 2019-04-10 14:01:55 -05:00
Andrew Brown
bb7b774522 fix for pages with multi-line names and blank docs 2019-04-10 13:55:05 -05:00
Andrew Brown
365c09bce6
Merge pull request #356 from indentlabs/page-mentions
Add page @mentioning to worldbuilding pages and documents
2019-04-10 00:47:10 -05:00
Andrew Brown
c148f36c4d contenteditable false on the inserted links 2019-04-10 00:41:53 -05:00
Andrew Brown
daf6684c9c preserve html in documents 2019-04-10 00:30:16 -05:00
Andrew Brown
8c73301aa1 remove existing link bars 2019-04-10 00:03:14 -05:00
Andrew Brown
43b418d55d colored text links instead of chips 2019-04-09 22:01:31 -05:00