rinpatch
|
9a23f8f3ea
|
Add tests and fix a typo in docs
|
2019-02-08 20:23:26 +03:00 |
|
rinpatch
|
38ff9b3568
|
fix typo in config.md
|
2019-02-08 15:12:44 +03:00 |
|
rinpatch
|
7356659273
|
wow
|
2019-02-08 15:12:13 +03:00 |
|
rinpatch
|
f88dec8b33
|
What idiot did that? (me)
|
2019-02-08 13:16:50 +03:00 |
|
rinpatch
|
6c21f5aa16
|
Merge branch 'develop' into feature/keyword-policy
|
2019-02-08 13:12:33 +03:00 |
|
rinpatch
|
8a0b755c19
|
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
|
2019-02-08 13:12:09 +03:00 |
|
rinpatch
|
2174f6eb4f
|
Add default config for keyword policy
|
2019-02-08 12:48:39 +03:00 |
|
rinpatch
|
46aa8c18a2
|
Add keyword policy
|
2019-02-08 12:38:24 +03:00 |
|
kaniini
|
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 |
|
kaniini
|
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 |
|
hakabahitoyo
|
902c72bb56
|
Mark streaming feature for Apps in README.md
|
2019-02-07 11:04:37 +09:00 |
|
Hakaba Hitoyo
|
063739054e
|
Update README.md
|
2019-02-07 01:15:27 +00:00 |
|
kaniini
|
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 |
|
Mark Felder
|
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 |
|
Haelwenn
|
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 |
|
William Pitcock
|
26670b09a7
|
tests: add a rich media card that contains all relevant fields
|
2019-02-06 18:27:55 +00:00 |
|
kaniini
|
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 |
|
William Pitcock
|
6eb8c1eb92
|
test: add some regression tests for the rich media card rendering
|
2019-02-06 18:12:26 +00:00 |
|
William Pitcock
|
65a4b9fbea
|
mastodon api: rich media: don't clobber %URI struct with a string
|
2019-02-06 18:02:15 +00:00 |
|
Haelwenn
|
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 |
|
Michael Loftis
|
ab80c8ebb8
|
adds a couple of explicit examples for ExSyslogger
|
2019-02-06 17:54:30 +00:00 |
|
rinpatch
|
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 |
|
href
|
f753043ce0
|
Fix if clause in activity_pub user_view
|
2019-02-06 18:42:19 +01:00 |
|
Michael Loftis
|
43b3f9e96e
|
rids the duplicate timestamp from default ExSyslogger config
|
2019-02-06 17:34:09 +00:00 |
|
lambda
|
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 |
|
lain
|
78a51f4dd4
|
update frontend
|
2019-02-06 10:40:01 +01:00 |
|
eugenijm
|
035eaeb9b8
|
Allow to configure visibility for admin and moderator badges
|
2019-02-06 06:18:05 +03:00 |
|
eugenijm
|
398c81f9c8
|
Add is_admin and is_moderator boolean fields to the user view
|
2019-02-06 02:10:06 +03:00 |
|
rinpatch
|
c46490b199
|
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rich media: parser: reject any data which cannot be explicitly encoded into JSON
Closes #596
See merge request pleroma/pleroma!779
|
2019-02-05 21:01:20 +00:00 |
|
William Pitcock
|
d83dbd9070
|
rich media: parser: reject any data which cannot be explicitly encoded into JSON
|
2019-02-05 20:50:57 +00:00 |
|
kaniini
|
d120aa63f0
|
Merge branch 'fix-dm-index' into 'develop'
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
|
2019-02-05 20:27:31 +00:00 |
|
kaniini
|
681ba1e52f
|
Merge branch 'feature/ap-c2s-whoami' into 'develop'
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
|
2019-02-05 20:26:31 +00:00 |
|
kaniini
|
00d572fd58
|
Merge branch 'testfix/twitter-api' into 'develop'
test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778
|
2019-02-05 20:13:38 +00:00 |
|
William Pitcock
|
73e6a1f1dd
|
test: twitterapi: fix another possible test failure case
|
2019-02-05 20:08:16 +00:00 |
|
kaniini
|
eb2b1960e0
|
Merge branch 'feature/split-hide-network-v2' into 'develop'
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
|
2019-02-05 18:56:59 +00:00 |
|
kaniini
|
ecdb0b7f57
|
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
mastodon api: fix rendering of cards without image URLs (closes #597)
Closes #597
See merge request pleroma/pleroma!777
|
2019-02-05 18:53:43 +00:00 |
|
William Pitcock
|
c4d317ccb6
|
test: twitterapi: fix the test breakage for real
|
2019-02-05 18:49:02 +00:00 |
|
William Pitcock
|
1d94b67e40
|
mastodon api: fix rendering of cards without image URLs (closes #597)
|
2019-02-05 18:30:27 +00:00 |
|
lambda
|
f8b831ecfd
|
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
|
2019-02-05 11:30:18 +00:00 |
|
lambda
|
040ab352a5
|
Merge branch 'patch-2' into 'develop'
ARGLE GARBLE
See merge request pleroma/pleroma!776
|
2019-02-05 11:29:20 +00:00 |
|
lambda
|
8892f4468c
|
Merge branch 'bugfix/rich-media-nil' into 'develop'
html: don't attempt to parse nil content
See merge request pleroma/pleroma!775
|
2019-02-05 11:28:48 +00:00 |
|
Maxim Filippov
|
c48aba3c2a
|
Fix SQL
|
2019-02-05 10:22:31 +03:00 |
|
witches.live
|
47eb557617
|
ARGLE GARBLE
Update .gitignore
|
2019-02-05 07:03:54 +00:00 |
|
William Pitcock
|
a2bb5d890d
|
html: don't attempt to parse nil content
|
2019-02-05 05:06:17 +00:00 |
|
William Pitcock
|
e71ab5a10f
|
activitypub: transmogrifier: fix bare tags
|
2019-02-05 00:43:28 +00:00 |
|
William Pitcock
|
db1165f70f
|
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
|
2019-02-04 22:58:29 +00:00 |
|
lain
|
f3c8b02d65
|
Massage index until it actually does the stuff we want.
Also makes the index a lot smoler.
|
2019-02-04 23:47:29 +01:00 |
|
Maxim Filippov
|
cd6606b7f6
|
Initialize hide_network with false
|
2019-02-04 22:23:09 +03:00 |
|
Haelwenn
|
03991e7bc5
|
Merge branch 'feature/mrf-tag' into 'develop'
MRF TagPolicy engine
See merge request pleroma/pleroma!768
|
2019-02-04 19:20:11 +00:00 |
|
William Pitcock
|
7d110be119
|
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
|
2019-02-04 19:03:54 +00:00 |
|