aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-17Merge branch 'chore/changelog-separate-1.1' into 'develop'Haelwenn
Sync develop changelog with master and create a new section for post-1.1 changes See merge request pleroma/pleroma!1689
2019-09-17Apply suggestion to CHANGELOG.mdrinpatch
2019-09-17markdown.ex: put two-spaces before the description-newlineHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: end suggestions list with a newlineHaelwenn (lanodan) Monnier
Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…
2019-09-17markdown.ex: \n\n on >1 suggestions, 2-spaces on oneHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: Make suggestion(s) plural only if on >1Haelwenn (lanodan) Monnier
2019-09-17description.exs: uncomment type for email logoHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings on descriptionsHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: do not fail if there is no childrenHaelwenn (lanodan) Monnier
2019-09-17docs/markdown.ex: do no print empty suggestionsHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings and arraysHaelwenn (lanodan) Monnier
2019-09-18Sync develop changelog with master and create a new section for post-1.1rinpatch
changes
2019-09-17[#1234] Addressed code analysis issue.Ivan Tashkinov
2019-09-17[#1234] Undone reordering-related changes in router.ex.Ivan Tashkinov
2019-09-17Merge branch 'feature/bump-elixir-verstion' into 'develop'rinpatch
Bump elixir version to ~> 1.8 See merge request pleroma/pleroma!1686
2019-09-17Admin API: Return link alongside with token on password resetMaxim Filippov
2019-09-17Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-09-17[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17docs/markdown.ex: child header as "- key (type): description"Haelwenn (lanodan) Monnier
2019-09-17Remove [true,false] for booleans, it is implicitHaelwenn (lanodan) Monnier
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
Update Tesla to 1.3 Closes #1262 See merge request pleroma/pleroma!1684
2019-09-17Bump elixir version to ~> 1.8Maxim Filippov
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.Ivan Tashkinov
2019-09-17Merge branch 'support/package_versions' into 'develop'rinpatch
[#1263] fixed ecto version See merge request pleroma/pleroma!1685
2019-09-17Merge branch 'feature/return-total-for-reports' into 'develop'rinpatch
Admin API: Return total for reports See merge request pleroma/pleroma!1628
2019-09-17fixed ecto versionMaksim Pechnikov
2019-09-17Update Tesla to 1.3rinpatch
This version includes a couple of fixes, adds Gun and Mint adapters and removes 0.x -> 1.0 config migrator, which for some reason fails under certain conditions. I had to set `override: true` because Quack pins Tesla to `1.2.0`, but I have looked through the source code and verified that updating Tesla doesn't break anything there.
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17Merge branch 'fix-notification-warnings' into 'develop'rinpatch
Fix notification warnings See merge request pleroma/pleroma!1683
2019-09-17Fix notification warningsSteven Fuchs
2019-09-17Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn
Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677
2019-09-17Merge branch 'support/tests' into 'develop'rinpatch
add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627
2019-09-17Merge branch 'eliminate-test-errors' into 'develop'rinpatch
remove remaining errors from tests See merge request pleroma/pleroma!1682
2019-09-17remove remaining errors from testsSteven Fuchs
2019-09-17Refactor SubscriptionNotificationViewRoman Chvanikov
2019-09-17Merge branch 'deps/update-oban' into 'develop'rinpatch
Update oban to 0.8.1 Closes #1261 See merge request pleroma/pleroma!1680
2019-09-17Move pleroma_api controllers into controllers sub-foldersRoman Chvanikov
2019-09-17Rename SubscriptionNotificationController list and get actions to index and showRoman Chvanikov
2019-09-17Cleanup PleromaAPIControllerRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-17Apply suggestion to lib/pleroma/web/router.exRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17[#1260] Rate-limiting for create authentication and related requests.Ivan Tashkinov
2019-09-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-09-17Update oban to 0.8.1rinpatch
This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam
2019-09-16Move subscription notifications to a separate controllerRoman Chvanikov
2019-09-16Code style fixesRoman Chvanikov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 06:45:41 +0000