Commit Graph

2669 Commits

Author SHA1 Message Date
Andrew Brown
161c8a7485 Merge branch 'master' into thredded-report 2019-05-10 16:57:20 -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
Andrew Brown
d2328c5d32 colorize @mentions in documents 2019-04-09 21:21:59 -05:00
Andrew Brown
95d10b4313 hook up page linking w/ @mentions in docs 2019-04-09 21:04:44 -05:00
Andrew Brown
76082697cd use tribute for @mentions & implement 2019-04-09 20:58:11 -05:00
Andrew Brown
4baab83d5b
Merge pull request #354 from indentlabs/apr-9-changes
Apr 9 changes
2019-04-09 20:10:29 -05:00
Andrew Brown
f2e54a0b71 close #352 2019-04-09 19:17:26 -05:00
Andrew Brown
7829ae216d widen filter bar name field input 2019-04-09 19:13:57 -05:00
Andrew Brown
9e3f8cf171 perms for user to create documents 2019-04-09 19:11:49 -05:00
Andrew Brown
87aca964bc
Merge pull request #349 from indentlabs/changes-apr-3
Apr 3 changes
2019-04-04 00:12:40 -05:00
Andrew Brown
ee4e9e7aa4 bugfix https://rpm.newrelic.com/accounts/1783241/applications/71848250/traced_errors/5735f830-5673-11e9-8a81-0242ac11000f_0_6844 2019-04-03 19:53:39 -05:00
Andrew Brown
bf56db8d77
Merge pull request #347 from indentlabs/ui-ux-apr-3
UI/UX apr 3
2019-04-03 19:29:47 -05:00
Andrew Brown
203ffb40d4 fix billing plan changes for users with invalid usernames :| 2019-04-03 19:26:15 -05:00
Andrew Brown
0f503b05e8 add back create new _content_ link in nav on content#show 2019-04-03 19:09:27 -05:00
Andrew Brown
05487bf30a verbiage 2019-04-03 19:08:02 -05:00
Andrew Brown
d92e80cea3 let users know why they can't create additional pages 2019-04-03 19:06:11 -05:00
Andrew Brown
05f8174463 fix a couple tests 2019-04-03 18:56:52 -05:00
Andrew Brown
f29fa3271a only show new _content_ link in header if a user can follow it 2019-04-03 18:56:42 -05:00
Andrew Brown
8dcfccc908 show content links in content card reveal 2019-03-25 17:08:30 -05:00
Andrew Brown
c14e0bfc15 Revert "Revert "update rails & railties""
This reverts commit 2533da6ac8.
2019-03-19 20:42:23 -05:00
Andrew Brown
bf94927b66 Revert "Revert "devise 4.5 to 4.6""
This reverts commit 641599b280.
2019-03-19 20:42:07 -05:00
Andrew Brown
df183e85b4 Revert "Revert "rubocop 0.62 to 0.65""
This reverts commit 9e354c9305.
2019-03-19 20:41:59 -05:00
Andrew Brown
9e354c9305 Revert "rubocop 0.62 to 0.65"
This reverts commit e26cf57378.
2019-03-19 20:39:24 -05:00
Andrew Brown
641599b280 Revert "devise 4.5 to 4.6"
This reverts commit 92cd36cb3c.
2019-03-19 20:39:11 -05:00
Andrew Brown
2533da6ac8 Revert "update rails & railties"
This reverts commit a3bd8e4679.
2019-03-19 20:16:35 -05:00
Andrew Brown
13ba7e16ac Revert "temporarily disable caching in production"
This reverts commit abe9573bcc.
2019-03-19 20:06:01 -05:00
Andrew Brown
abe9573bcc temporarily disable caching in production 2019-03-19 19:58:53 -05:00
Andrew Brown
35e235d586 Merge branch 'index-cards' 2019-03-19 01:19:36 -05:00
Andrew Brown
34be97c345
Merge pull request #340 from indentlabs/index-cards
Use a new card-based design on content#index pages
2019-03-19 00:44:07 -05:00
Andrew Brown
d0149485be
Merge branch 'master' into index-cards 2019-03-19 00:37:05 -05:00
Andrew Brown
2e1d4f7ace
Merge pull request #334 from indentlabs/gem-updates-mar-15
Gem security updates
2019-03-19 00:36:05 -05:00
Andrew Brown
22832a1694 expand truncated content descriptions in the reveal 2019-03-18 23:58:18 -05:00
Andrew Brown
6f3b0a2674 this is no longer needed 2019-03-18 23:41:42 -05:00
Andrew Brown
3a5f849854 finish setting up polymorphic association on image uploads 2019-03-18 23:07:43 -05:00
Andrew Brown
1e1c4bb837 image preloading on initial query 2019-03-18 22:18:51 -05:00
Andrew Brown
9f5e0e2510 add premium badge to user profiles 2019-03-18 19:42:46 -05:00
Andrew Brown
2011a5e6d4 explain referral bonuses 2019-03-18 19:34:16 -05:00
Andrew Brown
5a4f0b9725 add premium link to content pages faq 2019-03-18 19:19:52 -05:00
Andrew Brown
cde5e34c23 add contentformatterservice 2019-03-18 19:09:28 -05:00
Andrew Brown
11e82ebf95 add this comically large cta 2019-03-18 18:54:35 -05:00
Andrew Brown
27dcf32f15 fix a big ol' whoopsie 2019-03-18 18:38:45 -05:00
Andrew Brown
c6abf3e852 switch from large to medium images 2019-03-18 18:36:51 -05:00
Andrew Brown
85ec96c0ac @sn31 strikes again 2019-03-18 18:34:25 -05:00