scarlett
|
096e121879
|
Remove redundant comma.
|
2019-01-05 18:25:36 +00:00 |
|
scarlett
|
6556be344d
|
Resolve some test failures.
|
2019-01-05 18:20:42 +00:00 |
|
scarlett
|
3c86d907d4
|
add some brakets to the emoji list.
|
2019-01-05 17:35:39 +00:00 |
|
scarlett
|
0787f0dfbe
|
Strip HTML in and allow emoji in summaries.
|
2019-01-05 17:28:47 +00:00 |
|
sxsdv1
|
2d7da5f437
|
Don't crash on AP request for tombstone
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
|
2019-01-05 11:16:05 +01:00 |
|
cascode
|
a81307251c
|
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
|
2019-01-04 20:32:55 -08:00 |
|
rinpatch
|
ba17518a0a
|
Merge branch 'feature/rich-media-cachex' into 'develop'
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
|
2019-01-04 23:56:42 +00:00 |
|
William Pitcock
|
487c00d36d
|
rich media: disable cachex in test mode
|
2019-01-04 23:53:26 +00:00 |
|
kaniini
|
bf5aaefbb5
|
Merge branch 'fix/html-cache-content-collision' into 'develop'
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
|
2019-01-04 23:35:56 +00:00 |
|
William Pitcock
|
0964c207eb
|
rich media: use cachex to avoid flooding remote servers
|
2019-01-04 23:32:01 +00:00 |
|
Rin Toshaka
|
1e2d58982e
|
oopsies
|
2019-01-05 00:25:31 +01:00 |
|
Rin Toshaka
|
846082e54f
|
Different caches based on the module. Remove scrubber version since it is not relevant anymore
|
2019-01-05 00:19:46 +01:00 |
|
spctrl
|
4aa977d3b3
|
fix 486: Add option --assume-yes to allow it to work non-interactive
|
2019-01-04 22:11:46 +01:00 |
|
kaniini
|
4258dd8633
|
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
|
2019-01-04 20:50:18 +00:00 |
|
kaniini
|
ffea81b84f
|
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
|
2019-01-04 20:32:10 +00:00 |
|
cascode
|
4c5ee4c62b
|
formatted
|
2019-01-04 10:18:43 -08:00 |
|
cascode
|
ab6ebbae67
|
added test for #499
|
2019-01-04 10:14:13 -08:00 |
|
cascode
|
5b23dfa1c5
|
handle null
|
2019-01-04 01:35:26 -08:00 |
|
kaniini
|
d9d62a110c
|
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
|
2019-01-03 22:30:02 +00:00 |
|
kaniini
|
ccdc916f95
|
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
Remove media proxy examples in config/config.exs
See merge request pleroma/pleroma!624
|
2019-01-03 22:29:36 +00:00 |
|
href
|
53f56039e5
|
Remove media proxy examples in config/config.exs
1. this was overriding the real defaults
2. it's documented in `config/config.md`
|
2019-01-03 20:22:22 +01:00 |
|
kaniini
|
eaaf701319
|
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
|
2019-01-03 18:53:30 +00:00 |
|
rinpatch
|
b73a1a33de
|
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
|
2019-01-03 17:04:27 +00:00 |
|
rinpatch
|
9ef664ffce
|
Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
|
2019-01-03 08:59:05 +00:00 |
|
William Pitcock
|
eb1a18d22f
|
user: check that the follow request actually has an active account associated with it
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
|
2019-01-02 22:47:12 +00:00 |
|
Michael Loftis
|
943211b035
|
rewrites List.foldl to Enum.each
|
2019-01-02 21:21:40 +00:00 |
|
rinpatch
|
d1983ed028
|
Merge branch 'fix/reserve-media-username' into 'develop'
Reserve /media
See merge request pleroma/pleroma!620
|
2019-01-02 16:23:46 +00:00 |
|
Rin Toshaka
|
5142b50f39
|
reserve /media
|
2019-01-02 17:16:26 +01:00 |
|
Maxim Filippov
|
48e81d3d40
|
Add RichMediaController and tests
|
2019-01-02 17:02:50 +03:00 |
|
lain
|
8910e103ce
|
Add handler for Phoenix-style socket.
|
2019-01-02 11:39:11 +01:00 |
|
sxsdv1
|
4e1cc2bab6
|
Implement delete activity
|
2019-01-01 23:20:43 +01:00 |
|
sxsdv1
|
551c3d9391
|
Split create activity specifics from update_outbox
|
2019-01-01 23:20:28 +01:00 |
|
Maxim Filippov
|
917d48d09b
|
Better variable name
|
2019-01-01 23:29:47 +03:00 |
|
Maxim Filippov
|
2aab4e03c3
|
Add OGP parser
|
2019-01-01 23:26:40 +03:00 |
|
kaniini
|
32bed66471
|
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
|
2019-01-01 20:12:34 +00:00 |
|
rinpatch
|
34fa709015
|
Merge branch 'configurable-federator' into 'develop'
Make Federator options configurable.
See merge request pleroma/pleroma!615
|
2019-01-01 18:55:59 +00:00 |
|
lambda
|
b9ac7067eb
|
Merge branch '2019-1-1-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!616
|
2019-01-01 16:55:37 +00:00 |
|
lain
|
1dd0e0ed4c
|
update frontend
|
2019-01-01 17:45:03 +01:00 |
|
lain
|
1a0391c8a4
|
Add documentation.
|
2019-01-01 17:40:42 +01:00 |
|
lambda
|
32541172cd
|
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
|
2019-01-01 13:48:59 +00:00 |
|
lain
|
400337b0a7
|
Make Federator options configurable.
|
2019-01-01 14:46:55 +01:00 |
|
lain
|
096a927805
|
Merge remote-tracking branch 'origin/develop' into pool-usage
|
2019-01-01 14:19:55 +01:00 |
|
lain
|
91afbbe4ea
|
Update Tesla and Hackney.
|
2019-01-01 13:49:48 +01:00 |
|
lain
|
d4799e0dc2
|
Remove default pool, it's used automatically anyway.
|
2019-01-01 13:49:24 +01:00 |
|
Haelwenn (lanodan) Monnier
|
1e6c102bfc
|
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
|
2018-12-31 19:50:14 +01:00 |
|
kaniini
|
90e157ef80
|
Merge branch 'features/admin-api-user-views' into 'develop'
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
|
2018-12-31 15:49:34 +00:00 |
|
kaniini
|
1b1e928667
|
Merge branch 'docs/admin-api' into 'develop'
Add docs/Admin-API.md
See merge request pleroma/pleroma!611
|
2018-12-31 15:49:01 +00:00 |
|
kaniini
|
ede3fd7459
|
Merge branch 'maintenance/copyright-2019' into 'develop'
update copyright years to 2019
See merge request pleroma/pleroma!613
|
2018-12-31 15:43:07 +00:00 |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
2018-12-31 15:41:47 +00:00 |
|
Haelwenn (lanodan) Monnier
|
286632dfa2
|
Add docs/Admin-API.md
[ci skip]
|
2018-12-31 12:27:46 +01:00 |
|