Commit graph

3747 commits

Author SHA1 Message Date
Karen Konou 6a150de3bd Add unique index and unique constraint check, uniqueness test fails 2019-02-09 20:52:11 +01:00
Karen Konou 478a05b4c9 Merged "check mute" test into the other two 2019-02-09 18:34:00 +01:00
Karen Konou 638456ce8f elixir too new for CI's mix format lol 2019-02-09 18:08:46 +01:00
Karen Konou a0d732ec55 it works!! 2019-02-09 17:47:57 +01:00
Karen Konou 4430a0ad12 added another test 2019-02-09 14:34:42 +01:00
Karen Konou 09189c3a7c Made a test! 2019-02-09 14:23:51 +01:00
Karen Konou 7e47a810a2 help i am not good with git 2019-02-08 13:22:29 +01:00
Karen Konou 5c5b228f21 Added thread unmuting (still a bit buggy maybe) 2019-02-08 13:20:40 +01:00
Karen Konou a44e532fb1 Added thread unmuting (still a bit buggy maybe) 2019-02-08 13:17:11 +01:00
Karen Konou 98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00
Karen Konou 97a2789caa resolved merge conflict 2019-02-07 23:47:13 +01:00
Karen Konou c43f414a79 Somehow fixed the repo insert [skip-ci] 2019-02-07 23:44:49 +01:00
Karen Konou 7e3ec93ed0 made a silly oopsie 2019-02-07 22:59:53 +01:00
Karen Konou 6b5032e10e made a silly oopsie 2019-02-07 22:38:54 +01:00
Karen Konou 77448de492 ugghhhh 2019-02-07 22:25:07 +01:00
Karen Konou f4ff4ffba2 Migration and some boilerplate stuff 2019-02-07 17:36:14 +01: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