projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
allow undoing
[akkoma]
/
priv
/
static
/
packs
/
emoji_picker.js.map
2022-01-08
FloatingGhost
Merge remote-tracking branch 'origin/patch/readd-mastof...
blob
|
commitdiff
|
raw
2022-01-08
FloatingGhost
Revert "Merge branch 'remove/mastofe' into 'develop'"
blob
|
commitdiff
|
raw
2021-12-28
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-12-27
Alex Gleason
Merge branch 'log-slow-queries' into 'develop'
blob
|
commitdiff
|
raw
2021-12-26
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-12-23
Alex Gleason
Merge branch 'warnings-as-errors' into 'develop'
blob
|
commitdiff
|
raw
2021-12-19
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-12-19
Alex Gleason
Merge branch 'v2-suggestions' into 'develop'
blob
|
commitdiff
|
raw
2021-12-19
Alex Gleason
Merge branch 'fix-search-dos' into 'develop'
blob
|
commitdiff
|
raw
2021-12-16
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-12-15
lain
Merge branch 'delete-account-fix' into 'develop'
blob
|
commitdiff
|
raw
2021-12-09
lain
Merge branch 'benchmark-fixes' into 'develop'
blob
|
commitdiff
|
raw
2021-12-07
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-12-06
lain
Merge branch 'benchmark' into 'develop'
blob
|
commitdiff
|
raw
2021-12-03
Alex Gleason
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2021-11-24
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-11-15
lain
Merge branch 'block-behavior' into 'develop'
blob
|
commitdiff
|
raw
2021-11-15
lain
Merge branch 'instance-deletion' into 'develop'
blob
|
commitdiff
|
raw
2021-11-15
lain
Merge branch 'fix-object-deletion-timeout' into 'develop'
blob
|
commitdiff
|
raw
2021-11-15
lain
Merge branch 'userfeed-fe-fallback' into 'develop'
blob
|
commitdiff
|
raw
2021-10-06
Haelwenn
Merge branch 'bugfix/crypt-pragma' into 'develop'
blob
|
commitdiff
|
raw
2021-10-06
Haelwenn
Merge branch 'from/develop/tusooa/add-remove-emails...
blob
|
commitdiff
|
raw
2021-09-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2021-09-07
Haelwenn
Merge branch 'remove/mastofe' into 'develop'
blob
|
commitdiff
|
raw
2021-08-06
Sean King
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2021-07-10
Sean King
Merge develop branch upstream
blob
|
commitdiff
|
raw
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-04-16
Sean King
Remove MastoFE-related backend code and frontend pieces
blob
|
commitdiff
|
raw
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
2020-02-20
lain
Merge branch 'docs_updating' into 'develop'
blob
|
commitdiff
|
raw
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
2020-01-28
feld
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
2020-01-28
lain
Merge branch 'fix/attachments-cleanup' into 'develop'
blob
|
commitdiff
|
raw
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
2020-01-26
Mark Felder
Merge branch 'develop' into issue/1280
blob
|
commitdiff
|
raw
2020-01-23
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2020-01-23
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
2020-01-23
Haelwenn
Merge branch 'emoji-notifications' into 'develop'
blob
|
commitdiff
|
raw
2020-01-22
Mark Felder
Merge branch 'develop' into features/remote-follow...
blob
|
commitdiff
|
raw
2020-01-22
rinpatch
Merge branch 'no-error-404' into 'develop'
blob
|
commitdiff
|
raw
2020-01-22
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
2020-01-22
Egor Kislitsyn
Merge branch 'develop' into feature/new-registrations...
blob
|
commitdiff
|
raw
2020-01-22
feld
Merge branch 'admin-be' into 'develop'
blob
|
commitdiff
|
raw
2020-01-22
rinpatch
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
blob
|
commitdiff
|
raw
2020-01-22
Haelwenn (lanodan...
Update MastoFE bundle to 2020-01-22
blob
|
commitdiff
|
raw
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
Haelwenn (lanodan...
Update Mastodon Frontend to 2019-02-10 bundle
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn
Merge branch 'update-mastofe/glitch-soc-2019-01-28...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn (lanodan...
[MastodonFE] Update Frontend (glitch)
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
kaniini
Merge branch 'task-204-on-options-request' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
Haelwenn
Merge branch 'bump-mastofe-2018-09-20' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-20
Haelwenn (lanodan...
Update mastodon frontend
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'dev-lanodan-url-regex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'develop' into 'patch-2'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/put-repeats-at-activitypub-outbox...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/normalize-file-extension' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-15
lambda
Merge branch 'feature/suggestions-api-with-third-party...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
lain
Update Mastofe.
blob
|
commitdiff
|
raw
|
diff to current
2018-06-02
lain
Revert "Update Mastofe."
blob
|
commitdiff
|
raw
|
diff to current
2018-06-02
lain
Update Mastofe.
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-24
lambda
Merge branch 'favicon_tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e01...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-09
Morgan Bazalgette
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-03
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-02
lambda
Merge branch 'mastofe-5edce2030238293463c041537da4aaeea...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-02
Morgan Bazalgette
Bring mastofe up to date
blob
|
commitdiff
|
raw
|
diff to current
2018-04-02
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
lambda
Merge branch 'mastofe-f48f11d4' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
Morgan Bazalgette
update mastofe
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-31
lambda
Merge branch 'new-mastofe' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-31
Morgan Bazalgette
Bring Mastodon frontend up-to-date
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history