summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-10Order masto searches by date.lain
2018-04-10Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec See merge request pleroma/pleroma!104
2018-04-10Merge branch 'feld-varnish' into 'develop'lambda
Remove attempted caching of toots See merge request pleroma/pleroma!106
2018-04-10Remove attempted caching of tootsMark Felder
This does not work as expected. We should not attempt to be clever here. Varnish will do the right thing if we just teach Pleroma to set headers properly for content we know can be cached.
2018-04-10Merge branch 'patch-1' into 'develop'lambda
Indentation for Apache vhost See merge request pleroma/pleroma!105
2018-04-10Indentation for Apache vhostStanislas
2018-04-09Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ecMorgan Bazalgette
2018-04-09Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda
user: strip leading @ from user query when searching for users if present Closes #117 See merge request pleroma/pleroma!99
2018-04-09Merge branch 'develop' into 'develop'lambda
Fix max upload size in nginx config. See merge request pleroma/pleroma!102
2018-04-09user: strip leading @ from user query when searching for users if presentWilliam Pitcock
closes #117
2018-04-09Merge branch 'develop' into 'develop'lambda
Apache config for everything on one host. See merge request pleroma/pleroma!103
2018-04-08Apache config for everything on one host. nepfag
2018-04-08Fix max upload size in nginx config.Hector A. Escobedo
The built-in nginx default does not allow users to upload images larger than 1 MB. This increases the maximum request size to match the default Pleroma config upload_limit parameter. Some helpful comments were also added.
2018-04-08Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda
mastodon api emulation improvements for tootstream Closes #101 See merge request pleroma/pleroma!100
2018-04-08Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda
MastoAPI: Persist frontend timelines and settings. Closes #113 See merge request pleroma/pleroma!98
2018-04-07mastodon api: report version as the Mastodon API version supported with the ↵William Pitcock
real version in parenthesis
2018-04-07mastodon api: implement /api/v1/lists stubWilliam Pitcock
2018-04-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-07Only search in public data for now.lain
This should be the data the user is allowed to see later, but this will stop accidental private message leaks.
2018-04-07Update Readme.lain
2018-04-07MastoAPI: Persist frontend timelines and settings.eal
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 07:36:13 +0000