| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-01-22 | Update MastoFE bundle to 2020-01-22 | Haelwenn (lanodan) Monnier | |
| 2020-01-22 | Merge branch 'develop' into admin-be | Alexander Strizhakov | |
| 2020-01-22 | Revert "Update AdminFE build" | Alexander Strizhakov | |
| This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383 | |||
| 2020-01-21 | Last AdminFE update was accidentally built from master, not develop | Mark Felder | |
| 2020-01-21 | Update AdminFE build | Mark Felder | |
| 2020-01-21 | Merge branch 'develop' into admin-be | Alexander Strizhakov | |
| 2020-01-15 | [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. | Ivan Tashkinov | |
| 2020-01-10 | dynamic_configuration renaming | Alexander Strizhakov | |
| and moving it from instance settings | |||
| 2020-01-10 | Update AdminFE build | Alexander Strizhakov | |
| 2020-01-10 | [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵ | Ivan Tashkinov | |
| migrated existing OAuth records. Adjusted tests. | |||
| 2020-01-09 | Update AdminFE build | Mark Felder | |
| 2019-12-12 | Merge branch 'feature/native-captcha' into 'develop' | lain | |
| Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060 | |||
| 2019-12-12 | Update frontend | lain | |
| 2019-12-12 | Revert "Merge branch 'admin-scope-support-code' into 'develop'" | lain | |
| This reverts merge request !2055 | |||
| 2019-12-12 | Merge branch 'develop' into feature/report-notes | Maxim Filippov | |
| 2019-12-11 | Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. | Ivan Tashkinov | |
| 2019-12-10 | [ActivityPub] Configurable ActivityPub actor type | Hakaba Hitoyo | |
| 2019-12-08 | HTML: Compile Scrubbers on boot | rinpatch | |
| This makes it possible to configure their behavior on OTP releases. | |||
| 2019-12-08 | Merge branch 'develop' into issue/1276 | Maksim Pechnikov | |
| 2019-12-05 | Merge branch 'develop' into issue/1276 | Maksim Pechnikov | |
| 2019-12-04 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex | |||
| 2019-12-04 | Add report notes | Maxim Filippov | |
| 2019-12-02 | Merge branch 'feature/move-activity' into 'develop' | lain | |
| Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883 | |||
| 2019-11-30 | Merge branch 'remove-info-from-users' into 'develop' | rinpatch | |
| Removed users.info field See merge request pleroma/pleroma!2006 | |||
| 2019-11-29 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # mix.lock | |||
| 2019-11-28 | Migrations: Set users.following_count to NOT NULL | lain | |
| Also set following_count for local users to the correct value and for remote users to 0. | |||
| 2019-11-23 | Removed users.info and remaining usages. | Ivan Tashkinov | |
| 2019-11-21 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs | |||
| 2019-11-21 | Merge branch 'issue/1348' into 'develop' | lain | |
| [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937 | |||
| 2019-11-20 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations | |||
| 2019-11-20 | [#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵ | Ivan Tashkinov | |
| UserRelationship-related functionality. | |||
| 2019-11-19 | bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 | rinpatch | |
| 2019-11-18 | [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵ | Ivan Tashkinov | |
| EctoEnum. | |||
| 2019-11-15 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
| 1335-user-api-id-fields-relations | |||
| 2019-11-15 | [#1335] Reorganized `users.mutes` as relation to UserMute entity. | Ivan Tashkinov | |
| 2019-11-14 | Merge remote-tracking branch 'upstream/develop' into feature/move-activity | Egor Kislitsyn | |
| 2019-11-14 | Merge branch 'reactions' into 'develop' | rinpatch | |
| Emoji Reactions See merge request pleroma/pleroma!1662 | |||
| 2019-11-12 | Add `allow_following_move` setting to User | Egor Kislitsyn | |
| 2019-11-10 | [#1335] User: refactored :blocks field into :blocked_users relation. | Ivan Tashkinov | |
| Introduced UserBlock. | |||
| 2019-11-10 | Merge branch 'develop' into 'reactions' | lain | |
| # Conflicts: # CHANGELOG.md | |||
| 2019-11-09 | Visually separate header. | Phil Hagelberg | |
| 2019-11-09 | Move static-fe CSS to a separate file. | Phil Hagelberg | |
| 2019-11-09 | Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 | rinpatch | |
| 2019-11-08 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-11-04 | excluded invisible actors from gets /api/v1/accounts/:id | Maksim Pechnikov | |
| 2019-11-04 | Merge branch 'develop' into issue/1276 | Maksim Pechnikov | |
| 2019-11-03 | fix migrate | Maksim Pechnikov | |
| update migrate | |||
| 2019-11-02 | Merge branch 'fix/migration-schema' into 'develop' | Haelwenn | |
| Fix bookmark migration using a query with a schema See merge request pleroma/pleroma!1923 | |||
| 2019-10-31 | Merge branch 'develop' into issue/1276 | Maksim Pechnikov | |
| 2019-10-31 | Merge branch 'refactor/db-add-defaults' into 'develop' | lain | |
| Set defaults to fields with NULL values Closes #1358 See merge request pleroma/pleroma!1914 | |||
 |
index : pleroma.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |