phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • fbc379d689 Add CLI list users command Alex Schroeder 2019-11-17 21:58:30 +01:00
  • dedb1ad5d6 Merge branch 'revert-5c6c3026' into 'develop' rinpatch 2019-11-21 15:20:05 +00:00
  • 19b727bf8f Merge branch 'fix/mix-task-logging' into 'develop' lain 2019-11-21 15:04:19 +00:00
  • dc9303eac5 Revert "Merge branch 'patch-1' into 'develop'" rinpatch 2019-11-21 15:03:27 +00:00
  • cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-21 16:47:52 +03:00
  • 8feb5dcb42 Merge branch 'issue/1348' into 'develop' lain 2019-11-21 13:13:14 +00:00
  • 320690f7a5 Object: Use inspect to log missing preload. lain 2019-11-21 14:03:01 +01:00
  • 1680a3479e Merge branch 'fix/user-following-count' into 'develop' lain 2019-11-21 12:26:05 +00:00
  • cd8da73bbe Merge branch 'remove-useless-warning' into 'develop' lain 2019-11-21 12:22:46 +00:00
  • 8ffd1c792c
         Remove version mismatch warning Egor Kislitsyn 2019-11-21 18:22:18 +07:00
  • d38ab4bb89
         Fix user.following_count Egor Kislitsyn 2019-11-21 16:31:13 +07:00
  • edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose. Mark Felder 2019-11-20 11:55:30 -06:00
  • c65190c799 Console backend's log format should be prefixed and suffixed with newlines. This is how upstream does it by default. Mark Felder 2019-11-20 11:18:42 -06:00
  • 140a54fd4e Merge branch 'develop' into fix/mix-task-logging Mark Felder 2019-11-20 09:16:46 -06:00
  • 1c17f18329 Be specific about format for logs in test as we have tests that check it Mark Felder 2019-11-20 09:14:27 -06:00
  • 81f1c6bc47 [#1335] Added CHANGELOG.md entry. Ivan Tashkinov 2019-11-20 15:57:51 +03:00
  • 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-20 15:47:11 +03:00
  • 937d6c6b32 Merge branch 'fix/sporadic-tests' into 'develop' lain 2019-11-20 12:46:33 +00:00
  • de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. Ivan Tashkinov 2019-11-20 15:46:11 +03:00
  • 75efdb0781 Merge branch 'fix-docker-build' into 'develop' lain 2019-11-20 10:32:58 +00:00
  • 555edd01ab [#1335] User AP ID relations fetching performance optimizations. Ivan Tashkinov 2019-11-20 12:19:07 +03:00
  • 63711258ce
         Fix sporadically failing test Egor Kislitsyn 2019-11-20 14:25:00 +07:00
  • cb513a599c Allow test builds to have info and debug logs stripped Mark Felder 2019-11-19 16:21:30 -06:00
  • ff9133b978 Allow mix tasks to always run with debug logging Mark Felder 2019-11-19 16:01:17 -06:00
  • 27f73d38c0 Merge branch 'chore/bump-fe' into 'develop' rinpatch 2019-11-19 21:03:42 +00:00
  • dc8830da27 changelog: add 1.1.6 entries from stable rinpatch 2019-11-20 00:01:58 +03:00
  • 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 rinpatch 2019-11-19 19:45:20 +03:00
  • 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-19 23:22:47 +03:00
  • ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. Ivan Tashkinov 2019-11-19 23:22:10 +03:00
  • 0ba3f1ffb2 Merge branch 'release/1.1.6' into 'stable' v1.1.6 rinpatch 2019-11-19 20:04:19 +00:00
  • 1fcd579b6d benchmarks/ added favourites timeline Maksim Pechnikov 2019-11-19 21:11:15 +03:00
  • 708fd234bd fix order favorites activites Maksim Pechnikov 2019-11-19 20:19:41 +03:00
  • 34206e4d7f changelog: fix wrong header levels rinpatch 2019-11-19 19:47:03 +03:00
  • c2e9c1c8a5 bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 rinpatch 2019-11-19 19:45:20 +03:00
  • b24b848057 mix.exs: bump version to 1.1.6 rinpatch 2019-11-19 19:36:23 +03:00
  • 5386d1f49f UserEnabledPlug: fix test after backporting rinpatch 2019-11-19 19:34:44 +03:00
  • 957fb059df Add a changelog entry for email confirmation fix rinpatch 2019-11-19 19:24:45 +03:00
  • 4079ed3b75 OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug lain 2019-11-15 14:13:21 +01:00
  • 5b5f855237 UserEnabledPlug: Don't authenticate unconfirmed users. lain 2019-11-11 12:43:46 +01:00
  • ff4af8c5ee User: Don't let deactivated users authenticate. rinpatch 2019-11-19 19:22:20 +03:00
  • 3527a03e58 Add a changelog entry for oauth authorize fix rinpatch 2019-11-19 19:19:12 +03:00
  • df22197755 Check client and token in GET /oauth/authorize AkiraFukushima 2019-11-05 23:52:47 +09:00
  • b74f4260ae Fix rendering conversations when there's a malformed status rinpatch 2019-11-19 19:14:35 +03:00
  • b7bbb5445d
         remove docs/ from .dockerignore kPherox 2019-11-19 23:52:47 +09:00
  • b88dbc17c8 Fix tests Maxim Filippov 2019-11-19 22:50:24 +09:00
  • bf89e0bf38 Merge branch 'feature/admin-api/support-token-header' into 'develop' lain 2019-11-19 13:16:49 +00:00
  • 46eb160135 AdminAPI: Confirm user account, resend confirmation email Maxim Filippov 2019-11-19 20:14:02 +09:00
  • 36686f5245
         Support authentication via x-admin-token HTTP header Egor Kislitsyn 2019-11-19 15:58:20 +07:00
  • 7d727dbfec added test Maksim Pechnikov 2019-11-18 22:32:43 +03:00
  • 5cee51fac5 fix order by for fetch_favorites Maksim Pechnikov 2019-11-18 21:34:54 +03:00
  • 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-18 20:43:19 +03:00
  • aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. Ivan Tashkinov 2019-11-18 20:38:56 +03:00
  • 06151776c0 Merge branch 'docs/remove_activation_status_endpoint' into 'develop' feld 2019-11-18 16:16:27 +00:00
  • adacf1b5e1 Remove deprecated endpoint from docs that is fully removed from backend now feld 2019-11-18 16:16:27 +00:00
  • 0937895182 updated fetch_favorites Maksim Pechnikov 2019-11-18 16:56:25 +03:00
  • 9da4c88b49 fix test Maksim Pechnikov 2019-11-18 10:00:48 +03:00
  • 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites Maksim Pechnikov 2019-11-18 09:44:08 +03:00
  • e09f15b0e6 Fix user.following Roman Chvanikov 2019-11-17 17:47:14 +03:00
  • 4c23a82659 Merge branch 'develop' into feature/stories Roman Chvanikov 2019-11-17 17:16:41 +03:00
  • a829e816fd Fix setting user.info.pinned_activities Roman Chvanikov 2019-11-17 17:16:26 +03:00
  • 4df2d64b9f Merge branch 'chore/bump-fast-sanitize' into 'develop' rinpatch 2019-11-16 17:49:49 +00:00
  • fad296e432 Bump fast_sanitize rinpatch 2019-11-16 19:19:25 +03:00
  • c506cc48ef Admin API: Error when trying to update reports in the "old" format Maxim Filippov 2019-11-16 18:44:48 +09:00
  • a869c718ab Merge branch 'chore/changelog-sync-' into 'develop' rinpatch 2019-11-15 22:03:28 +00:00
  • da28bf8fdd Sync the changelogs between develop and stable rinpatch 2019-11-16 01:02:08 +03:00
  • 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop' kaniini 2019-11-15 20:29:38 +00:00
  • b9041c2097 added recount unread notifications to markers Maksim Pechnikov 2019-11-15 22:10:41 +03:00
  • 9e3868425a Merge branch 'mix-task-warning' into 'develop' rinpatch 2019-11-15 19:38:52 +00:00
  • 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-15 21:40:14 +03:00
  • c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. Ivan Tashkinov 2019-11-15 21:38:54 +03:00
  • c9a06b14ab Add test kPherox 2019-11-15 23:55:28 +09:00
  • 22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop' rinpatch 2019-11-15 14:11:48 +00:00
  • 234c27cb20 Documentation: Add warning about database mix tasks. lain 2019-11-15 14:30:59 +01:00
  • f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug lain 2019-11-15 14:13:21 +01:00
  • 13b6aefd59 Merge branch 'feature/mrf-object-age-policy' into 'develop' lain 2019-11-15 12:44:54 +00:00
  • 075789c442 Apply suggestion to CHANGELOG.md lain 2019-11-15 12:31:09 +00:00
  • 72d2557e11 Add fieldsLimit to metadata of nodeinfo kPherox 2019-11-15 18:51:55 +09:00
  • 7c59bc9ef9 fix credo Ariadne Conill 2019-11-14 20:18:45 -06:00
  • 0fd38b937b Resolve conflict Roman Chvanikov 2019-11-15 04:59:27 +03:00
  • eecd64cc07 object age policy: remove debug logging Ariadne Conill 2019-11-14 19:56:14 -06:00
  • 2469880a2b add changelog entry for MRF ObjectAgePolicy Ariadne Conill 2019-11-14 19:49:25 -06:00
  • 5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported Ariadne Conill 2019-11-14 19:48:10 -06:00
  • 29f49bf5fa docs: document MRF ObjectAgePolicy Ariadne Conill 2019-11-14 18:31:30 -06:00
  • 1d33eeca72 config: add configuration for MRF ObjectAgePolicy Ariadne Conill 2019-11-14 18:26:06 -06:00
  • 114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance Maxim Filippov 2019-11-14 23:45:29 +09:00
  • 30af5da330 Admin API: list all statuses from a given instance Maxim Filippov 2019-11-14 23:44:07 +09:00
  • 09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop' rinpatch 2019-11-14 14:40:37 +00:00
  • 94f1cfced8 format the code rinpatch 2019-11-14 17:26:59 +03:00
  • 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' feld 2019-11-14 13:35:41 +00:00
  • 574369b42d Merge branch 'ci/disable-trace' into 'develop' rinpatch 2019-11-14 13:26:15 +00:00
  • 2861f97e46 ci: disable --trace for unit tests rinpatch 2019-11-14 16:06:08 +03:00
  • 3c0abfca53
         Merge remote-tracking branch 'upstream/develop' into feature/move-activity Egor Kislitsyn 2019-11-14 16:39:45 +07:00
  • 6085c71bd1 Merge branch 'reactions' into 'develop' rinpatch 2019-11-14 08:47:10 +00:00
  • 7a322713c3 Update CHANGELOG.md lain 2019-11-14 08:21:06 +00:00
  • f74bb1d0fc Merge branch 'static-fe-object-id' into 'develop' lain 2019-11-13 17:37:48 +00:00
  • 3c60adbc1f Support redirecting by activity UUID in static FE as well. Phil Hagelberg 2019-11-12 17:33:54 -08:00
  • 0867cb083e Support redirecting by object ID in static FE. Phil Hagelberg 2019-11-12 17:19:46 -08:00
  • 60cc5a7750 Merge branch 'fix-rate-limiter-test' into 'develop' lain 2019-11-13 14:27:37 +00:00
  • 24d5f9cbe0 Merge branch 'fix-docs-formatting' into 'develop' rinpatch 2019-11-13 12:08:11 +00:00
  • 3350cd8d96
         Fix formatting in OpenBSD install manual Egor Kislitsyn 2019-11-13 18:48:53 +07:00