Commit Graph

Select branches

Hide Pull Requests

0.9.9-beta-3

1427-oauth-graceful-admin-scope

1478-oauth-admin-scopes-tweaks

Move-fqa-to-docs

adminfe

adminfe-build

bbs

bugfix/1442-dont-return-nil-for-following-count

bugfix/68-twitterAPI-add-in_reply_to_screen_name

bugfix/filter_id

chore/maint-1.1/enable-otp-releases

chore/remove-sporadically-failing-tests

config/benchmark

custom-resources-folder

develop

disable-attachment-links

doc/add-lighttpd

docs/installation-merge

dtluna/pleroma-bugfix/repeated-follow-unfollow

failing-search-fixes-part-2

fallback-redirect

feature/1392-support-irreversible-filters

feature/1482-activity_pub_transactions

feature/activitypub

feature/activitypub-c2s-source

feature/add-task-to-create-custom-emoji-list

feature/atom-feed-pagination

feature/attachments-cleanup

feature/backup

feature/blocks

feature/chat-enhanced

feature/compile_get

feature/diaspora

feature/emoji-vacuum

feature/generic-actor

feature/groups

feature/make-startup-errorless-again

feature/otp-releases

feature/peertube

feature/reply-filtering-mk3

feature/sse_streaming

feature/static-fe

feature/streaming

feature/tag_feed

feature/update-url-regex

feature/user-whitelist

features/apc2s-media-upload-object

features/flavour-change-get

features/masto-api/multi-tag-timelines

features/mastoapi/2.7.0-registration

features/notifications_exclude_types

features/openrc-console

fed-tests

fix-admin-api-scope

fix-chat-2

fix-dokku-2

fix/activities-failing-to-render-with-nonexistent-object

fix/admin-api-grouped-reports-closed-reports

fix/cache-object-after-updates

fix/disable-rate-limiter-for-socket-localhost

fix/grouped-reports-for-deprecated-format

fix/instance-gen-config

fix/mastoapi-mutes

fix/release-envvars

fix/rm-user-task

fix/update-admin-fe

flake-test

hotfix-0.9.99

hotfix-0.9.99999

integration/alex.s/gun

integration/alex.s/reply-filtering

issue/1354

issue/1383

issue/1487

keyword_policy/mgmt_api

logo-in-readme

maint-object-experiment

master

maybe-faster-search

merge-to-dev-0.9.99

migrate-to-akkoma

migration-fix

misskey-compat

mongoose-im-hints

mrf-error-handling

mrf-error-handling2

nb-migration-fix

nb-testing

neckbeard

notifications-from-account

oauth-scopes-tweaks-and-tests

object-and-activity-ap-id

object-id-column

origin/neckbeard

panel-link-admin-fe

patch420

refactor/2

refactor/error-view

refactor/status-view

refactor/user-controller

release-0.9.9

release/1.0

release/1.0.1

release/1.0.2

release/1.0.3

release/1.0.4

release/1.0.5

release/1.0.6

release/1.1.1

release/1.1.2

release/1.1.3

release/1.1.4

release/1.1.5

release/1.1.6

release/1.1.7

release/1.1.8

remake-remodel

remote-follow-auth-fix

report-pleroma-until-husky-fixes-it

require-signature

revert-48552b38

revert-bca1512d

revert-bd89cdbe

revert/tags-releases

rinpatch/pleroma-feature/federated-pins

security/client-blocklist

security/fix-for-0.9.99999

stable

translation/errors-french

twapi-timeline-fixes

uguu

update-ci

upgrade-val

use-pg12-in-ci

user-deletion-rework

v0.9.9

v0.9.9

v0.9.99

v0.9.999

v0.9.9999

v0.9.99999

v1.0.0

v1.0.1

v1.0.2

v1.0.3

v1.0.4

v1.0.5

v1.0.6

v1.0.7

v1.0.90

v1.0.91

v1.1.0

v1.1.1

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.1.7

v1.1.8

Mono Color

• bad499b3fd Basic user deletion. Lain Iwakura 2017-12-08 17:50:11 +0100
• 35cfbf43a0 Merge branch 'fix/linkify' into 'develop' lambda 2017-12-08 12:34:03 +0000
• 40c30ab895 Merge branch 'fix/mastoapi-attachment-linking' into 'develop' lambda 2017-12-08 12:32:33 +0000
• d7da3ca05d Merge branch 'postgresetup' into 'develop' lambda 2017-12-08 12:31:14 +0000
• a3e68f0233 Allow parentheses in links. eal 2017-12-07 21:38:31 +0200
• bf91e5659f Fix HTML escape breaking some links. eal 2017-12-07 21:34:25 +0200
• 5436dbaeaf MastoAPI: don't add attachment links. eal 2017-12-07 20:44:09 +0200
• afd0ea37f3 Add websocket upgrade to example nginx config. eal 2017-12-07 20:07:51 +0200
• 6df6ad0b42 User deletion: Remove relationships. Lain Iwakura 2017-12-07 18:13:05 +0100
• a78ae2a685 Don't follow deactivated users. Lain Iwakura 2017-12-07 17:51:55 +0100
• b727ecc5e7 Add function to deactivate users. Lain Iwakura 2017-12-07 17:47:23 +0100
• 0ec5aeb8a7 Don't log in deactivated users. Lain Iwakura 2017-12-07 17:41:34 +0100
• e31a5ff4af Priority queue fixes. Lain Iwakura 2017-12-06 16:51:11 +0100
• 66c3813ea6 Add basic queue prioritization. Lain Iwakura 2017-12-05 18:21:30 +0100
• 72f7baa654
  Merge remote-tracking branch 'upstream/develop' into media-proxy href 2017-12-05 14:12:15 +0100
• 08e7e249b1 Merge branch 'feature/chat' into 'develop' lambda 2017-12-05 11:27:11 +0000
• e7c2472abd Fix tests. Lain Iwakura 2017-12-05 12:18:04 +0100
• 74e92152b7 Update frontend. Lain Iwakura 2017-12-05 12:11:46 +0100
• b652dc5f2e Update frontend. Lain Iwakura 2017-12-05 11:53:12 +0100
• 1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat Roger Braun 2017-12-05 10:20:00 +0100
• 7f336cb8b1 Merge branch 'fix/odd-passwords' into 'develop' lambda 2017-12-05 09:10:37 +0000
• 5945ec84e9 Don't save user in socket, just save the name. Roger Braun 2017-12-05 10:01:36 +0100
• 69f1024bb0 Add basic channel state. Roger Braun 2017-12-05 09:36:26 +0100
• c1fa1e8844 Fix basic auth for passwords with a colon. eal 2017-12-04 22:45:16 +0200
• d01243c16e Update frontend. Lain Iwakura 2017-12-04 19:12:31 +0100
• 5c40986120 Basic backend chat. Lain Iwakura 2017-12-04 19:10:15 +0100
• 964e2dd2f0 unfuck Henry Jameson 2017-12-04 04:06:52 +0300
• 6b60f5f64a made psql script compatible with migrations or generate_config reruns Henry Jameson 2017-12-04 02:06:05 +0300
• 071f518028 reverts config gen Henry Jameson 2017-12-04 02:01:45 +0300
• a884e08271 fix Henry Jameson 2017-11-28 00:44:14 +0300
• 4071403117 fixes Henry Jameson 2017-11-28 00:42:03 +0300
• 0673511d39 first version of safe DB setup Henry Jameson 2017-11-26 20:57:49 +0300
• d08a34e88b OStatus: Add user bio as summary field Roger Braun 2017-12-03 13:34:17 +0100
• 50dca016f2 Add count index for local users. Lain Iwakura 2017-11-30 15:00:12 +0100
• 5637d163e6 MastodonAPI: Add proper user count. Lain Iwakura 2017-11-30 14:59:44 +0100
• 1cb5cbdc6c
  Improve error handling, add configuration href 2017-11-28 21:44:25 +0100
• e28c110eba
  mandatory typo fix... href 2017-11-22 19:14:03 +0100
• 5f35fdcf5d
  media proxy: good enough wip href 2017-11-22 19:06:07 +0100
• 9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop' lambda 2017-11-28 16:46:01 +0000
• 4524721fba
  Salmon: generate private key with native crypto if available. href 2017-11-28 16:50:12 +0100
• c680ae581d Return xml notice at /notice path. Lain Iwakura 2017-11-27 17:24:52 +0100
• 89a8dc7485 Merge branch 'patch-1' into 'develop' eal 2017-11-25 23:10:43 +0000
• f86fca682a fix mix typo in README.md Partial name 2017-11-25 02:42:39 +0000
• 44f7154fb9 Update frontend. Roger Braun 2017-11-24 08:37:41 +0100
• 386c130769 More readme updates. Lain Iwakura 2017-11-23 16:41:09 +0100
• ecf109a0fe Add mix deps.get back to readme. Lain Iwakura 2017-11-23 16:35:03 +0100
• 44dc694882 Add configuration generation tool, update readme. Lain Iwakura 2017-11-23 16:22:20 +0100
• d16b613929 MastodonUI login: Show error message on error. Roger Braun 2017-11-23 12:06:14 +0100
• ad90da07f5 untoot. Roger Braun 2017-11-22 16:10:03 +0100
• 698a75cb39 Merge branch 'develop' into 'develop' lambda 2017-11-22 14:19:27 +0000
• d7b6fa79cb Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.) Hyper! (Stitch) 2017-11-22 14:12:04 +0000
• bcc4e73e51 Update README.md lambda 2017-11-22 13:42:27 +0000
• 0716f8e626 Update frontend. Roger Braun 2017-11-22 12:19:13 +0100
• 1625021a9c Merge branch 'fix/self-follow' into 'develop' eal 2017-11-21 23:09:59 +0000
• e9037ffc8d Do not include user in their own follower count. eal 2017-11-21 15:33:09 +0200
• 9b35a4e850 Merge branch 'fix/mastoapi-attachment-count' into 'develop' eal 2017-11-20 20:55:27 +0000
• fa19de97ba MastoAPI: no more than 4 attachments. eal 2017-11-20 22:49:20 +0200
• dae2949bcc Fix a links... Retweet button still broken. Hyper! (Stitch) 2017-11-20 17:19:22 +0000
• 3d29fc5462 Make /api/friends/ids test deterministic. eal 2017-11-20 19:16:43 +0200
• 0c68e75b93 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-20 17:09:14 +0000
• cb071745b5 Update pl-dark-masto-fe.css, fix notification_message and retweet Hyper! (Stitch) 2017-11-20 16:54:32 +0000
• 747a68a075 Treat internal emoji like external. Roger Braun 2017-11-20 17:53:21 +0100
• cf0bbf320d MastoAPI: Add max_toot_chars. Roger Braun 2017-11-20 08:54:47 +0100
• 6900851581 Merge branch 'fix/self-follow' into 'develop' lambda 2017-11-20 07:27:10 +0000
• 8d4e7b32c9 Ensure correct state in self-unfollow. eal 2017-11-20 09:26:31 +0200
• bd921ca5d7 Fix posts being streamed to non-local websocket channels. eal 2017-11-20 07:58:43 +0200
• edc3e5bc30 Make users in tests follow themselves by default. eal 2017-11-20 07:52:02 +0200
• 4db5954786 Don't let the user unfollow their own account. eal 2017-11-20 01:21:53 +0200
• aadf54e0df Don't show the user in their own following count. eal 2017-11-20 00:31:39 +0200
• 36011fee4e Add Custom Pleroma-dark theme Hyper! (Stitch) 2017-11-19 19:07:19 +0000
• f065689407 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-19 19:04:51 +0000
• 97bb99edba Add new file Hyper! (Stitch) 2017-11-19 19:04:21 +0000
• 52aa65fe6e Federator Queue: Add seperate in/out queues. Roger Braun 2017-11-19 15:10:51 +0100
• 5ff5d583b6 MastodonAPI: Streaming fixes. Roger Braun 2017-11-19 13:47:50 +0100
• f6495abf73 Update frontend. Roger Braun 2017-11-19 13:31:09 +0100
• 0f099dac67 MastodonAPI: Add sign out. Roger Braun 2017-11-19 13:23:16 +0100
• 40ca379357 Fix flakey test. Roger Braun 2017-11-19 13:07:29 +0100
• c336a13d2c MastoAPI: Only return create activties in contexts. Roger Braun 2017-11-19 12:59:23 +0100
• a6f65083ae Merge branch 'feature/fix-warnings' into 'develop' lambda 2017-11-19 11:50:02 +0000
• 59770c3f5c
  Fix all compilation warnings Thog 2017-11-19 02:22:07 +0100
• ed3403ad8b Merge branch 'formatting-fixes' into 'develop' lambda 2017-11-18 15:58:44 +0000
• 146ec80285 Merge branch 'fix/mastofe-login-redirect' into 'develop' eal 2017-11-18 14:38:05 +0000
• 7b397ed125 Merge branch 'sensitive-content-bit' into 'develop' eal 2017-11-18 14:34:37 +0000
• f53cdabcdf Add #nsfw tag if sensitive content bit is set eal 2017-11-18 16:30:18 +0200
• 31e4277ba5 Don't add summary if empty. eal 2017-11-18 15:25:22 +0200
• fb118b2978 Don't insert newlines to generated HTML. eal 2017-11-18 14:46:54 +0200
• 66e78c3ec4 Escape HTML instead of discarding it. eal 2017-11-18 14:43:41 +0200
• 4647bcd6e6 Don't start streamer during tests. Roger Braun 2017-11-18 12:22:07 +0100
• 9c60cc88df Redirect to Getting Started on login. eal 2017-11-16 20:47:44 +0200
• a743940463 MastoAPI: Implement all streaming functions. Roger Braun 2017-11-16 16:49:51 +0100
• 5719f69ae3 MastodonAPI: Stream fixes. Roger Braun 2017-11-16 13:48:58 +0100
• a2d7e0f4d4 Merge branch 'feature/masto-styled-login-page' into 'develop' lambda 2017-11-16 12:01:07 +0000
• 43499848d0 Small css fix. Roger Braun 2017-11-16 12:58:33 +0100
• 189513e4ff Add styles to make login page resemble mastodon's Shpuld Shpuldson 2017-11-16 13:26:56 +0200
• 8de890a0d9 Add custom emoji to Mastodon UI initial state. Roger Braun 2017-11-16 09:40:06 +0100
• 3d1360c4d6 Add mastodon emoji folder. Roger Braun 2017-11-16 09:35:14 +0100
• ced0d64d75 MastoAPI: Make attachment ids strings. Roger Braun 2017-11-15 18:58:13 +0100
• 1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop' lambda 2017-11-14 16:47:54 +0000
• 1eb7a862d2 Merge branch 'twitterapi-show-user' into 'develop' lambda 2017-11-14 16:44:25 +0000
• f9828e578c TwitterAPI: Add /users/show. eal 2017-11-14 17:34:48 +0200