summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-07Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'lambda
webfinger: handle situations where the well-known endpoint returns HTML See merge request pleroma/pleroma!94
2018-04-07Merge branch 'fix/follow-import-by-uri' into 'develop'lambda
Follow import: allow URI in addition to screen_name. See merge request pleroma/pleroma!96
2018-04-07Follow import: allow URI in addition to screen_name.eal
2018-04-06XML: use try/catch with XPath functionsWilliam Pitcock
2018-04-06Accept port number in urls.lain
2018-04-05MastodonAPI search: return only create activities.lain
2018-04-05Delete Caddyfilelambda
It doesn't work correctly.
2018-04-05Merge branch 'develop' into 'develop'lambda
Fix failure to serve media from custom upload path See merge request pleroma/pleroma!95
2018-04-05Fix failure to serve media from custom upload pathRX14
2018-04-04TwitterAPI: Don't put follows into the public tls.lain
2018-04-04Handle + in links.lain
2018-04-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-03Use user url in mention if we have it.lain
2018-04-02Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'lambda
Bring mastofe up to date See merge request pleroma/pleroma!93
2018-04-02Bring mastofe up to dateMorgan Bazalgette
Commit https://git.pleroma.social/tyge/mastofe/commit/5edce2030238293463c041537da4aaeea5cb3875 summary: ``` * 5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD) |\ | * 2c51bc0c - (4 hours ago) Add missing rejection handling for Promises (#7008) - unarist (upstream/master) | * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith | * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith | * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi | * b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov | * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82 | * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko | * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko | * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood | * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi | * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith * | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette * | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette * | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette * | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette * | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette * | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette * | 00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette |\ \ | |/ | * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82 * | 05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette \ \ |/ * 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak ```
2018-04-02Load all users at once in timelines.lain
2018-04-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-02Use context_ids directly if we have them.lain
2018-04-02Generates contexts and ids on insertion time.lain
2018-04-02Pre-fetch conversation ids.lain
2018-04-02Merge branch 'fix-107' into 'develop'lambda
masto api: run emojis through mediaproxy Closes #107 See merge request pleroma/pleroma!92
2018-04-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-02Fail faster.lain
2018-04-02Fix some test stuff.lain
2018-04-02Add mock.lain
2018-04-02masto api: run emojis through mediaproxyMorgan Bazalgette
fixes #107
2018-04-01Respond to proper ActivityPub type.lain
2018-04-01Merge branch 'mastofe-f48f11d4' into 'develop'lambda
update mastofe See merge request pleroma/pleroma!90
2018-04-01update mastofeMorgan Bazalgette
2018-04-01Merge branch 'feature/cors' into 'develop'lambda
web endpoint: better document CORS stuff with nginx See merge request pleroma/pleroma!82
2018-04-01Merge branch 'feature/mastodon-search-tags' into 'develop'lambda
mastodon search api: implement a reasonable hashtags stub See merge request pleroma/pleroma!89
2018-04-01Merge branch 'feature/upload-limit' into 'develop'lambda
config: make the upload limit configurable See merge request pleroma/pleroma!88
2018-04-01Fix conflictKANEKO Yoshitaka
2018-04-01revert to modified pleroma feKANEKO Yoshitaka
2018-04-01mastodon search api: implement a reasonable hashtags stubWilliam Pitcock
2018-04-01nginx: document how to enable CORS supportWilliam Pitcock
2018-03-31config: make the upload limit configurableWilliam Pitcock
2018-03-31Merge branch 'new-mastofe' into 'develop'lambda
Bring Mastodon frontend up-to-date See merge request pleroma/pleroma!87
2018-03-31Use correct linefeed.lain
2018-03-31Small fix.lain
2018-03-31Fix typo.lain
2018-03-31Modify newlines.lain
2018-03-31Remove inspect.lain
2018-03-31Proper info.lain
2018-03-31No tabs.lain
2018-03-31Don't fetch anything except ap_id for follower / followinglain
collections. Should speed up the queries because ecto doesn't have to parse the json.
2018-03-31Gopher: Add like / repeat count.lain
2018-03-31Remove pl-dark-masto-fe, add preloading for common scriptsMorgan Bazalgette
2018-03-31Update with mastofe repoMorgan Bazalgette
2018-03-31Bring Mastodon frontend up-to-dateMorgan Bazalgette
with my fork of it, @ https://git.pleroma.social/howl/mastofe .
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 00:12:17 +0000