Commit graph

292 commits

Author SHA1 Message Date
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
Ekaterina Vaartis
c26724cc55 Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
2019-04-11 07:29:03 +02:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request 
2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Ivan Tashkinov
bffddf5e31 [] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
Alex S
012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S
47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S
0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sadposter
ffac2593ea
Add index on subscribers 2019-04-05 17:30:54 +01:00
Ivan Tashkinov
45765918c3 [] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Alex S
86f90c0a54 adding indexes to oauth_tokens table 2019-04-03 20:51:09 +07:00
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan

See merge request 
2019-04-02 11:54:04 +00:00
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
Ivan Tashkinov
642075b1a9 [] Enabled binding of multiple OAuth provider accounts to single user. 2019-03-27 16:20:50 +03:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
lambda
21ff78cd40 Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)

Closes 

See merge request 
2019-03-26 14:49:09 +00:00
eugenijm
568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
rinpatch
9725c93cea Add an id index to notifications 2019-03-25 21:59:52 +03:00
rinpatch
b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request 
2019-03-21 16:24:57 +00:00
kaniini
b68fb3dc17 Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files

See merge request 
2019-03-21 00:59:24 +00:00
rinpatch
e59cfa7cac modify the migrations to use naive_datetime_usec 2019-03-20 16:16:29 +03:00
rinpatch
cbc4a76b43 Fix filter migration 2019-03-20 16:13:23 +03:00
lain
41511d1926 Update frontend 2019-03-20 08:58:25 +01:00
Ivan Tashkinov
e17a9a1f66 [] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
optikfluffel
a907522690 used imageOptim to reduce size of image files 2019-03-19 10:10:48 +01:00
Ivan Tashkinov
40e9a04c31 [] Registration validations & unique index on [:user_id, :provider]. 2019-03-18 20:31:24 +03:00
Ivan Tashkinov
26b6354095 [] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
William Pearson
3dadaa4432 robots.txt
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-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier
bae96206d0
priv/static/images: Add pleroma-tan
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-08 07:51:05 +01:00
Haelwenn (lanodan) Monnier
05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07

[ci skip]
2019-03-08 00:28:40 +01:00
William Pitcock
3a097bd770 update pleroma frontend 2019-03-07 13:31:03 +00:00
eugenijm
8a1e0c9bee Added migration to update existing user note counters 2019-03-03 15:35:32 +03:00
eugenijm
85734c0d49 Added migration for setting default tags in existing users records 2019-03-01 14:02:25 +03:00
Ivan Tashkinov
b227ccab82 Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope. 2019-02-22 14:00:18 +03:00
lain
553ce57d42 update frontend 2019-02-21 09:04:35 +01:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
Ivan Tashkinov
bc4f77b10b [] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov
949e35e26d [] OAuth scopes-related data migration simplification. 2019-02-14 14:28:26 +03:00
Ivan Tashkinov
063baca5e4 [] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages. 2019-02-14 00:29:29 +03:00
William Pitcock
dd989962e6 litepub schema: add oauthRegistrationEndpoint [ci skip] 2019-02-13 19:34:43 +00:00
ac72b578da Merge branch 'develop' into feature/thread-muting 2019-02-11 12:10:49 +01:00
Haelwenn (lanodan) Monnier
fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]
2019-02-10 19:55:22 +01:00
6a150de3bd Add unique index and unique constraint check, uniqueness test fails 2019-02-09 20:52:11 +01:00
Ivan Tashkinov
4ad843fb9d [] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions. 2019-02-09 17:09:08 +03:00
98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00