Commit Graph

808 Commits

Author SHA1 Message Date
Andrew Brown
438a7b4eef timelines#index 2020-06-10 15:04:51 -05:00
Andrew Brown
ed390d4f71 add timeline models 2020-06-10 12:34:12 -05:00
Andrew Brown
4d77c36374 prepping for content page setting overrides 2020-06-10 12:25:08 -05:00
Andrew Brown
e6c853e288 revert wip 2020-06-10 01:56:45 -05:00
Andrew Brown
bf898250e9 ugh, wip 2020-06-10 00:11:49 -05:00
Andrew Brown
15ddaeb1cc exclude blocked users from user streams 2020-06-03 17:44:13 -05:00
Andrew Brown
56a2af24e6 cleaner partials 2020-06-03 01:39:38 -05:00
Andrew Brown
3af761675c most of collections bones 2020-06-02 23:48:19 -05:00
Andrew Brown
87942f940c add share reporting 2020-06-02 01:54:00 -05:00
Andrew Brown
59ecd296d9 piping to submit pages to collections 2020-05-11 13:19:20 -05:00
Andrew Brown
1d01009897 cleaning up code a bit 2020-05-11 00:30:08 -05:00
Andrew Brown
5bfd9d474f Merge branch 'master' into collaboration-expansion 2020-05-11 00:13:12 -05:00
Andrew Brown
f3699f14c6 add content page shares to content page 2020-05-11 00:12:57 -05:00
Andrew Brown
5493647ae5 collection submissions model/controller 2020-05-01 21:17:10 -05:00
Andrew Brown
1d83c507b4 wip collections mockup 2020-05-01 13:18:36 -05:00
Andrew Brown
b8fa922575 page collections controller scaffold 2020-04-30 15:22:06 -05:00
Andrew Brown
d3ae2a9a35 job for notifications + share following 2020-04-26 22:52:11 -05:00
Andrew Brown
525e208eec add commenting on shares 2020-04-25 16:31:45 -05:00
Andrew Brown
c4543fe1ce stream progress 2020-04-25 15:13:56 -05:00
Andrew Brown
9a1c3d8403 stream share form & design 2020-04-24 15:53:29 -05:00
Andrew Brown
a524cc4089 optional: true on groupers 2020-04-24 02:16:05 -05:00
Andrew Brown
f6fa089030 Merge branch 'master' into collaboration-expansion 2020-04-23 16:43:53 -05:00
Andrew Brown
cc40607cad
Merge pull request #664 from indentlabs/notifications
Notification system
2020-04-22 00:20:22 -05:00
Andrew Brown
2611777653 end lore promotion 2020-04-21 17:13:33 -05:00
Andrew Brown
500ede3b16 premium onboarding notification 2020-04-20 21:30:16 -05:00
Andrew Brown
7ce21710dc hook up notification flow 2020-04-20 18:58:12 -05:00
Andrew Brown
4b2fd1e744 notification designs 2020-04-20 17:56:09 -05:00
Andrew Brown
5c5fe88ff2 add notification model 2020-04-20 17:35:10 -05:00
Andrew Brown
23f71f0922 Merge branch 'master' into lore-page-types 2020-04-06 17:36:30 -05:00
Andrew Brown
ae0401ce79 refactor autocomplete system 2020-04-03 18:08:09 -05:00
Andrew Brown
197a097011 big whoops 2020-04-03 13:15:21 -05:00
Andrew Brown
4a662f4d77 Add some safety checking around image_processing avatar processing
https://github.com/janko/image_processing/issues/66#issuecomment-608573201
2020-04-03 13:04:58 -05:00
Andrew Brown
2d5cdddfe9 allow dismissing associations banner 2020-03-28 20:21:19 -05:00
Andrew Brown
38dda2e079 don't let blocked users follow their blockers 2020-03-28 18:36:06 -05:00
Andrew Brown
fb6e9d5595 allow users to block other users 2020-03-28 18:26:44 -05:00
Andrew Brown
f462831728 Add the ability to follow/unfollow other users 2020-03-28 17:49:17 -05:00
Andrew Brown
e3c7ae8156 a lil security here and there 2020-03-28 13:57:06 -05:00
Andrew Brown
8dc6955c6a link piping 2020-03-28 13:51:21 -05:00
Andrew Brown
cac9802251 redo lore joiner migrations 2020-03-27 20:13:52 -05:00
Andrew Brown
9e0249f7a9 two-way link fixes 2020-03-26 18:24:04 -05:00
Andrew Brown
a4ca8cfc5f integrity 2020-03-26 15:55:51 -05:00
Andrew Brown
0161aa0ab4 icons for lore categories + file cleanup 2020-03-25 16:09:53 -05:00
Andrew Brown
7f07220013 lore link field models 2020-03-25 14:46:31 -05:00
Andrew Brown
b7bcc5c668 Merge branch 'master' into lore-page-types 2020-03-25 12:22:29 -05:00
Andrew Brown
9a020d7fef basic lore model 2020-03-25 12:21:05 -05:00
Andrew Brown
84afb58af0 subscription page improvements wrt codes 2020-03-24 16:43:59 -05:00
Andrew Brown
a6444ed838 tested to make sure it works ~ 2020-03-20 15:57:12 -05:00
Andrew Brown
718a674869 quick fix for debug data 2020-03-20 15:08:05 -05:00
Andrew Brown
ab384815ae initial integration authorization flow 2020-03-02 23:10:26 -06:00
Andrew Brown
2a8aee60ff initial authorization gateway page 2020-03-02 18:09:56 -06:00
Andrew Brown
0b07d24953 Merge branch 'master' into dev-api 2020-03-02 16:24:14 -06:00
Andrew Brown
72abeb12d0 add document notes / metadata in sidebar 2020-03-01 20:57:36 -06:00
Andrew Brown
ec7b13ce04 fix privacy toggles and tag %-complete 2020-03-01 17:34:44 -06:00
Andrew Brown
be4ef98d5a include tags in serializer values 2020-03-01 17:06:28 -06:00
Andrew Brown
9cceb118f6 add initial application integration page 2020-02-22 10:32:08 -06:00
Andrew Brown
4c5667e060 add application integrations 2020-02-22 00:50:39 -06:00
Andrew Brown
9c6af48be7 wip document notes 2020-02-21 12:07:18 -06:00
Andrew Brown
dd2f03c285 add percentages to sidelinks 2020-02-19 15:54:40 -06:00
Andrew Brown
2fff1d610b fix link bug 2020-01-29 13:14:18 -06:00
Andrew Brown
1aecd1d3b5 nullability 2020-01-29 12:43:55 -06:00
Andrew Brown
6155d6a173 add wip reciprocal country-country link field for borders 2020-01-29 11:43:33 -06:00
Andrew Brown
e5a1440b0b add continent link on planets 2020-01-28 18:11:01 -06:00
Andrew Brown
1f8b7c4b41 add link fields 2020-01-28 18:06:00 -06:00
Andrew Brown
f60d4d6ffe add continents 2020-01-28 17:38:47 -06:00
Andrew Brown
b019ee8356 add continent model 2020-01-28 17:11:37 -06:00
Andrew Brown
6f9601f60a Merge branch 'master' into feb-release 2020-01-27 22:23:02 -06:00
Andrew Brown
812951daed fall back on gravatar if activestorage errors 2020-01-27 22:22:57 -06:00
Andrew Brown
c5ecf6da14 add initial framework for favorite page type themeing profile pages 2020-01-25 13:29:35 -06:00
Andrew Brown
c9102afb28 add slack reporting 2020-01-17 20:28:47 -06:00
Andrew Brown
9305fe6eb1 typo 2020-01-17 17:41:37 -06:00
Andrew Brown
3ca72c742c staging changes 2020-01-17 17:37:09 -06:00
Andrew Brown
d7c05b1731 polishing 2020-01-16 20:57:56 -06:00
Andrew Brown
1b62fca1bb Merge branch 'master' into paypal-promos 2020-01-16 16:59:02 -06:00
Andrew Brown
4082bbae2b Oh hey look it's paypal 2020-01-16 16:54:51 -06:00
Andrew Brown
736c055a23 fix sidenav counts 2020-01-15 18:37:49 -06:00
Andrew Brown
786c8f5cfc add referrals page 2020-01-09 14:37:39 -06:00
Andrew Brown
be5fb19653 optimization pass 2020-01-03 13:52:02 -06:00
Andrew Brown
05394935fd add some db indices 2020-01-03 13:10:36 -06:00
Andrew Brown
d8e26642a0 don't use/suggest empty-name categories/fields 2020-01-03 12:09:47 -06:00
Andrew Brown
cd3cc2f47c field editor fix 2020-01-03 11:04:55 -06:00
Andrew Brown
236a09f3d4 gotta have that nice whitespace 2020-01-02 01:51:42 -06:00
Andrew Brown
a13dda6bde revert this change since i'm too tired to figure out what's up with it 2020-01-02 01:34:46 -06:00
Andrew Brown
aebddfaf39 test this sort-by syntax 2020-01-02 01:21:22 -06:00
Andrew Brown
95e370606d Merge branch 'rails6-features' into template-editor-rework 2020-01-02 01:03:18 -06:00
Andrew Brown
ba7c9c063c Merge branch 'rails6-features' of github.com:indentlabs/notebook into rails6-features 2019-12-31 23:40:00 -06:00
Andrew Brown
b586880314
Merge branch 'master' into rails6-features 2019-12-31 23:02:10 -06:00
Andrew Brown
7969188406 enable linking other pages from serendipitous prompts 2019-12-31 17:16:50 -06:00
Andrew Brown
a446c5d14d only validate username when it is changing 2019-12-25 22:12:47 -06:00
Andrew Brown
cdcd7ee75d oof, typo 2019-12-22 18:17:34 -06:00
Andrew Brown
6b7a61398d missed an optional: true belongs_to upgrade 2019-12-21 15:24:46 -06:00
Andrew Brown
c4dbfda438 make avatars optional 2019-12-21 12:59:31 -06:00
Andrew Brown
b99d8d3174 blacklist special labels 2019-12-17 18:29:56 -06:00
Andrew Brown
d9050aa5f8 attribute category suggestions 2019-12-17 17:30:57 -06:00
Andrew Brown
acd881fe31 use AFS cache for category field suggestions instead of computing in the api 2019-12-17 17:11:19 -06:00
Andrew Brown
efd69b6679 add AttributeFieldSuggestion cache model 2019-12-17 16:49:28 -06:00
Andrew Brown
09aa1f239b text/link editor wip 2019-12-15 21:31:11 -06:00
Andrew Brown
a43d87dafb Merge branch 'rails6-features' into template-editor-rework 2019-12-15 14:57:29 -06:00
Andrew Brown
5b06445ead Merge branch 'master' into template-editor-rework 2019-12-15 14:56:37 -06:00
Andrew Brown
c05b3814a7 Merge branch 'rails6' into rails6-features 2019-12-15 14:53:46 -06:00
Andrew Brown
06351580e4 safety check 2019-12-15 13:56:06 -06:00
Andrew Brown
8b563c67ed this also 2019-12-15 12:50:47 -06:00
Andrew Brown
5ffd2bc074 optional belongs_to seem to be enforced now ???? 2019-12-15 12:36:19 -06:00
Andrew Brown
85d511fe49 update flora icon + color 2019-12-15 00:08:48 -06:00
Andrew Brown
4cde1d9e12 update Item icon and color 2019-12-14 23:31:52 -06:00
Andrew Brown
21333cb46a update sports icon 2019-12-14 23:26:13 -06:00
Andrew Brown
adfa20f606 delete avatars before changing to a new one 2019-12-14 18:56:00 -06:00
Andrew Brown
f88707b159 use image variants for user avatars 2019-12-14 18:42:40 -06:00
Andrew Brown
f2c984b1d5 show uploaded avatars on profile 2019-12-14 18:20:09 -06:00
Andrew Brown
6d530ae60c form for updating new avatar 2019-12-14 17:56:55 -06:00
Andrew Brown
ce82ea6ef7 safety check 2019-12-14 10:35:46 -06:00
Andrew Brown
a120f63eb5 upgrade rails to 6.0.2 2019-12-14 01:50:36 -06:00
Andrew Brown
ced648f821 enable analysis for promo code users also 2019-11-27 15:00:56 -06:00
Andrew Brown
aa637a34bf hook up archive/unarchive fab 2019-10-17 15:36:11 -05:00
Andrew Brown
78fe5b4a4a archival scope + ContentPage shim 2019-10-17 14:20:56 -05:00
Andrew Brown
a1f47b60f8 fix 500 2019-09-08 16:42:31 -05:00
Andrew Brown
0f971336c1 lets actually try this :) 2019-09-08 14:16:55 -05:00
Andrew Brown
69dcd4f26b eh why not fall back on safety 2019-09-08 01:43:48 -05:00
Andrew Brown
894529a33d do make sure we 500 on users that don't exist though 2019-09-08 01:34:14 -05:00
Andrew Brown
70c299a048 fix 500 on backfilling deleted test accounts 2019-09-08 01:33:28 -05:00
Andrew Brown
31a28e96e1 Merge branch 'master' into sep-7-changes 2019-09-07 23:07:43 -05:00
Andrew Brown
eda59a2672 backfill fix 2019-09-07 22:48:57 -05:00
Andrew Brown
bd77eefb6f make backfills/position public 2019-09-07 22:17:05 -05:00
Andrew Brown
4ce5976874 code shaking 2019-09-07 19:01:35 -05:00
Andrew Brown
c69a3c1ee5 remove duplicate models 2019-09-07 16:37:14 -05:00
Andrew Brown
f53860ad25 unused var 2019-09-07 16:31:22 -05:00
Andrew Brown
f54ca693d4 wip 2019-08-25 19:25:57 -05:00
Andrew Brown
4250a98d41 some structural design work / cleanup 2019-08-24 13:34:04 -05:00
Andrew Brown
cea03813fe plumbing for custom page overrides 2019-08-24 11:54:53 -05:00
Andrew Brown
94f4f7e5d6 first pass on sortable orderings backfill 2019-08-24 11:24:15 -05:00
Andrew Brown
545061ce85 allow users to customize their premium badge in settings 2019-08-13 17:25:44 -05:00
Andrew Brown
fad5fac06d clean up analyses that miss sentiment data 2019-08-11 23:03:02 -05:00
Andrew Brown
f98c366a1a indicate unknown emotions in sentiment table 2019-08-11 22:34:08 -05:00
Andrew Brown
570aac2f57 increase category/concept relevance confidence threshold 2019-08-11 20:04:42 -05:00
Andrew Brown
842505e838 bugfixes & polish 2019-08-09 15:53:24 -05:00
Andrew Brown
f975071648 allow adding a document to a universe 2019-08-09 13:30:05 -05:00
Andrew Brown
19ec2a48a4 allow selecting text from sidebar 2019-08-03 12:26:46 -05:00
Andrew Brown
41a69df3fd this is the most janky hax i've seen in 2019 2019-08-02 16:28:37 -05:00
Andrew Brown
8078430851 tada 2019-08-02 00:22:56 -05:00
Andrew Brown
730abb307b Revert "um link page name instead of code"
This reverts commit 45195efcc6.
2019-07-31 14:00:51 -05:00
Andrew Brown
45195efcc6 um link page name instead of code 2019-07-28 17:46:12 -05:00
Andrew Brown
1b40bb4b82 Merge branch 'master' into document-analysis 2019-07-26 03:02:22 -05:00
Andrew Brown
a7375239dc *gulp* move all of current sidebar into navbar 2019-07-25 19:42:04 -05:00
Andrew Brown
a0da44960b fix 500 2019-07-23 21:40:33 -05:00
Andrew Brown
4e49d91da5 add dependencies 2019-07-23 21:35:17 -05:00
Andrew Brown
af81d08b79 fix paragraph counter 2019-07-23 20:46:50 -05:00
Andrew Brown
0f7f9587e0 fix bug in document linking on content pages 2019-07-23 19:58:12 -05:00
Andrew Brown
4372c8efbd use linked page names 2019-07-23 19:39:33 -05:00
Andrew Brown
0c981ce9c8 trigger analysis job when adding a new documententity manually 2019-07-23 18:29:31 -05:00
Andrew Brown
d283e55328 allow creating documententities manually 2019-07-23 18:16:10 -05:00
Andrew Brown
1391ceb8b6 emotion work 2019-07-22 17:41:59 -05:00
Andrew Brown
795ee253d3 don't exclude numbers from word list/count 2019-07-22 15:23:45 -05:00
Andrew Brown
08b86afbef fix paragraph counting bug 2019-07-22 15:18:02 -05:00
Andrew Brown
044dea4718 compare authors to hemingway 2019-07-12 12:05:46 -05:00
Andrew Brown
255c39c86c styling + fixes + deleting analysis flow 2019-07-09 00:21:56 -05:00
Andrew Brown
1db322a310 Merge branch 'master' into document-analysis 2019-07-08 17:28:23 -05:00
Andrew Brown
6c68975bd9 all the ui stuff for everything to work 2019-07-07 16:40:39 -05:00
Andrew Brown
886a12580c I guess we can just do the whitelisting before codes hit db 2019-07-07 12:53:47 -05:00
Andrew Brown
059fc67ba2 @streed is the literal best 2019-07-07 12:50:17 -05:00
Andrew Brown
69b5ab66ea wires to fill out tomorrow 2019-07-07 00:52:13 -05:00
Andrew Brown
0bb844b5f8 nah this seems like a very bad idea 2019-07-07 00:12:36 -05:00
Andrew Brown
e9ad3eff91 this seems easier than expected 2019-07-06 03:17:51 -05:00
Andrew Brown
ff8ef968b4 fix relations 2019-07-06 03:14:09 -05:00
Andrew Brown
9e66cbcf29 flesh out models 2019-07-06 02:46:48 -05:00
Andrew Brown
1566757499 models 2019-07-06 02:36:39 -05:00
Andrew Brown
6ac500a507 remove schools promo 2019-06-30 17:42:22 -05:00
Andrew Brown
3bd6e25f7d fix family delete issues 2019-06-25 16:55:28 -05:00
Andrew Brown
b649e382c3 counts block verification 2019-06-14 14:35:19 -05:00
Andrew Brown
d22bc55e56 show linked documents on content pages 2019-06-12 18:47:08 -05:00
Andrew Brown
954cf1aad0 Merge branch 'master' into document-analysis 2019-06-12 15:14:25 -05:00
Andrew Brown
5af109f510 this shouldn't be necessary, but it be how it is 2019-06-12 12:19:29 -05:00
Andrew Brown
1934d8e526 fix 500 on viewing nonexistent documents 2019-06-12 12:16:00 -05:00
Andrew Brown
dce2683b29 fix 500 on deleting characters 2019-06-12 12:12:24 -05:00
Andrew Brown
2e17981327 get watson working again 2019-06-03 20:21:01 -05:00
Andrew Brown
9b3c907c4e scope DAs 2019-06-03 20:13:41 -05:00
Andrew Brown
bcb47664e7 get everything but watson running again 2019-06-03 20:07:19 -05:00
Andrew Brown
c9678bf69e replace treat with engtagger poc 2019-06-03 19:52:13 -05:00
Andrew Brown
eba71ae424 cross fingers on this dope merge hell 2019-06-03 18:42:42 -05:00
Andrew Brown
d510682dd3 fix food color 2019-06-01 01:11:02 -05:00
Andrew Brown
c77b9173f9 attributes + make schools free 2019-05-30 15:53:03 -05:00
Andrew Brown
56ca3132f7 dismissals 2019-05-30 15:26:36 -05:00
Andrew Brown
9f6c9424c9 wip 2019-05-30 12:16:03 -05:00
Andrew Brown
787e0f8b81 category icons 2019-05-30 00:22:20 -05:00
Andrew Brown
683708ec17 top-level icons and colorings 2019-05-29 22:53:33 -05:00
Andrew Brown
1fd1eef0cf fields for new pages 2019-05-29 22:33:38 -05:00
Andrew Brown
89715f816b page_type:create for new pages 2019-05-29 22:00:31 -05:00
Andrew Brown
bc5aeeb20f models for sports, schools, and foods 2019-05-29 21:58:57 -05:00
Andrew Brown
0b9e97812c Merge branch 'master' into case-insensitivity 2019-05-12 23:46:18 -05:00
Andrew Brown
d0f8bab34a
Merge branch 'master' into may-10 2019-05-12 21:47:15 -05:00
Andrew Brown
3e69ae6363
Merge branch 'master' into may-10 2019-05-12 13:25:28 -05:00
Andrew Brown
612809e517 Re-enable linking to universes 2019-05-12 02:59:18 -05:00
Andrew Brown
65d1cde962 remove redundancy 2019-05-11 16:32:33 -05:00
Andrew Brown
cf1713c11c controller/meta cleanup 2019-05-11 16:30:57 -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
6e47a95794 use uploaded images on profile activity if they exist 2019-05-10 16:01:46 -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
0d6a0f1e24 various cleanups 2019-05-03 17:09:15 -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
a9389da76f wip migration 2019-05-03 15:08:19 -05:00