moon/spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
spc-pleroma/lib/pleroma
History
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
..
activity
Bump copyright years of files changed in 2019
2019-09-18 23:21:11 +02:00
bbs
Extract status actions from MastodonAPIController into StatusController
2019-09-27 10:51:15 +07:00
captcha
use default child_specs
2019-08-14 11:55:17 -04:00
config
use default child_specs
2019-08-14 11:55:17 -04:00
conversation
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
daemons
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
docs
markdown.ex: put two-spaces before the description-newline
2019-09-17 23:05:27 +02:00
emails
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
emoji
Fix emoji tags for shareable packs to be "pack:{name}"
2019-09-25 12:34:03 +02:00
gopher
use default child_specs
2019-08-14 11:55:17 -04:00
helpers
[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
http
Handle 303 redirects
2019-07-28 20:24:39 +00:00
instances
[#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
object
object: containment: simplify the pattern match for OStatus testsuite hack
2019-10-18 15:39:15 +00:00
plugs
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
reverse_proxy
Make MediaProxy failure tracking less brutal
2019-10-11 22:52:38 +03:00
upload
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
uploaders
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
user
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
2019-10-20 20:43:18 +03:00
web
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
2019-10-20 22:29:56 +03:00
workers
federator: remove OStatus incoming document support
2019-10-18 14:50:09 +00:00
activity_expiration.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
activity.ex
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
application.ex
application: don't start Federator.init/1 anymore
2019-10-18 14:50:09 +00:00
bookmark.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
clippy.ex
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
config.ex
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
constants.ex
Move object internal fields to a constant
2019-09-18 19:24:20 +03:00
conversation.ex
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
delivery.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
emoji.ex
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
filter.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
formatter.ex
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
healthcheck.ex
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
html.ex
Add support for rel="ugc"
2019-09-19 14:56:10 +07:00
instances.ex
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
job_queue_monitor.ex
Remove :enqueued counter
2019-10-02 14:50:25 +07:00
jwt.ex
Digest emails
2019-04-20 19:42:19 +07:00
keys.ex
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
list.ex
Fix merge
2019-09-30 19:10:54 +07:00
mime.ex
Mime: detect RIFF formats (wave, webp, avi)
2019-02-04 17:44:41 +01:00
moderation_log.ex
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
notification.ex
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
2019-10-20 20:43:18 +03:00
object_tombstone.ex
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
object.ex
Fix a migration wiping user info of users that don't have any mutes
2019-10-18 15:22:07 +03:00
pagination.ex
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
password_reset_token.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
registration.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
release_tasks.ex
Load the application before executing the create task
2019-06-22 04:33:46 +03:00
repo_streamer.ex
Rework user deletion
2019-06-24 18:59:12 +00:00
repo.ex
fix format
2019-05-06 17:51:03 +00:00
scheduled_activity.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
scheduler.ex
[#1149] Introduced quantum job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
signature.ex
Move local keys out of user.info
2019-10-06 16:56:36 +03:00
stats.ex
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
thread_mute.ex
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
upload.ex
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
user_invite_token.ex
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
user.ex
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
2019-10-20 22:29:56 +03:00