moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,449 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

5449 Commits

Author SHA1 Message Date
Egor Kislitsyn 17004a0f1a Create index on `activities.local` 2019-06-05 16:37:43 +07:00
Egor Kislitsyn 17a6f81f7b Fix tests with enabled RUM 2019-06-05 16:37:43 +07:00
Egor Kislitsyn 94b9e9d844 Update benchmark mix task 2019-06-05 16:37:43 +07:00
Egor Kislitsyn 93397fce3d Contain search for unauthenticated users 2019-06-05 16:37:43 +07:00
kaniini e4babb1c9f Merge branch 'explicit-addressing' into 'develop' 
Explicit addressing

See merge request pleroma/pleroma!1239
 2019-06-05 08:28:20 +00:00
Haelwenn 5188add534 Merge branch 'remove-tag-warning' into 'develop' 
Mix: Swallow git error messages during version number handling.

See merge request pleroma/pleroma!1247
 2019-06-04 15:46:38 +00:00
Haelwenn ab4915edcb Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop' 
Participations: Filter out participations without activities.

Closes #956 and #953

See merge request pleroma/pleroma!1246
 2019-06-04 15:34:55 +00:00
lain 18c35d84fd NodeInfo: Add explicit addressing to nodeinfo. 2019-06-04 17:14:25 +02:00
lain b5e3b1e58a Mix: Swallow git error messages during version number handling. 
Otherwise sometimes a 'fatal' message will be printed, confusing users.
 2019-06-04 16:58:40 +02:00
lain f178a6f3f0 Merge branch 'issue/941' into 'develop' 
[#941] add option skip_thread_containment

See merge request pleroma/pleroma!1237
 2019-06-04 14:58:13 +00:00
Maksim Pechnikov 1e7bb69a95 update ActivityPub#fetch_activities_query 2019-06-04 15:21:18 +03:00
Maksim Pechnikov d3d1704e84 Merge branch 'develop' into issue/941 2019-06-04 15:06:58 +03:00
Maksim Pechnikov 0acfcf6c52 update ActivityPub#fetch_activities_query 2019-06-04 15:04:36 +03:00
lain a3a7178b60 Participations: Filter out participations without activities. 2019-06-04 13:58:36 +02:00
Haelwenn 0eb7464c10 Merge branch 'emoji-loader-fix' into 'develop' 
Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245
 2019-06-04 11:26:42 +00:00
lain 8ac104cde0 Merge branch 'fix/fetch-votes-restrict-create' into 'develop' 
Restrict `get_existing_votes` to only get Create activities

See merge request pleroma/pleroma!1244
 2019-06-04 10:55:45 +00:00
rinpatch bbff7554de Add tests for get_existing_votes 2019-06-04 13:47:53 +03:00
rinpatch 17383861ed Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities 2019-06-04 13:38:32 +03:00
lain e74581a5c4 Emoji: Don't die when files are present in the emoji folder. 2019-06-04 12:14:43 +02:00
rinpatch 29b022bb59 Restrict `get_existing_votes` to only get Create activities 2019-06-04 12:42:10 +03:00
Maksim Pechnikov 96121315f3 fix merge 2019-06-04 12:41:24 +03:00
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing 2019-06-04 11:23:46 +02:00
kaniini d977d73b91 Merge branch 'fix/poll-performance' into 'develop' 
utils: access inReplyTo as an explicit string when fetching poll results`

See merge request pleroma/pleroma!1243
 2019-06-04 08:55:04 +00:00
lain 25198d48f7 Docs: Add Explicit addressing to Readme and changelog. 2019-06-04 10:49:57 +02:00
William Pitcock 37a4ba0624 utils: access inReplyTo as an explicit string when fetching poll results` 2019-06-04 08:45:03 +00:00
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini 0f8f63c6bb Merge branch 'feature/nodeinfo-polls' into 'develop' 
nodeinfo: add pollLimits to metadata

See merge request pleroma/pleroma!1242
 2019-06-04 06:29:03 +00:00
William Pitcock 1c6cf0a348 nodeinfo: add pollLimits to metadata 2019-06-04 06:19:44 +00:00
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' 
MRF: subchain policy

See merge request pleroma/pleroma!1233
 2019-06-04 05:49:54 +00:00
kaniini 59f6e794e1 Merge branch 'fix/mock-errors-in-tests' into 'develop' 
Add missing HTTP Request mocks

See merge request pleroma/pleroma!1231
 2019-06-04 05:46:20 +00:00
Sergey Suprunenko 84cc131b59 Add missing HTTP Request mocks 2019-06-04 05:46:19 +00:00
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop' 
Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
 2019-06-04 05:43:43 +00:00
kaniini a536f515dd Merge branch 'ueberauth_config_extension' into 'develop' 
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234
 2019-06-04 05:42:49 +00:00
kaniini 2be142ebec Merge branch 'update-oauth-template-css-fix' into 'develop' 
Update oauth template css fix

See merge request pleroma/pleroma!1238
 2019-06-04 05:39:38 +00:00
kaniini 94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop' 
Add index on inReplyTo for objects

See merge request pleroma/pleroma!1240
 2019-06-04 05:38:13 +00:00
William Pitcock 7758148990 update CHANGELOG for mrf_subchain 2019-06-04 05:37:31 +00:00
Maksim Pechnikov 64ada7f960 fix tests 2019-06-03 22:51:14 +03:00
lambda 662e95e948 Merge branch 'fix/tag-timeline-missing-index' into 'develop' 
Add missing tag index on objects

Closes #867

See merge request pleroma/pleroma!1241
 2019-06-03 19:03:35 +00:00
Maksim Pechnikov 46c7e16512 updated changelog 2019-06-03 21:05:45 +03:00
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
rinpatch cfc3c62b2f Add missing tag index on objects 
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
 2019-06-03 20:42:13 +03:00
lain 804b6a4d8f CommonAPI.Utils: Add tests. 2019-06-03 19:08:38 +02:00
rinpatch be56801dda Add index on inReplyTo for objects 
Fixes the performance of `get_existing_votes`
 2019-06-03 19:26:43 +03:00
eugenijm f2c4c99e03 Remove repeated scope lists 2019-06-03 19:18:21 +03:00
lain 80d4d83aac CommonAPI: Add explicit addressing. 2019-06-03 18:17:08 +02:00
lain 2b664b048e User: Add function to get AP ids from nicknames. 2019-06-03 18:16:11 +02:00
eugenijm 243d8ed94e Use workaround for the heavy checkmark symbol in iOS 2019-06-03 18:28:36 +03:00
Mark Felder f4e2595592 Merge branch 'develop' into update-oauth-template 2019-06-03 09:12:17 -05:00
Maksim Pechnikov 080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
rinpatch 9789e000b0 Merge branch 'feature/polls-2-electric-boogalo' into 'develop' 
Polls 2 Electric Boogalo

Closes #657

See merge request pleroma/pleroma!1190
 2019-06-03 12:19:19 +00:00