Merge branch 'release/1.1.2' into 'stable'
[akkoma] / priv / static /
2019-10-07 kaniiniMerge branch 'backport/remove-direct-messages-from...
2019-10-07 kaniiniMerge branch 'backport/chore-context-cleanups' into...
2019-10-07 Ariadne Conillclean up bundled litepub schema (closes #1303)
2019-09-30 kaniiniMerge branch 'chore/pleroma-fe-20190930-to-maint' into...
2019-09-30 Ariadne Conillupdate pleroma fe
2019-09-19 kaniiniMerge branch 'update/admin-fe-stable' into 'maint/1.1'
2019-09-18 Mark FelderUpdate AdminFE for 1.1 branch
2019-09-06 rinpatchMerge branch 'so-long-twitterapi' into 'develop'
2019-09-06 rinpatchMerge branch 'update-frontend-e75ac9dd' into 'develop'
2019-09-06 rinpatchUpdate frontend bundle to e75ac9dd
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-12 rinpatchMerge branch 'update/admin-fe' into 'develop'
2019-08-12 Mark FelderUpdate AdminFE
2019-08-08 lainMerge branch 'feature/digest-email' into 'develop'
2019-08-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-04 kaniiniMerge branch 'feature/relay-list-task' into 'develop'
2019-08-04 kaniiniMerge branch 'remove-longfox-emoji-set' into 'develop'
2019-08-04 Hakaba HitoyoRemove longfox emoji set
2019-07-20 rinpatchResolve merge conflicts
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop'
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name
2019-07-15 kaniiniMerge branch 'update-tzdata' into 'develop'
2019-07-15 kaniiniMerge branch 'admin-configure-atom-keys' into 'develop'
2019-07-15 kaniiniMerge branch 'feature/addressable-lists' into 'develop'
2019-07-15 Egor KislitsynAdd `listMessage` to to the JSON-LD context
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-06-29 kaniiniMerge branch 'feature/merge-mastodon-admin-views-for...
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-28 lainMerge branch '2019-06-29-pleromafe' into 'develop'
2019-06-28 lainUpdate frontend.
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop'
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-26 Haelwenn (lanodan... Update mastofe to bundle-2019-06-26
2019-06-24 rinpatchMerge branch 'modify-config.md-for-S3' into 'develop'
2019-06-23 feldMerge branch 'update/adminfe' into 'develop'
2019-06-23 Mark FelderUpdate adminFE to latest build
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-19 lainMerge branch 'update-frontend-c4fcdc71' into 'develop'
2019-06-18 rinpatchUpdate bundled pleroma-fe to c4fcdc71
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-29 Roman ChvanikovMerge develop
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop'
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-12 Haelwenn (lanodan... pleroma-fox-tan-shy.png: Add another version of pleroma-tan
2019-05-11 kaniiniMerge branch 'fix/ostatus-activity-representer-depends...
2019-05-11 Roman ChvanikovMerge develop
2019-05-11 HaelwennMerge branch 'feature/adminfe' into 'develop'
2019-05-11 feldInitial bundle of basic AdminFE
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-27 kaniiniMerge branch 'feature/bbcode' into 'develop'
2019-04-27 kaniiniMerge branch 'update/pleroma-fe-20190426' into 'develop'
2019-04-27 William Pitcockupdate pleroma frontend
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-22 kaniiniMerge branch 'rework-emoji-management' into 'develop'
2019-04-20 Ekaterina VaartisRemove finmoji and add a way to download emojis in...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-12 lambdaMerge branch 'bugfix/pleroma-email-naming' into 'develop'
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 kaniiniMerge branch 'fix/hackney_max_body_param' into 'develop'
2019-04-11 lambdaMerge branch 'update-mastofe/glitch-soc-2019-04-11...
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-11 Haelwenn (lanodan... Update Mastodon Frontend to 2019-04-11 bundle
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop'
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop'
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into...
next