limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14439 commits 27 branches 107 tags 315 MiB
Commit graph

1174 commits

Author SHA1 Message Date
Maksim Pechnikov
10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
lain
2d5cf0f8cd Migrations: Make them not fail for old databases 2020-02-20 16:44:31 +01:00
sadposter
fae0d4ba9d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-02-20 13:50:56 +00:00
Mark Felder
6a97c1b9ff Update adminFE build 2020-02-17 15:50:45 -06:00
Maksim Pechnikov
da44ee5b0f Merge branch 'develop' into issue/1276 2020-02-13 09:20:34 +03:00
Mark Felder
f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 2020-02-11 10:33:41 -06:00
Mark Felder
de0fea4634 Update AdminFE build 2020-02-11 10:24:38 -06:00
lain
60de311164 Update frontend 2020-02-11 13:59:04 +01:00
Maksim Pechnikov
cd040691bd maked unread_count as virtual field 2020-02-10 09:01:45 +03:00
Maksim Pechnikov
b87533760b Merge branch 'develop' into issue/1276 2020-02-10 07:59:52 +03:00
sadposter
1b03dc2031 fe 2020-02-09 18:19:14 +00:00
sadposter
7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-02-09 18:12:40 +00:00
sadposter
57b3925a88 fe 2020-02-09 18:12:09 +00:00
rinpatch
f13b7878b4 Merge branch 'rename_emoji_reactios' into 'develop' 
EmojiReactions: Rename to EmojiReacts

See merge request pleroma/pleroma!2181
 2020-02-07 10:35:37 +00:00
Lain Soykaf
8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01:00
Mark Felder
fed9b0d1e0 Update FE bundle 2020-02-06 10:59:41 -06:00
sadposter
646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-29 11:05:19 +00:00
sadposter
ff552c5151 FE 2020-01-29 10:56:34 +00:00
Maksim Pechnikov
ba5e8a6444 Merge branch 'develop' into issue/1276 2020-01-28 21:11:13 +03:00
lain
f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 2020-01-28 18:39:02 +01:00
lain
6fab5fe7f8 Merge branch 'translation/errors-french' into 'develop' 
Translation/errors french

See merge request pleroma/pleroma!1457
 2020-01-28 13:26:28 +00:00
Maksim Pechnikov
e442ea5722 Merge branch 'develop' into issue/1276 2020-01-27 15:20:47 +03:00
sadposter
4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-23 11:55:07 +00:00
feld
be27777156 Merge branch 'admin-be' into 'develop' 
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
 2020-01-22 17:13:17 +00:00
Haelwenn (lanodan) Monnier
bd3f3756fb
Update MastoFE bundle to 2020-01-22 2020-01-22 16:00:23 +01:00
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Alexander Strizhakov
7ee2f86d76 Revert "Update AdminFE build" 
This reverts commit 6395ad942c
 2020-01-22 08:21:35 +00:00
Mark Felder
2860bee604 Last AdminFE update was accidentally built from master, not develop 2020-01-21 15:09:16 -06:00
Mark Felder
bc2ebdcfd6 Update AdminFE build 2020-01-21 13:41:22 -06:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
sadposter
4e069ce537 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-16 16:17:56 +00:00
sadposter
5664427d6c branch 2020-01-16 16:13:51 +00:00
Ivan Tashkinov
d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808. 2020-01-15 18:38:18 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming 
and moving it from instance settings
 2020-01-10 19:34:19 +03:00
Alexander Strizhakov
6395ad942c
Update AdminFE build 2020-01-10 15:52:02 +03:00
Ivan Tashkinov
6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Mark Felder
fd3c23af63 Update AdminFE build 2020-01-09 10:00:15 -06:00
sadposter
6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-15 14:11:26 +00:00
lain
2f31cef71f Merge branch 'feature/native-captcha' into 'develop' 
Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060
 2019-12-12 18:43:21 +00:00
sadposter
803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-12 17:48:36 +00:00
lain
756a029edf Update frontend 2019-12-12 17:05:22 +01:00
lain
2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" 
This reverts merge request !2055
 2019-12-12 09:37:02 +00:00
Maxim Filippov
3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Ivan Tashkinov
84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. 2019-12-11 19:48:00 +03:00
sadposter
97f67e0786 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-11 10:01:04 +00:00
Hakaba Hitoyo
701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
sadposter
d3cee00057 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-09 18:17:59 +00:00
rinpatch
d6c89068f3 HTML: Compile Scrubbers on boot 
This makes it possible to configure their behavior on OTP releases.
 2019-12-08 20:35:41 +03:00
Maksim Pechnikov
6fbafb1cdc Merge branch 'develop' into issue/1276 2019-12-08 20:14:28 +03:00
Maksim Pechnikov
49bb0a130f Merge branch 'develop' into issue/1276 2019-12-05 12:22:19 +03:00
sadposter
8ae4ae14f3 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-04 23:20:03 +00:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
Maxim Filippov
4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop' 
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
 2019-12-02 16:26:19 +00:00
sadposter
a7ec08d853 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-01 19:03:08 +00:00
rinpatch
0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop' 
Removed users.info field

See merge request pleroma/pleroma!2006
 2019-11-30 10:42:51 +00:00
Ivan Tashkinov
52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	mix.lock
 2019-11-29 10:17:59 +03:00
lain
f0bdbe3f61 Migrations: Set users.following_count to NOT NULL 
Also set following_count for local users to the correct value and for remote
users to 0.
 2019-11-28 17:01:43 +01:00
sadposter
acac6e3540 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-25 11:37:49 +00:00
Ivan Tashkinov
1636cc5b7e Removed users.info and remaining usages. 2019-11-23 14:06:19 +03:00
Ivan Tashkinov
cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
 2019-11-21 16:47:52 +03:00
lain
8feb5dcb42 Merge branch 'issue/1348' into 'develop' 
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
 2019-11-21 13:13:14 +00:00
Ivan Tashkinov
4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-20 15:47:11 +03:00
Ivan Tashkinov
de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
sadposter
9d29a5063c fe 2019-11-20 09:48:05 +00:00
sadposter
d8286a122a stickers 2019-11-20 09:46:08 +00:00
rinpatch
0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 2019-11-19 23:28:34 +03:00
Ivan Tashkinov
aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
Ivan Tashkinov
01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +00:00
sadposter
2de30812ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-13 00:10:01 +00:00
sadposter
c4f66db63c fe 2019-11-13 00:09:56 +00:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User 2019-11-12 18:45:28 +07:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation. 
Introduced UserBlock.
 2019-11-10 16:30:21 +03:00
lain
a88e834dba Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-11-10 11:32:50 +00:00
Phil Hagelberg
274cc18e8a Visually separate header. 2019-11-09 18:08:08 -08:00
Phil Hagelberg
1dc785b74b Move static-fe CSS to a separate file. 2019-11-09 18:07:50 -08:00
sadposter
55cc96bcf9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-09 19:11:33 +00:00
sadposter
058467d25c fe 2019-11-09 19:10:22 +00:00
rinpatch
3cc2437598 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 2019-11-09 01:49:36 +03:00
lain
b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
sadposter
9bc70ca0c1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-04 18:20:19 +00:00
Maksim Pechnikov
4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
Maksim Pechnikov
ff6c727739 Merge branch 'develop' into issue/1276 2019-11-04 20:24:53 +03:00
Maksim Pechnikov
57995fa8cf fix migrate 
update migrate
 2019-11-03 20:44:59 +03:00
Haelwenn
9d8da9ea15 Merge branch 'fix/migration-schema' into 'develop' 
Fix bookmark migration using a query with a schema

See merge request pleroma/pleroma!1923
 2019-11-02 15:07:47 +00:00
Maksim Pechnikov
fd8099fb68 Merge branch 'develop' into issue/1276 2019-10-31 21:09:46 +03:00
lain
e14cae25aa Merge branch 'refactor/db-add-defaults' into 'develop' 
Set defaults to fields with NULL values

Closes #1358

See merge request pleroma/pleroma!1914
 2019-10-31 13:34:57 +00:00
Maksim Pechnikov
1b82eb6d41 move sql (update_markers) from migrate to mix task 2019-10-30 23:22:38 +03:00
Maksim Pechnikov
d719078699 Merge branch 'develop' into issue/1276 2019-10-30 23:07:18 +03:00
Roman Chvanikov
8bb6da7cd6 Remove following column from the migrations 2019-10-30 18:34:14 +03:00
rinpatch
c546da7cfe Fix bookmark migration using a query with a schema 
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
 2019-10-30 12:59:14 +03:00
sadposter
83a9ec228e tos 2019-10-30 09:26:23 +00:00
Egor Kislitsyn
40d5fb6ef8
Add a migration to fix blocked follows 2019-10-30 15:52:37 +07:00
Maksim Pechnikov
b27a92e8fa Merge branch 'develop' into issue/1276 2019-10-29 22:23:19 +03:00
rinpatch
3e09b7c5ae Fix two migrations sharing the same module name 
This makes ecto execute only the latter one.
 2019-10-29 16:56:24 +03:00
sadposter
bea4a82d1e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-29 13:12:38 +00:00
sadposter
e50d018bfe fe 2019-10-29 11:01:50 +00:00
sadposter
55ce1daeaf Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-29 10:47:37 +00:00
kPherox
5334190056
Migrate missing follow requests 2019-10-29 19:22:34 +09:00
Roman Chvanikov
435d220700 Move setDefaultsToTables to past to run before notNull migrations 2019-10-28 19:17:50 +03:00
Roman Chvanikov
4b0893631f Complete defaults 2019-10-28 19:16:19 +03:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity 2019-10-28 15:10:47 +07:00
Egor Kislitsyn
3c86a0ab24
Fix SetNotNullForUsers migration 2019-10-28 14:45:50 +07:00
lain
2480200759 Merge branch 'refactor/following-relationships' into 'develop' 
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
 2019-10-28 07:27:45 +00:00
Roman Chvanikov
0be9cb086b Add migration 2019-10-27 19:29:35 +03:00
kaniini
060adfd762 Merge branch 'improve-user-info-migration' into 'develop' 
User info migration improvements

See merge request pleroma/pleroma!1887
 2019-10-27 05:33:41 +00:00
kaniini
fbadd36cc0 Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop' 
Add NOT NULL constraints for users table

See merge request pleroma/pleroma!1910
 2019-10-27 05:32:01 +00:00
kaniini
a9cadf3905 Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop' 
Add NOT NULL constraints for user_invite_tokens table

See merge request pleroma/pleroma!1909
 2019-10-27 05:31:52 +00:00
kaniini
4a72d39ca6 Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop' 
Add NOT NULL constraints for thread_mutes table

See merge request pleroma/pleroma!1908
 2019-10-27 05:31:41 +00:00
kaniini
e94144669a Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop' 
Add NOT NULL constraints for scheduled_activities table

See merge request pleroma/pleroma!1907
 2019-10-27 05:31:31 +00:00
kaniini
9e084771c6 Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop' 
Add NOT NULL constraints for registrations table

See merge request pleroma/pleroma!1906
 2019-10-27 05:31:21 +00:00
kaniini
3ac6160299 Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop' 
Add NOT NULL constraints for push_subscriptions table

See merge request pleroma/pleroma!1905
 2019-10-27 05:31:09 +00:00
kaniini
26daaa9f04 Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop' 
Add NOT NULL constraints for password_reset_tokens table

See merge request pleroma/pleroma!1904
 2019-10-27 05:30:59 +00:00
kaniini
1fc591fcfc Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop' 
Add NOT NULL constraints for objects table

See merge request pleroma/pleroma!1903
 2019-10-27 05:30:47 +00:00
kaniini
8b204b4d71 Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop' 
Add NOT NULL constraints for oauth_authorizations table

See merge request pleroma/pleroma!1902
 2019-10-27 05:30:36 +00:00
kaniini
fe97493d91 Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop' 
Add NOT NULL constraints for oauth_tokens table

See merge request pleroma/pleroma!1901
 2019-10-27 05:30:25 +00:00
kaniini
84e992d85b Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop' 
Add NOT NULL constraints for notifications table

See merge request pleroma/pleroma!1900
 2019-10-27 05:30:09 +00:00
kaniini
19a625459b Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop' 
Add NOT NULL constraints for moderation_log table

See merge request pleroma/pleroma!1899
 2019-10-27 05:29:56 +00:00
kaniini
79702b54b6 Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop' 
Add NOT NULL constraints for markers table

See merge request pleroma/pleroma!1898
 2019-10-27 05:29:45 +00:00
kaniini
2e7e43c853 Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop' 
Add NOT NULL constraints for lists table

See merge request pleroma/pleroma!1897
 2019-10-27 05:29:33 +00:00
kaniini
75dab79183 Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop' 
Add NOT NULL constraints for instances table

See merge request pleroma/pleroma!1896
 2019-10-27 05:29:18 +00:00
kaniini
24699b991a Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop' 
Add NOT NULL constraints for filters table

See merge request pleroma/pleroma!1895
 2019-10-27 05:29:05 +00:00
kaniini
3ac8eb4046 Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop' 
Add NOT NULL constraints for conversation_participations table

See merge request pleroma/pleroma!1894
 2019-10-27 05:28:45 +00:00
kaniini
6be16b8617 Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop' 
Add NOT NULL constraints for conversation_participation_recipient_ships table

See merge request pleroma/pleroma!1893
 2019-10-27 05:28:32 +00:00
kaniini
b05fbc890e Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop' 
Add NOT NULL constraints for config table

See merge request pleroma/pleroma!1892
 2019-10-27 05:28:18 +00:00
kaniini
8785d7ba5d Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop' 
Add NOT NULL constraints for bookmarks table

See merge request pleroma/pleroma!1891
 2019-10-27 05:28:03 +00:00
kaniini
93f6f173ce Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop' 
Add NOT NULL constraints for apps table

See merge request pleroma/pleroma!1890
 2019-10-27 05:27:43 +00:00
kaniini
5cb5f9a270 Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop' 
Add NOT NULL constraints for activity_expirations table

See merge request pleroma/pleroma!1889
 2019-10-27 05:27:24 +00:00
Roman Chvanikov
175f6c8355 Add migration 2019-10-26 22:59:24 +03:00
Roman Chvanikov
bdb2039453 Add migration 2019-10-26 22:58:37 +03:00
Roman Chvanikov
f5f9197fce Add migration 2019-10-26 22:57:43 +03:00
Roman Chvanikov
2e608f7cbf Add migration 2019-10-26 22:56:48 +03:00
Roman Chvanikov
2810729218 Add migration 2019-10-26 22:55:29 +03:00
Roman Chvanikov
cf72b7649e Add migration 2019-10-26 22:54:37 +03:00
Roman Chvanikov
a4cf664385 Add migration 2019-10-26 22:53:41 +03:00
Roman Chvanikov
776c31267f Add migration 2019-10-26 22:52:49 +03:00
Roman Chvanikov
c0b0fb19c8 Add migration 2019-10-26 22:50:52 +03:00
Roman Chvanikov
5fece5f8bc Put correct migration 2019-10-26 22:49:37 +03:00
Roman Chvanikov
d58cca5f0a Add migration 2019-10-26 22:46:09 +03:00
Roman Chvanikov
cf0fa124a2 Add migration 2019-10-26 22:45:24 +03:00
Roman Chvanikov
13cc52dc60 Add migration 2019-10-26 22:44:42 +03:00
Roman Chvanikov
55203c198b Add migration 2019-10-26 22:43:32 +03:00
Roman Chvanikov
b85bee32da Add migration 2019-10-26 22:42:24 +03:00
Roman Chvanikov
b33aacc4fb Add migration 2019-10-26 22:40:51 +03:00
Roman Chvanikov
382e83fab5 Add migration 2019-10-26 22:39:24 +03:00
Roman Chvanikov
0223dc4e02 Add migration 2019-10-26 22:38:07 +03:00
Roman Chvanikov
d12555a69e Add migration 2019-10-26 22:37:30 +03:00
Roman Chvanikov
7ac42fefe3 Add migration 2019-10-26 22:36:43 +03:00
Roman Chvanikov
c1ff8472fd Add migration 2019-10-26 22:33:18 +03:00
Roman Chvanikov
5cb03fe801 Add migration 2019-10-26 22:32:31 +03:00
Roman Chvanikov
cd0218c205 Add migration 2019-10-26 22:31:25 +03:00
Roman Chvanikov
6e7fd364a4 Add migration 2019-10-26 22:28:18 +03:00
rinpatch
12ab7b3280 User info migration improvements 
- Move column additions into a separate migration, so postgres doesn't
need an exclusive lock on the table for the main part
- Fill in columns by using one big update statement instead of a bunch
of small ones because it's much faster (the migration took 140s on
patch.cx database)
 2019-10-26 03:45:24 +03:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
sadposter
1d85dc62aa Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-25 12:08:37 +01:00
sadposter
16107a0319 update tos 2019-10-25 12:08:34 +01:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maksim Pechnikov
99cf1ef9be Merge branch 'develop' into issue/1276 2019-10-24 09:23:59 +03:00
Maksim Pechnikov
d3fb9e02cc add tests 2019-10-23 22:48:04 +03:00
Maksim Pechnikov
aa64b3108b fix migrate 2019-10-23 22:02:59 +03:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/notification.ex
 2019-10-23 17:22:42 +03:00
Ivan Tashkinov
11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration. 2019-10-23 17:15:48 +03:00
Maksim Pechnikov
d4270397dc Marker: added unread_count field 2019-10-22 14:51:46 +03:00
sadposter
85b9992f86 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-22 09:12:39 +01:00
Ivan Tashkinov
7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Maksim Pechnikov
243719a965 Merge branch 'develop' into feature/masto_api_markers 2019-10-21 11:32:28 +03:00
Ivan Tashkinov
a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
 2019-10-21 11:05:09 +03:00
Egor Kislitsyn
f726d953d5
Fix typos 2019-10-21 14:56:39 +07:00
kaniini
2ebe8c416a Merge branch 'feature/activitypub-semantics' into 'develop' 
activitypub semantics

See merge request pleroma/pleroma!1798
 2019-10-21 07:54:48 +00:00
Egor Kislitsyn
e37d4b2ddf
Revert "Skip deactivated users in followers import" 
This reverts commit 8ad015ef64.
 2019-10-21 14:52:52 +07:00
Ivan Tashkinov
75da202ab7 [#1304] Typo fix. 2019-10-21 10:20:28 +03:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
Ivan Tashkinov
ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 22:29:56 +03:00
Ivan Tashkinov
c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 20:43:18 +03:00
Ivan Tashkinov
e8843974cb [#1304] Moved remaining fields from User.Info to User. 
Misc. fixes / improvements.
 2019-10-20 13:42:42 +03:00
Ariadne Conill
34754938ba add missing migration to drop websub table 2019-10-20 10:39:03 +00:00
Ariadne Conill
c9280b9730 rework to use properties instead of compound typing, per SocialCG 2019-10-19 23:21:37 +00:00
rinpatch
39e996528c Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 15:22:07 +03:00
sadposter
1eec8d3dee frontend 2019-10-18 13:12:53 +01:00
Maksim Pechnikov
66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
Egor Kislitsyn
8ad015ef64
Skip deactivated users in followers import 2019-10-14 14:16:57 +07:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
Egor Kislitsyn
2c7ff32e5b
Add thread_visibility to migrations 2019-10-10 21:11:34 +07:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-10 12:38:51 +00:00
sadposter
58f9ce0deb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-10 10:28:16 +01:00
Egor Kislitsyn
761ad0b48e
Split CreateFollowingRelationships to multiple migrations 2019-10-08 20:27:42 +07:00
Egor Kislitsyn
6291eaa590 Update CreateFollowingRelationships 2019-10-08 20:19:38 +07:00
rinpatch
32808208be Enable mix format for migrations 2019-10-08 15:16:39 +03:00
Egor Kislitsyn
12ebeef130
Add CreateFollowingRelationships migration 2019-10-08 18:05:23 +07:00
rinpatch
a502155274 Bump pleroma-fe bundle to 122323f35c 2019-10-07 17:42:33 +03:00
lain
e8395bedd2 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
 2019-10-07 12:10:27 +00:00
Ariadne Conill
19962d2022 clean up bundled litepub schema (closes #1303) 2019-10-07 11:33:58 +00:00
lain
73b6512907 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
rinpatch
ee88afb2e2 Fix muted notification migration only working with a schema 
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
 2019-10-06 18:06:04 +03:00
rinpatch
125f96e706 Fix the use of queries with a schema in a migration 2019-10-06 17:23:43 +03:00
rinpatch
fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
lain
61097ba6ab Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-06 08:11:47 +00:00
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
sadposter
8550e0ff0a stickers 2019-10-04 12:04:31 +01:00
sadposter
59e6b48553 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-04 11:48:39 +01:00
sadposter
76c84720f7 stickers 2019-10-04 11:48:31 +01:00
lain
557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
Mark Felder
a562cb2c34 Update AdminFE bundle 2019-10-01 18:29:39 -05:00
Ariadne Conill
28be12b38e update admin fe 2019-09-30 12:52:28 +00:00
lain
0aef18bcf4 Litepub Context: Add EmojiReaction. 2019-09-30 14:26:59 +02:00
kaniini
26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' 
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
 2019-09-30 11:21:49 +00:00
rinpatch
1fba66178d Merge branch 'develop' into cleanup/drop-subscription-table-if-exists 2019-09-30 00:26:49 +03:00
rinpatch
81b4243173 Remove subscription_notifications table if it existed 
Followup to !1741
 2019-09-29 23:52:40 +03:00
rinpatch
e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
sadposter
1e11b97c1b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-26 23:22:24 +01:00
Roman Chvanikov
b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Hakaba Hitoyo
5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context" 
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
 2019-09-26 02:57:41 +00:00
sadposter
f82d9e1359 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-25 13:33:10 +01:00
sadposter
31f932bdfb eva 2019-09-25 13:33:05 +01:00
Haelwenn (lanodan) Monnier
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia 2019-09-24 19:00:31 +02:00
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle 2019-09-23 21:13:39 +02:00
sadposter
c3de75b2a1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-17 14:58:02 +01:00
rinpatch
a21584556f Update oban to 0.8.1 
This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam
 2019-09-17 13:04:43 +03:00
Roman Chvanikov
76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
sadposter
4714b739a7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-16 12:14:48 +01:00
sadposter
63782e770b add stickers 2019-09-16 12:14:42 +01:00
kaniini
17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' 
Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661
 2019-09-16 07:39:58 +00:00
sadposter
b4512ddb6f thing 2019-09-14 00:20:48 +01:00
rinpatch
ac4a748fad Disallow NULLs in deliveries 2019-09-13 19:28:35 +03:00
Roman Chvanikov
0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
sadposter
f1e1ba71ce update tos 2019-09-13 16:23:28 +01:00
sadposter
8046440a16 update fe 2019-09-13 16:18:38 +01:00
sadposter
cc5b65bd21 add lato 2019-09-13 15:27:51 +01:00
rinpatch
769fb778d4 Track object/create activity fetches 2019-09-12 21:37:36 +03:00
sadposter
94076a23e4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-10 21:11:03 +01:00
Ivan Tashkinov
ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
 2019-09-06 13:26:05 +03:00
rinpatch
16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
Ivan Tashkinov
e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	config/config.exs
 2019-08-31 14:25:43 +03:00
sadposter
cc28184854 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-27 08:58:51 +01:00
Maxim Filippov
37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
lain
cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Ivan Tashkinov
c34126f89c Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-24 09:29:54 +03:00
rinpatch
05e7d0a438 Add an index on object likes 
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
 2019-08-23 03:17:20 +03:00
Ivan Tashkinov
256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs
 2019-08-22 20:59:58 +03:00
Ivan Tashkinov
8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
lain
560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
sadposter
5b385962eb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-13 09:05:44 +01:00
Mark Felder
24a731a9a6 Update AdminFE 
Now permits server configuration. Consider this ALPHA.
 2019-08-12 15:00:03 -05:00
sadposter
8abd779bcc TOS 2019-08-12 14:55:20 +01:00
sadposter
6f8e4f5dcf TOS 2019-08-12 00:51:04 +01:00
sadposter
59c9b90169 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-10 23:43:32 +01:00
Ivan Tashkinov
267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
lain
29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
sadposter
325372b1e1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-07 08:59:31 +01:00
Hakaba Hitoyo
39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
lain
f88560accd Conversations: Add recipient list to conversation participation. 
This enables to address the same group of people every time.
 2019-08-02 11:55:41 +02:00
Ivan Tashkinov
23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
Mike Verdone
666514194a Add activity expirations table 
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
 2019-07-24 13:14:52 +02:00
Haelwenn (lanodan) Monnier
a4647e9804
fr/LC_MESSAGES/errors.po: Create translation file 2019-07-20 16:59:37 +02:00
Roman Chvanikov
9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
sadposter
32ce409514 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-16 11:21:31 +01:00
Egor Kislitsyn
04f18a144b Add listMessage to to the JSON-LD context 2019-07-15 14:29:13 +07:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
sadposter
d4348eeb62 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-14 22:03:20 +01:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Egor Kislitsyn
182f7bbb11 Merge branch 'develop' into feature/addressable-lists 2019-07-11 13:26:59 +07:00
Alex S
936050257d saving following_address for existing users 2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
Egor Kislitsyn
406efb3688 Add Russian translation 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
sadposter
dbeb8f43fe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-09 21:08:12 +01:00
sadposter
357b1eac0f theme 2019-07-09 21:08:03 +01:00
Sachin Joshi
6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini
4948117fcf Merge branch 'remove-swift' into 'develop' 
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
 2019-07-09 16:54:32 +00:00
sadposter
ed709aec2c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-06 18:41:06 +01:00
Roman Chvanikov
efefee8241 Split alters rather than work with indexes 2019-07-03 14:56:02 +03:00
Egor Kislitsyn
4f42093220 Remove Uploaders.Swift 2019-07-03 14:11:04 +07:00
Roman Chvanikov
291d95dcc3 Fix migration 2019-07-03 01:14:40 +03:00
sadposter
4d8f97453b Add activity get mix task 2019-07-01 17:58:51 +01:00
Maksim
85c7916c94 [#1033] Fix database migrations 2019-07-01 01:08:07 +00:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
sadposter
87ba9d1bab Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-28 18:55:01 +01:00
lain
efad26bbb9 Update frontend. 2019-06-28 14:29:26 +02:00
sadposter
8050baf7bf Update pleroma FE 2019-06-27 02:25:30 +01:00
sadposter
0843f3e0b6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-27 02:17:32 +01:00
rinpatch
cfb5be3ced Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' 
Update mastofe to bundle-2019-06-26

See merge request pleroma/pleroma!1341
 2019-06-26 19:15:37 +00:00
Haelwenn (lanodan) Monnier
451931d36f
Update mastofe to bundle-2019-06-26 2019-06-26 21:06:28 +02:00
sadposter
3a71016699 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-25 12:40:02 +01:00
Mark Felder
7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04:00
kaniini
8b7860f12f Merge branch 'admin-config' into 'develop' 
Admin config

See merge request pleroma/pleroma!1328
 2019-06-23 05:42:37 +00:00
Alex S
982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
rinpatch
3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
rinpatch
f4009b6706 Fallback to Config if Mix.Config does not exist, even if Config does not 
exist either

For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
 2019-06-22 02:29:49 +03:00
rinpatch
960d6b54e8 use Config in generated config when available 
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
 2019-06-21 22:01:59 +03:00
rinpatch
e76115989a Move config templates to priv so they can be found in releases 2019-06-21 19:54:04 +03:00
sadposter
6f380ee337 merge 2019-06-19 14:20:26 +01:00
rinpatch
431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
sadposter
f0fc2da964 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-16 17:43:10 +01:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time 
we can't change module attributes and endpoint settings in runtime
 2019-06-14 15:45:05 +00:00
sadposter
4cda6ed358 change panel 2019-06-12 15:34:27 +01:00
sadposter
922c25d9c7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-12 13:19:24 +01:00
Sergey Suprunenko
a7d956d383 Remove unused imports and aliases from migration 2019-06-10 13:20:37 +00:00
Roman Chvanikov
01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
sadposter
ee7459ec8c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-06 15:54:38 +01:00
sadposter
febd2fdfd3 add emojo 2019-06-06 15:54:32 +01:00
Egor Kislitsyn
17004a0f1a Create index on activities.local 2019-06-05 16:37:43 +07:00
sadposter
9bc0f51e51 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-05 01:25:52 +01:00
Roman Chvanikov
b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Egor Kislitsyn
9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
kaniini
94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop' 
Add index on inReplyTo for objects

See merge request pleroma/pleroma!1240
 2019-06-04 05:38:13 +00:00
Mark Felder
6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00
rinpatch
cfc3c62b2f Add missing tag index on objects 
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
 2019-06-03 20:42:13 +03:00
rinpatch
be56801dda Add index on inReplyTo for objects 
Fixes the performance of `get_existing_votes`
 2019-06-03 19:26:43 +03:00
sadposter
c4151feb48 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-03 13:29:35 +01:00
sadposter
d19b99009b add instance resources 2019-05-30 12:11:56 +01:00
Roman Chvanikov
ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
William Pitcock
5fbbc57c1b add migration to add notification settings to user accounts 2019-05-25 07:25:13 +00:00
Egor Kislitsyn
f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
sadposter
3357780ea8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-20 19:36:57 +01:00
lain
022e6e4b44 RUM: Remove vacuum analyze from migration 
Can't be run in a trnasaction.
 2019-05-17 14:59:01 +02:00
Egor Kislitsyn
557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-17 19:57:14 +07:00
Egor Kislitsyn
f2936e0a07 Add ap_id to List 2019-05-17 19:56:37 +07:00
lain
412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
sadposter
c0b7bc2927 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-16 20:24:43 +01:00
sadposter
7f40b66d51 add emojo 2019-05-16 20:24:29 +01:00
Sergey Suprunenko
e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
William Pitcock
f3971cbde3 thread visibility function: fix use of no longer used author variable 2019-05-15 17:02:40 +00:00
William Pitcock
71fa7eeb6f thread visibility function: significantly improve efficiency 2019-05-15 16:54:14 +00:00
William Pitcock
12f45e2a89 update migration 2019-05-15 16:22:52 +00:00
William Pitcock
75ce6adcff migration: only care about Create activities 2019-05-15 15:54:10 +00:00
William Pitcock
958b4cfde9 migrations: add function to see if a thread can be satisfied 2019-05-15 15:53:06 +00:00
lain
f1e67bdc31 Search: Add optional rum indexing / searching. 2019-05-15 15:28:01 +02:00
Egor Kislitsyn
5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Sachin Joshi
7701a4c841 Make irreversible field default to false in filters 2019-05-14 00:13:15 +05:45
lambda
16cb9e5f1c Merge branch 'mascot/pleroma-tan-shy' into 'develop' 
pleroma-fox-tan-shy.png: Add another version of pleroma-tan

See merge request pleroma/pleroma!1139
 2019-05-13 15:52:05 +00:00
sadposter
cf2741e067 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-13 12:09:35 +01:00
Haelwenn (lanodan) Monnier
566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan 
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle

Intended to be used when mastofe crashes out and allows to report a bug
among other things.

Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
 2019-05-12 05:09:15 +02:00
sadposter
4c11429520 Add mayushii 2019-05-12 00:51:01 +01:00
lain
01c45ddc9e Search: Use RUM index. 2019-05-11 11:26:46 +02:00
Roman Chvanikov
f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
feld
c953ae8c3d Initial bundle of basic AdminFE 
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
 2019-05-11 01:34:17 +00:00
Roman Chvanikov
b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lambda
238dd72fad Merge branch 'conversations_three' into 'develop' 
Conversations once more.

See merge request pleroma/pleroma!1119
 2019-05-07 14:43:21 +00:00
Egor Kislitsyn
1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
sadposter
db0fefc167 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-06 20:40:42 +01:00
Maksim
1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lain
0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain
45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
Roman Chvanikov
0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
rinpatch
f8f6af4cc1 Fix MigrateOldBookmarks migration crashing on deleted activities 2019-04-29 21:25:30 +03:00
Sadposter
fa632f9c37 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-29 12:56:53 +01:00
Sadposter
4b521119dc Add compressed background 2019-04-29 12:56:08 +01:00
William Pitcock
52bdfced32 update pleroma frontend 2019-04-27 07:34:59 +00:00
Alex S
229ce6abbc migration without using old field name 
removing old field from db, after bookmarks migration
 2019-04-25 13:42:10 +07:00
Alex S
58711a79d0 removing useless transaction 2019-04-25 13:40:12 +07:00
Alex S
6322c1e123 migration optimization 
changelog wording
 2019-04-25 13:40:12 +07:00
Alex S
324c9c8ab5 migrate user.bookmarks to separate table 2019-04-25 13:38:24 +07:00
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
Egor Kislitsyn
e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
Roman Chvanikov
2359ee38b3 Set digest emails to false by default 2019-04-21 16:36:25 +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
Roman Chvanikov
8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Sadposter
c02d52c9f7 Update instance panel 2019-04-14 19:01:01 +01:00
Sadposter
b134bd83ca Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-14 19:00:50 +01:00
Roman Chvanikov
371a4aed2c Add User.Info.email_notifications 2019-04-13 17:40:42 +07:00
Egor Kislitsyn
db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Sadposter
d5e5e87d01 Update emojo 2019-04-11 10:52:44 +01:00
Egor Kislitsyn
0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07: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
lain
de57094fca Participations: Add sort index. 2019-04-10 17:30:25 +02:00
lain
280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain
d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
Sadposter
527093e357 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-10 11:27:41 +01:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 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 [#923] 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 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
Sadposter
777042b9e5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-04 17:46:07 +01: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 pleroma/pleroma!913
 2019-04-02 11:54:04 +00:00
Sadposter
df7ea4c0c2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-03-30 18:07:38 +00:00
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
Ivan Tashkinov
642075b1a9 [#923] 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 #756

See merge request pleroma/pleroma!974
 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 pleroma/pleroma!957
 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 pleroma/pleroma!944
 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 [#923] 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 [#923] Registration validations & unique index on [:user_id, :provider]. 2019-03-18 20:31:24 +03:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Sadposter
3d24792f4f Modify static resources 2019-03-18 13:13:19 +00:00
Sadposter
e751f3ec56 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-03-18 13:13:07 +00: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 [#923] 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
Egor Kislitsyn
eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07: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
Sadposter
c413656287 favicon 2019-02-23 22:28:10 +00:00
Sadposter
6c1cf2129e chg: resources 2019-02-23 22:26:33 +00:00
Sadposter
8b6cd3857b new: Add instance resources 2019-02-23 22:23:03 +00: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 [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov
949e35e26d [#468] OAuth scopes-related data migration simplification. 2019-02-14 14:28:26 +03:00
Ivan Tashkinov
063baca5e4 [#468] 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
Karen Konou
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
Karen Konou
6a150de3bd Add unique index and unique constraint check, uniqueness test fails 2019-02-09 20:52:11 +01:00
Ivan Tashkinov
4ad843fb9d [#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions. 2019-02-09 17:09:08 +03:00
Karen Konou
98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00
Karen Konou
c43f414a79 Somehow fixed the repo insert [skip-ci] 2019-02-07 23:44:49 +01:00
Karen Konou
77448de492 ugghhhh 2019-02-07 22:25:07 +01:00
Karen Konou
f4ff4ffba2 Migration and some boilerplate stuff 2019-02-07 17:36:14 +01:00
Maxim Filippov
f1b72bfb70 Split hide_networ only for local users 2019-02-06 13:41:36 +03:00
lain
78a51f4dd4 update frontend 2019-02-06 10:40:01 +01:00
kaniini
d120aa63f0 Merge branch 'fix-dm-index' into 'develop' 
Massage index until it actually does the stuff we want.

See merge request pleroma/pleroma!772
 2019-02-05 20:27:31 +00:00
Maxim Filippov
c48aba3c2a Fix SQL 2019-02-05 10:22:31 +03:00
lain
f3c8b02d65 Massage index until it actually does the stuff we want. 
Also makes the index a lot smoler.
 2019-02-04 23:47:29 +01:00
Maxim Filippov
cd6606b7f6 Initialize hide_network with false 2019-02-04 22:23:09 +03:00
Maxim Filippov
16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
kaniini
486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'" 
This reverts merge request !733
 2019-02-01 20:22:58 +00:00
kaniini
0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop' 
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
 2019-02-01 17:05:29 +00:00
href
b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' 
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
 2019-02-01 09:14:35 +00:00
lambda
a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" 
This reverts merge request !682
 2019-01-31 12:16:23 +00:00
kaniini
4d3655c479 Merge branch 'spc-fix-3' into 'develop' 
Spc fix 3

See merge request pleroma/pleroma!682
 2019-01-31 11:29:29 +00:00
Haelwenn
00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' 
Features/glitch soc frontend

See merge request pleroma/pleroma!192
 2019-01-31 10:16:11 +00:00
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch) 2019-01-31 10:35:44 +01:00
lain
88a40308d3 update frontend 2019-01-30 21:04:58 +01:00
kaniini
d03a116654 Merge branch 'hj-happiness-improvement' into 'develop' 
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
 2019-01-29 13:54:10 +00:00
Maxim Filippov
50d6183893 Split hide_network into hide_followers & hide_followings 2019-01-28 21:40:08 +03:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
lain
39b2457734 Change default bg image in new config. 2019-01-28 13:04:51 +01:00
Ivan Tashkinov
9560abea10 [#534] Refactoring / tweaks per MR review. 2019-01-28 11:03:52 +03:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
William Pitcock
15d12a69a4 add activities likes index, fixes favorites API call 2019-01-27 15:15:33 +00:00
href
4a13bb75bd
Change webpush endpoint to unlimited varchar 
Fixes #552
 2019-01-26 17:18:34 +01:00
William Pitcock
57c3f8214c update pleroma frontend (summary_html hotfix) 2019-01-25 10:17:00 +00:00
kaniini
4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
William Pitcock
4b76f14da1 update pleroma frontend 2019-01-25 04:49:35 +00:00
href
a3ba72d978
Fix clippy with one/five lines 2019-01-24 16:53:14 +01:00
href
e02b19d1d7
Fix postgres activity_visibility when running in autovacuum 2019-01-24 14:13:20 +01:00
Ivan Tashkinov
f161a92cb1 [#534] Initial implementation of unreachable federation targets retirement. 2019-01-23 18:37:25 +03:00
lain
ab03f81219 Fix info ids. 
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.

Closes #511
 2019-01-23 14:01:44 +01:00
href
9ba6e1fabe
FlakeId: chain alter statements 2019-01-23 12:09:21 +01:00
href
e67bd93d90
Flake: migrate pinned_activities in jsonb 2019-01-23 11:26:39 +01:00
href
a92c43bc4b
Clippy! 2019-01-23 11:26:38 +01:00
href
465fb4327d
Lock activities/users table during flake migration. 2019-01-23 11:26:37 +01:00
href
28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
Michael Loftis
98cbeae49c slightly changes definition so that autovacuum works paralell safe too 2019-01-22 15:35:21 +00:00
lambda
69454c8345 Merge branch 'feature/dm-sanity' into 'develop' 
DM sanitization

See merge request pleroma/pleroma!458
 2019-01-21 12:35:10 +00:00
lambda
2020f26040 Merge branch '2019-1-20-update-frontend' into 'develop' 
update frontend

See merge request pleroma/pleroma!686
 2019-01-20 10:42:06 +00:00
lain
deeda94513 update frontend 2019-01-20 11:28:11 +01:00
William Pitcock
75bb663749 litepub schema: add litepub:directMessage flag 2019-01-20 02:27:48 +00:00
lain
b108aeee08 Make use of the indices. 
Indices in postgresql rely on operators, so they won't be used if you use only functions.
 2019-01-20 00:31:17 +01:00
lain
bd6c12592e Add migration to fix spc users. 2019-01-18 19:35:47 +01:00
Ivan Tashkinov
79e44042bc [#477] User trigram index adjustment. 2019-01-18 10:57:42 +03:00
Ivan Tashkinov
fc965f982c [#477] Added FTS index for users. Fixed failing test. 2019-01-15 12:04:54 +03:00
lain
04735db193 Build the index concurrently. 2019-01-09 16:55:05 +01:00
lain
5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
lain
1dd0e0ed4c update frontend 2019-01-01 17:45:03 +01:00
lain
e1227d812c update frontend 2018-12-29 14:30:44 +01:00
lain
9c4344e16c update frontend 2018-12-18 16:28:13 +01:00
lain
3e1816fcd5 update frontend 2018-12-17 21:13:04 +01:00
lain
72945b5b32 update frontend 2018-12-13 21:04:39 +01:00
lain
8682be29a5 update frontend 2018-12-10 20:46:10 +01:00
lambda
94d8f1ab30 Merge branch '394_user_tags' into 'develop' 
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
 2018-12-07 18:25:38 +00:00
Ivan Tashkinov
7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Egor Kislitsyn
4944498133 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
 2018-12-06 20:15:16 +07:00
Egor Kislitsyn
8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
 2018-12-06 19:55:58 +07:00
hakabahitoyo
a7b1a66be3 update-pleroma-frontend 2018-12-03 13:24:25 +09:00
lain
4996fb07d8 Genereate uuids for existing info fields. 2018-12-01 12:00:33 +01:00
William Pitcock
db8f269cd3 update pleroma frontend 2018-11-18 17:27:48 +00:00
William Pitcock
2a75de84e1 update pleroma frontend 2018-11-14 16:08:22 +00:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld 2018-11-08 20:21:45 +01:00
Haelwenn (lanodan) Monnier
705bfe39e9
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld 2018-11-08 19:35:23 +01:00
hakabahitoyo
72a880431f update pleroma frontend 2018-10-26 23:35:06 +09:00
scarlett
7cb227dc62 update pleroma-fe 2018-10-23 12:16:49 +01:00
scarlett
f6dda65dda update pleroma-fe 2018-10-23 12:15:48 +01:00
hakabahitoyo
be7bb90bef update-pleroma-frontend 2018-10-07 09:58:08 +09:00
William Pitcock
bb213a85c5 update pleroma frontend 2018-09-22 05:08:15 +00:00
Martin Kühl
d94ee5cd50 Mastodon API: Support push subscription CRUD 2018-09-22 07:04:01 +02:00
William Pitcock
c9f6eb9a41 user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) 2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier
83e3afac2c Update mastodon frontend 2018-09-20 16:13:13 +00:00
hakabahitoyo
f829b18273 update-pleroma-frontend 2018-09-14 10:47:10 +09:00
William Pitcock
e5546c282f update pleroma frontend 2018-09-09 12:14:34 +00:00
kaniini
76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api' 
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
 2018-09-03 14:55:42 +00:00
kaniini
1c9e539b47 Merge branch 'feature/mastodon_api_2.4.x' into 'develop' 
Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
 2018-09-03 12:33:36 +00:00
William Pitcock
cf5d1302aa migrations: add is_moderator index for users table 2018-09-03 11:55:12 +00:00
William Pitcock
2b4b4888a9 update pleroma frontend 2018-08-31 04:35:18 +00:00
William Pitcock
1a70d41f8e migrations: add index creation migration and recipients_to/cc removal migration 2018-08-29 18:41:02 +00:00
William Pitcock
038139d641 migrations: drop filler migration 2018-08-29 18:41:02 +00:00
William Pitcock
40ea07cd2f migrations: add migration to fill in recipients_to/recipients_cc fields 2018-08-29 08:43:24 +00:00
William Pitcock
81673b8136 activity: add recipients_to and recipients_cc fields 2018-08-29 08:42:33 +00:00
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters 2018-08-27 15:09:05 +02:00
William Pitcock
5ffaa2bf69 Revert "enable scope options and such" 
This reverts commit e5642d7566.
 2018-08-27 10:49:12 +00:00
William Pitcock
e5642d7566 enable scope options and such 2018-08-27 10:46:01 +00:00
hakabahitoyo
ce8c7e77a1 update pleroma frontend 2018-08-26 21:08:03 +09:00
William Pitcock
47661ce44b update pleroma frontend 2018-08-24 21:59:57 +00:00
William Pitcock
d8fb340565 update pleroma frontend 2018-08-20 18:10:29 +00:00
William Pitcock
7a11ea1ceb update pleroma frontend 2018-08-20 04:45:34 +00:00
William Pitcock
d8bb27970b update pleroma frontend 2018-08-18 18:19:11 +00:00
lain
701f5df45c update frontend 2018-08-12 18:16:19 +02:00
lain
4a612b8c1b Update Mastofe. 2018-08-12 18:02:43 +02:00
lambda
13440a80e1 Merge branch 'feature/invites' into 'develop' 
Invites

Closes #108

See merge request pleroma/pleroma!208
 2018-08-12 12:04:15 +00:00
William Pitcock
4f589998ee activitypub: support filtering activities by whether or not they are a reply (closes #109) 2018-06-18 03:21:32 +00:00
lain
ddc654d587 update frontend 2018-06-12 19:38:25 +02:00
Artik Banana
991b8a6b9d Replace avi.png with the Pleroma logo 2018-06-12 11:55:38 +00:00
Henry Jameson
f42ffbe9a8 Initial invites support + tests. 2018-06-12 14:55:16 +03:00
lambda
564c73ab24 Merge branch 'feature/list-streaming' into 'develop' 
MastoAPI: Add streaming for lists.

See merge request pleroma/pleroma!183
 2018-06-12 07:19:45 +00:00
eal
29c9c8d93b Extract host from ap_id, add index 2018-06-06 21:13:40 +03:00
lain
9d054d30bc Revert "Update Mastofe." 
This reverts commit 726b131b0a.

Some things broke (threads).
 2018-06-02 19:45:23 +02:00
lain
726b131b0a Update Mastofe. 2018-06-02 16:11:38 +02:00
eal
5d3fdbc082 MastoAPI: Add streaming for lists. 2018-05-30 16:48:59 +03:00
lambda
f3a71f2986 Merge branch 'feature/lists' into 'develop' 
Mastodon List API

See merge request pleroma/pleroma!138
 2018-05-24 20:22:43 +00:00
lain
6b9a683833 update frontend 2018-05-24 19:25:44 +02:00
eal
a8369db4f2 MastoAPI: add lists. 2018-05-24 13:18:39 +03:00
lain
dde5ad9e37 update frontend 2018-05-20 18:29:12 +02:00
lain
bdfe0991d2 update frontend 2018-05-20 13:24:16 +02:00
lain
1d4bbec6b3 Fix User search. 
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.
 2018-05-16 17:55:20 +02:00
lain
2e9aa16b86 update frontend 2018-05-16 13:02:53 +02:00
lain
94c1f28ba4 Modify sort index for activities. 
This prevents a problem that made the local timeline very slow when
there were few posts.
 2018-05-13 12:54:08 +02:00
lain
12f0ad1392 update frontend 2018-05-04 23:15:33 +02:00
lain
5b6d6d7f2d update frontend 2018-04-29 16:56:13 +02:00
lain
3bad2b827a Resurrect instance specific panel. 2018-04-26 07:06:32 +02:00
lain
fc6f5bcad3 update frontend 2018-04-23 19:23:45 +02:00
lain
661fd3c93e update frontend 2018-04-23 19:09:24 +02:00
Kawen
90ad55b8ff formatting 2018-04-20 19:21:48 +02:00
Kawen
b0671be283 enable instance panel by default, added some content 2018-04-20 19:04:57 +02:00