summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-27user: fix up notification last calculation [NOT related to upstream]William Pitcock
2018-08-27Merge branch 'feature/relay' into 'develop'lambda
message relay Closes #144 See merge request pleroma/pleroma!264
2018-08-27Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda
activitypub: filter destination list for announce activities differently than normal (closes #164) Closes #164 See merge request pleroma/pleroma!227
2018-08-26Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini
Add emoji to local user profiles. Closes #202 See merge request pleroma/pleroma!271
2018-08-26tests: fix formattingWilliam Pitcock
2018-08-26Merge branch 'bugfix/formatting' into 'develop'kaniini
fix formatting See merge request pleroma/pleroma!301
2018-08-26fix formattingWilliam Pitcock
2018-08-26Merge branch 'tests/notification-smoketests' into 'develop'kaniini
tests: add notification smoketests (ref #265) See merge request pleroma/pleroma!300
2018-08-26tests: add notification smoketests (ref #265)William Pitcock
2018-08-26Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini
common api: properly handle replying to orphaned threads See merge request pleroma/pleroma!299
2018-08-26common api: handle replying to orphaned threadsWilliam Pitcock
2018-08-26Merge branch 'login-with-email' into 'develop'kaniini
When logging in, try treating the login as an email Closes #245 See merge request pleroma/pleroma!295
2018-08-26Merge branch 'develop' into 'feature/relay'kaniini
# Conflicts: # lib/pleroma/web/activity_pub/utils.ex
2018-08-26Merge branch 'update-pleroma-frontend' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!298
2018-08-26Merge branch 'improve-example-caddyfile' into 'develop'kaniini
Improve example Caddyfile See merge request pleroma/pleroma!296
2018-08-26Merge branch 'remove-unused-settings' into 'develop'kaniini
Remove unused settings See merge request pleroma/pleroma!297
2018-08-26update pleroma frontendhakabahitoyo
2018-08-26remove unused settings from /api/statusnet/confighakabahitoyo
2018-08-26remove unused settingshakabahitoyo
2018-08-26Improve example Caddyfileshibayashi
2018-08-25When logging in, try treating the login as an emailEkaterina Vaartis
Closes #245
2018-08-25Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini
twitter api: provide object descriptions as attachment description field See merge request pleroma/pleroma!293
2018-08-25twitter api: provide object descriptions as attachment description fieldWilliam Pitcock
2018-08-24Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!292
2018-08-24update pleroma frontendWilliam Pitcock
2018-08-24Merge branch 'feature/tls-sni-support' into 'develop'kaniini
http: fix TLS server name indication Closes #261 See merge request pleroma/pleroma!291
2018-08-24http: fix TLS server name indicationWilliam Pitcock
by default, hackney only sent TLS server name indication if TLS was locked to TLS 1.2. since there are many instances out there not speaking TLS 1.2, it is not acceptable to lock SNI to TLS 1.2. closes #261
2018-08-24Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini
formatter: fix single char local nicknames Closes #163 See merge request pleroma/pleroma!290
2018-08-24tests: formattingWilliam Pitcock
2018-08-24Merge branch 'config/fe-collapse-subject' into 'develop'kaniini
fe config: add collapse_message_with_subject fe option See merge request pleroma/pleroma!289
2018-08-24formatter: adjust regexp captures to match local users with single character ↵William Pitcock
nicknames (closes #163)
2018-08-24test: add testcase for formatter issue #163William Pitcock
2018-08-24fe config: add collapse_message_with_subject fe optionWilliam Pitcock
2018-08-24Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into ↵kaniini
'develop'" This reverts merge request !288
2018-08-24Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini
add collapseMessageWithSubject in config See merge request pleroma/pleroma!288
2018-08-24add collapseMessageWithSubject in confighakabahitoyo
2018-08-23Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini
Better error handling in /api/v1/suggestions See merge request pleroma/pleroma!287
2018-08-23Merge branch 'develop' into 'develop'Haelwenn
Add an OpenRC service See merge request pleroma/pleroma!285
2018-08-23Add an OpenRC servicevaartis
2018-08-23debughakabahitoyo
2018-08-23Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini
security: activitypub: reject activities with bogus ids See merge request pleroma/pleroma!286
2018-08-23formattingWilliam Pitcock
2018-08-23tests: add a testcase for verifying that objects without a valid ID are ↵William Pitcock
always rejected
2018-08-23transmogrifier: reject activities lacking a valid IDWilliam Pitcock
2018-08-22fixed notifications API completely breaking if there's a like forHenry Jameson
missing (deleted) post.
2018-08-22Run mix formatHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier
2018-08-21Merge branch 'feature/peertube_2' into 'develop'kaniini
rebase/update of feature/peertube See merge request pleroma/pleroma!217
2018-08-21Merge branch 'sanitize-bio' into 'develop'kaniini
mastodon api: sanitize the bio HTML See merge request pleroma/pleroma!282
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 22:52:11 +0000