Commit Graph

7108 Commits (29647dfd09a78fa66a605ff97119a21779d15020)
 

Author SHA1 Message Date
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Maxim Filippov 384b7dd40d Fix response
5 years ago
Maxim Filippov f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
5 years ago
Ivan Tashkinov 847c7f02f5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Ivan Tashkinov 9f28249dfb [#1260] Added changelog entry.
5 years ago
Alex S a18f1e7cd7 namings
5 years ago
Alex S 17ff63b3c3 docs fix
5 years ago
Alex S 2263c8b6b9 little fixes
5 years ago
Alex S 4faf2b1555 post for creating invite tokens in admin api
5 years ago
Haelwenn 40c968626d Merge branch 'chore/changelog-separate-1.1' into 'develop'
5 years ago
rinpatch ea6d4137da Apply suggestion to CHANGELOG.md
5 years ago
Haelwenn (lanodan) Monnier e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
Haelwenn (lanodan) Monnier 4785596a2c
markdown.ex: end suggestions list with a newline
5 years ago
Haelwenn (lanodan) Monnier d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
Haelwenn (lanodan) Monnier d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
Haelwenn (lanodan) Monnier 32d64102cb
description.exs: uncomment type for email logo
5 years ago
Haelwenn (lanodan) Monnier c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier 106afaed58
markdown.ex: do not fail if there is no children
5 years ago
Haelwenn (lanodan) Monnier e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
Haelwenn (lanodan) Monnier 50ec445b2c
description.exs: remove empty strings and arrays
5 years ago
rinpatch bf8567996c Sync develop changelog with master and create a new section for post-1.1
5 years ago
Ivan Tashkinov b17f217bf3 [#1234] Addressed code analysis issue.
5 years ago
Ivan Tashkinov b4d775161c [#1234] Undone reordering-related changes in router.ex.
5 years ago
rinpatch f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop'
5 years ago
Maxim Filippov f9dd121ad3 Admin API: Return link alongside with token on password reset
5 years ago
Maxim Filippov e686f9be81 Apply suggestion to CHANGELOG.md
5 years ago
Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Haelwenn (lanodan) Monnier 7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
Haelwenn (lanodan) Monnier 35dcea3e13
Remove [true,false] for booleans, it is implicit
5 years ago
feld 764931fc9f Merge branch 'deps/update-tesla' into 'develop'
5 years ago
Maxim Filippov 228bfd8a70 Bump elixir version to ~> 1.8
5 years ago
Maksim Pechnikov 0447c42715 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
rinpatch 79376abae3 Merge branch 'support/package_versions' into 'develop'
5 years ago
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
5 years ago
Maksim Pechnikov d201eec45c fixed ecto version
5 years ago
rinpatch 8d812c28a7 Update Tesla to 1.3
5 years ago
Maksim Pechnikov 7dd51652f9 Merge branch 'develop' into issue/733
5 years ago
rinpatch 7318095657 Merge branch 'fix-notification-warnings' into 'develop'
5 years ago
Steven Fuchs 6193157f19 Fix notification warnings
5 years ago
Haelwenn 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
5 years ago
rinpatch 95a4a19417 Merge branch 'support/tests' into 'develop'
5 years ago
rinpatch 1fc8fabecf Merge branch 'eliminate-test-errors' into 'develop'
5 years ago
Steven Fuchs 80c5c3495b remove remaining errors from tests
5 years ago
Roman Chvanikov 9fa2586abd Refactor SubscriptionNotificationView
5 years ago
rinpatch bb6d172e74 Merge branch 'deps/update-oban' into 'develop'
5 years ago
Roman Chvanikov e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders
5 years ago