Karen Konou
|
c01ef574c1
|
Refactor as per Rin's suggestions, add endpoint tests
|
6 years ago |
|
Karen Konou
|
cc21fc5f53
|
refactor, status view updating, error handling
|
6 years ago |
|
Karen Konou
|
6a150de3bd
|
Add unique index and unique constraint check, uniqueness test fails
|
6 years ago |
|
Karen Konou
|
478a05b4c9
|
Merged "check mute" test into the other two
|
6 years ago |
|
Karen Konou
|
638456ce8f
|
elixir too new for CI's mix format lol
|
6 years ago |
|
Karen Konou
|
a0d732ec55
|
it works!!
|
6 years ago |
|
Karen Konou
|
4430a0ad12
|
added another test
|
6 years ago |
|
Karen Konou
|
09189c3a7c
|
Made a test!
|
6 years ago |
|
Karen Konou
|
7e47a810a2
|
help i am not good with git
|
6 years ago |
|
Karen Konou
|
5c5b228f21
|
Added thread unmuting (still a bit buggy maybe)
|
6 years ago |
|
Karen Konou
|
a44e532fb1
|
Added thread unmuting (still a bit buggy maybe)
|
6 years ago |
|
Karen Konou
|
98ec578f4d
|
Merge branch 'develop' into feature/thread-muting
|
6 years ago |
|
Karen Konou
|
97a2789caa
|
resolved merge conflict
|
6 years ago |
|
Karen Konou
|
c43f414a79
|
Somehow fixed the repo insert [skip-ci]
|
6 years ago |
|
Karen Konou
|
7e3ec93ed0
|
made a silly oopsie
|
6 years ago |
|
Karen Konou
|
6b5032e10e
|
made a silly oopsie
|
6 years ago |
|
Karen Konou
|
77448de492
|
ugghhhh
|
6 years ago |
|
Karen Konou
|
f4ff4ffba2
|
Migration and some boilerplate stuff
|
6 years ago |
|
kaniini
|
d84392c9e0
|
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
|
6 years ago |
|
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
|
6 years ago |
|
hakabahitoyo
|
902c72bb56
|
Mark streaming feature for Apps in README.md
|
6 years ago |
|
Hakaba Hitoyo
|
063739054e
|
Update README.md
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
Haelwenn
|
1220a17146
|
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
|
6 years ago |
|
William Pitcock
|
26670b09a7
|
tests: add a rich media card that contains all relevant fields
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
6eb8c1eb92
|
test: add some regression tests for the rich media card rendering
|
6 years ago |
|
William Pitcock
|
65a4b9fbea
|
mastodon api: rich media: don't clobber %URI struct with a string
|
6 years ago |
|
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
|
6 years ago |
|
Michael Loftis
|
ab80c8ebb8
|
adds a couple of explicit examples for ExSyslogger
|
6 years ago |
|
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
|
6 years ago |
|
href
|
f753043ce0
|
Fix if clause in activity_pub user_view
|
6 years ago |
|
Michael Loftis
|
43b3f9e96e
|
rids the duplicate timestamp from default ExSyslogger config
|
6 years ago |
|
lambda
|
3c08e20d68
|
Merge branch '2019-02-06-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!780
|
6 years ago |
|
lain
|
78a51f4dd4
|
update frontend
|
6 years ago |
|
eugenijm
|
035eaeb9b8
|
Allow to configure visibility for admin and moderator badges
|
6 years ago |
|
eugenijm
|
398c81f9c8
|
Add is_admin and is_moderator boolean fields to the user view
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
d83dbd9070
|
rich media: parser: reject any data which cannot be explicitly encoded into JSON
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
00d572fd58
|
Merge branch 'testfix/twitter-api' into 'develop'
test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778
|
6 years ago |
|
William Pitcock
|
73e6a1f1dd
|
test: twitterapi: fix another possible test failure case
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
c4d317ccb6
|
test: twitterapi: fix the test breakage for real
|
6 years ago |
|
William Pitcock
|
1d94b67e40
|
mastodon api: fix rendering of cards without image URLs (closes #597)
|
6 years ago |
|
lambda
|
f8b831ecfd
|
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
|
6 years ago |
|
lambda
|
040ab352a5
|
Merge branch 'patch-2' into 'develop'
ARGLE GARBLE
See merge request pleroma/pleroma!776
|
6 years ago |
