aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-11Update Mastodon Frontend to 2019-04-11 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11 [ci skip]
2019-04-10Participations: Add sort index.lain
2019-04-10Conversations: Create or bump on inserting a dm.lain
2019-04-10Conversation: Add Conversations and Participations.lain
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex
2019-04-08renaming expire_at -> expires_atAlex S
keyword style change
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Add scheduled activitieseugenijm
2019-04-06token -> invite renamingAlex S
2019-04-06generating tokens with mixAlex S
2019-04-05Add index on subscribersSadposter
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-03adding indexes to oauth_tokens tableAlex S
2019-04-02Merge branch 'features/pleroma-tan' into 'develop'lambda
priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913
2019-03-29Revert awfully long migration from 568e34858Haelwenn (lanodan) Monnier
2019-03-27[#923] Enabled binding of multiple OAuth provider accounts to single user.Ivan Tashkinov
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-26Merge branch 'replies-count' into 'develop'lambda
Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974
2019-03-26Increment replies_count on replies (MastoAPI)eugenijm
2019-03-25Add an id index to notificationsrinpatch
2019-03-21Merge branch 'ecto-3-migration' into 'develop'rinpatch
Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957
2019-03-21Merge branch 'imageoptim' into 'develop'kaniini
used imageOptim to reduce size of image files See merge request pleroma/pleroma!944
2019-03-20modify the migrations to use naive_datetime_usecrinpatch
2019-03-20Fix filter migrationrinpatch
2019-03-20Update frontendlain
2019-03-20[#923] Nickname & email selection for external registrations, option to ↵Ivan Tashkinov
connect to existing account.
2019-03-19used imageOptim to reduce size of image filesoptikfluffel
2019-03-18[#923] Registration validations & unique index on [:user_id, :provider].Ivan Tashkinov
2019-03-18[#923] Support for multiple (external) registrations per user via Registration.Ivan Tashkinov
2019-03-15Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-03-15[#923] OAuth: prototype of sign in / sign up with Twitter.Ivan Tashkinov
2019-03-15robots.txtWilliam Pearson
Add default robots.txt that allows bots access to all paths. Add mix task to generate robots.txt taht allows bots access to no paths. Document custom emojis, MRF and static_dir static_dir documentation includes docs for the robots.txt Mix task.
2019-03-08priv/static/images: Add pleroma-tanHaelwenn (lanodan) Monnier
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02 pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width got divided by two in The GIMP. All the pleroma*.png got optimised with mat2 and optipng/pngcrush, depending on their best results. [ci skip]
2019-03-08Update Mastodon Frontend to 2019-03-07 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07 [ci skip]
2019-03-07update pleroma frontendWilliam Pitcock
2019-03-04allow users to disable their own accountEgor Kislitsyn
2019-03-03Added migration to update existing user note counterseugenijm
2019-03-01Added migration for setting default tags in existing users recordseugenijm
2019-02-22Fixed `scopes` of apps / authorizations / tokens from apps initially created ↵Ivan Tashkinov
with space-delimited `scope`.
2019-02-21update frontendlain
2019-02-20ReportsEgor
2019-02-17[#468] Merged `upstream/develop`, resolved conflicts.Ivan Tashkinov
2019-02-14[#468] OAuth scopes-related data migration simplification.Ivan Tashkinov
2019-02-14[#468] User UI for OAuth permissions restriction. Standardized storage ↵Ivan Tashkinov
format for `scopes` fields, updated usages.
2019-02-13litepub schema: add oauthRegistrationEndpoint [ci skip]William Pitcock
2019-02-11Merge branch 'develop' into feature/thread-mutingKaren Konou
2019-02-10Update Mastodon Frontend to 2019-02-10 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 [ci skip]