aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2018-09-03Merge branch 'develop' into 'feature/staff-discovery-api'kaniini
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini
Add/Fix Mastodon endpoints for 2.4.3 compatibility See merge request pleroma/pleroma!266
2018-09-03migrations: add is_moderator index for users tableWilliam Pitcock
2018-08-31update pleroma frontendWilliam Pitcock
2018-08-29migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock
2018-08-29migrations: drop filler migrationWilliam Pitcock
2018-08-29migrations: add migration to fill in recipients_to/recipients_cc fieldsWilliam Pitcock
2018-08-29activity: add recipients_to and recipients_cc fieldsWilliam Pitcock
2018-08-27[MastodonAPI] Add filtersHaelwenn (lanodan) Monnier
2018-08-27Revert "enable scope options and such"William Pitcock
This reverts commit e5642d75668298eff25309a8ee775ec38ed927f3.
2018-08-27enable scope options and suchWilliam Pitcock
2018-08-26update pleroma frontendhakabahitoyo
2018-08-24update pleroma frontendWilliam Pitcock
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-18update pleroma frontendWilliam Pitcock
2018-08-12update frontendlain
2018-08-12Update Mastofe.lain
2018-08-12Merge branch 'feature/invites' into 'develop'lambda
Invites Closes #108 See merge request pleroma/pleroma!208
2018-06-18activitypub: support filtering activities by whether or not they are a reply ↵William Pitcock
(closes #109)
2018-06-12update frontendlain
2018-06-12Replace avi.png with the Pleroma logoArtik Banana
2018-06-12Initial invites support + tests.Henry Jameson
2018-06-12Merge branch 'feature/list-streaming' into 'develop'lambda
MastoAPI: Add streaming for lists. See merge request pleroma/pleroma!183
2018-06-06Extract host from ap_id, add indexeal
2018-06-02Revert "Update Mastofe."lain
This reverts commit 726b131b0a675a1116e579e0c1adbed8e5a1a856. Some things broke (threads).
2018-06-02Update Mastofe.lain
2018-05-30MastoAPI: Add streaming for lists.eal
2018-05-24Merge branch 'feature/lists' into 'develop'lambda
Mastodon List API See merge request pleroma/pleroma!138
2018-05-24update frontendlain
2018-05-24MastoAPI: add lists.eal
2018-05-20update frontendlain
2018-05-20update frontendlain
2018-05-16Fix User search.lain
Now uses a trigram based search. This is a lot faster and gives better results. Closes #185.
2018-05-16update frontendlain
2018-05-13Modify sort index for activities.lain
This prevents a problem that made the local timeline very slow when there were few posts.
2018-05-04update frontendlain
2018-04-29update frontendlain
2018-04-26Resurrect instance specific panel.lain
2018-04-23update frontendlain
2018-04-23update frontendlain
2018-04-20formattingKawen
2018-04-20enable instance panel by default, added some contentKawen
2018-04-17update frontendlain
2018-04-11update frontendlain
2018-04-11update frontendlain
2018-04-09Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ecMorgan Bazalgette
2018-04-02Bring mastofe up to dateMorgan Bazalgette
Commit https://git.pleroma.social/tyge/mastofe/commit/5edce2030238293463c041537da4aaeea5cb3875 summary: ``` * 5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD) |\ | * 2c51bc0c - (4 hours ago) Add missing rejection handling for Promises (#7008) - unarist (upstream/master) | * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith | * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith | * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi | * b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov | * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82 | * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko | * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko | * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood | * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi | * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith * | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette * | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette * | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette * | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette * | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette * | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette * | 00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette |\ \ | |/ | * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82 * | 05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette \ \ |/ * 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak ```
2018-04-01update mastofeMorgan Bazalgette
2018-03-31Update with mastofe repoMorgan Bazalgette