3591b7c152
Update versions.
2019-04-05 22:26:08 +02:00
ef4e67d767
Fix and format.
2019-04-05 22:24:58 +02:00
d79a59c3b8
Add test.
2019-04-05 22:19:37 +02:00
337ea3e107
Merge branch 'hotfix-0.9.999'
2019-03-13 18:41:30 +01:00
480da5d026
Update version.
2019-03-13 18:40:44 +01:00
d6c70e2ce3
Update frontend
2019-03-13 18:39:20 +01:00
5e0a4d1f59
Correctly identify release.
2019-03-08 12:28:57 +01:00
7e67a29852
Merge branch 'master' of git.pleroma.social:pleroma/pleroma
2019-03-08 12:19:46 +01:00
23efad96c1
Merge branch 'hotfix-0.9.99'
2019-03-08 12:18:03 +01:00
1a64eaf554
Bump version to 0.9.99.
2019-03-08 12:11:30 +01:00
3446de3701
Add changelog.
2019-03-08 12:11:18 +01:00
57e9fe4dfc
Update frontend
2019-03-08 11:55:50 +01:00
a0f1c0246b
Merge branch 'cherry-pick-877-to-master' into 'master'
...
Cherry pick !877 to master
See merge request pleroma/pleroma!880
2019-03-01 19:37:27 +00:00
28578c6ab5
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 22:32:00 +03:00
e58596bbdc
Bump version.
2019-02-22 16:13:11 +01:00
9c10e7c78d
activitypub: sign http date header
2019-02-21 09:20:59 +01:00
9da9cacbf2
mix: add timex dependency
2019-02-21 09:20:30 +01:00
8ecd14c625
tests: fix formatting
2019-02-21 09:18:48 +01:00
84fe83c32f
fix fetching AP objects with application/json
2019-02-21 09:18:37 +01:00
e890870399
tests: add test for fetching AP objects with application/json.
2019-02-21 09:18:26 +01:00
672899381c
add nginx rewrite rule for mediaproxy
2019-02-19 17:25:20 +01:00
4de7bea00e
Remove slicing.
2019-02-19 17:21:12 +01:00
d3f8468f6f
update frontend
2019-02-19 17:09:54 +01:00
ea1e3e95ef
Revert "Do object insertion through Cachex"
...
This reverts commit 8a270b438c
2019-02-11 09:52:19 +01:00
8a270b438c
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-10 16:52:42 +01:00
1aebe8c6d9
Disable rich media by default.
2019-02-09 12:33:11 +01:00
c5f8df08a7
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
...
Split hide_network only for local users
See merge request pleroma/pleroma!781
2019-02-08 12:18:05 +00:00
ba7d7ffd80
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
...
Mark streaming feature for iOS apps in readme
See merge request pleroma/pleroma!790
2019-02-08 12:10:35 +00:00
b4271de770
Merge branch 'oauth2_strengthening' into 'develop'
...
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix
See merge request pleroma/pleroma!793
2019-02-08 12:09:43 +00:00
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
2019-02-07 22:14:06 +03:00
c2090b86b7
mark streaming feature for ios apps in readme
2019-02-07 12:01:35 +09:00
d84392c9e0
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
...
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
2019-02-07 02:19:52 +00:00
24dd0fc545
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
...
Mark streaming feature for Apps in README.md
See merge request pleroma/pleroma!789
2019-02-07 02:18:51 +00:00
902c72bb56
Mark streaming feature for Apps in README.md
2019-02-07 11:04:37 +09:00
063739054e
Update README.md
2019-02-07 01:15:27 +00:00
430f23323c
Merge branch 'rename-followings' into 'develop'
...
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
See merge request pleroma/pleroma!787
2019-02-06 22:40:24 +00:00
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
2019-02-06 18:39:13 +00:00
26670b09a7
tests: add a rich media card that contains all relevant fields
2019-02-06 18:27:55 +00:00
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
2019-02-06 18:19:47 +00:00
6eb8c1eb92
test: add some regression tests for the rich media card rendering
2019-02-06 18:12:26 +00:00
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
2019-02-06 18:02:15 +00:00
09b71a9053
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'
...
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.
See merge request pleroma/pleroma!784
2019-02-06 18:02:10 +00:00
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
2019-02-06 17:54:30 +00:00
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
2019-02-06 17:47:58 +00:00
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
43b3f9e96e
rids the duplicate timestamp from default ExSyslogger config
2019-02-06 17:34:09 +00:00
f1b72bfb70
Split hide_networ only for local users
2019-02-06 13:41:36 +03:00
3c08e20d68
Merge branch '2019-02-06-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!780
2019-02-06 09:47:36 +00:00
78a51f4dd4
update frontend
2019-02-06 10:40:01 +01:00
lain
rinpatch
William Pitcock
iodine
lambda
Ivan Tashkinov
hakabahitoyo
kaniini
Hakaba Hitoyo
Mark Felder
Haelwenn
Michael Loftis
href
Maxim Filippov