moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,245 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

396 Commits

Author SHA1 Message Date
feld 6872c5f88f Mastodon API search default value for "resolve" is false 
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
 2019-05-31 18:46:57 +00:00
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere 2019-05-30 15:33:58 +07:00
William Pitcock 045803346d move key generation functions into Pleroma.Keys module 2019-05-22 03:58:15 +00:00
Sadposter daeae8e2e7
Move default mascot configuration to `config/` 2019-05-20 16:12:55 +01:00
lain 249b31ffe5 Fix specs. 2019-05-17 11:49:13 +02:00
Alexander Strizhakov 7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
Alexander Strizhakov 73ae58fdfa Feature/896 toggling confirmation 2019-05-16 13:23:41 +00:00
Mark Felder 1caa6331ea Group def perform() together to fix the build 2019-05-14 12:33:03 -05:00
lambda 692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop' 
use job queue everywhere

Closes #862

See merge request pleroma/pleroma!1142
 2019-05-14 15:27:34 +00:00
William Pitcock ac3a3abf6b clean up follow/block imports a little 2019-05-14 15:07:38 +00:00
Egor Kislitsyn b92c004ea8 Reuse query from User.restrict_deactivated/1 2019-05-14 18:29:10 +07:00
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
William Pitcock 69a9e0563c user: migrate follow/blocks import to job queue 2019-05-13 19:36:00 +00:00
William Pitcock 32d4630c9c user: move initial post fetching to job queue 2019-05-13 19:36:00 +00:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal 
[ci skip]
 2019-05-13 18:35:45 +00:00
Alexander Strizhakov bfeb33e951 Merge develop 
Merge conflict in lib/pleroma/activity.ex
 2019-05-08 14:34:36 +00:00
rinpatch 06947c9147 Remove bookmarks assoc 2019-05-07 19:33:22 +00:00
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio 2019-05-03 16:27:50 +02:00
Alex S f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Alex S bdfa3a6fa8 Merging with develop 
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
 2019-05-01 12:29:33 +07: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
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +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 b9cdf6d3b9 Use `User.get_cached*` everywhere 2019-04-22 07:20:43 +00:00
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
Sadposter e513504e88 Revert "Assert on the success of enqueue before returning" 
This reverts commit 16d8c8b33b.
Because it breaks everything
 2019-04-14 16:12:54 +01:00
Sadposter 16d8c8b33b Assert on the success of enqueue before returning 2019-04-14 16:05:26 +01:00
Sadposter 5e45557751 Always return {atom, _} from try_send_confirmation 2019-04-14 16:01:48 +01:00
Sadposter ec42b639a3 fix pattern match on user registration 
deliver_async will return a single atom
 2019-04-14 15:46:54 +01:00
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' 
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
 2019-04-12 10:41:09 +00:00
Egor Kislitsyn dd097a406b add tests 2019-04-12 16:38:32 +07:00
Egor Kislitsyn 46bd5c1d87 fix format 2019-04-11 17:28:12 +07:00
Egor Kislitsyn db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop' 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
 2019-04-10 02:10:31 +00:00
lambda 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop' 
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
 2019-04-09 07:30:38 +00:00
Sachin Joshi 07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Sadposter 589629cf3e
Used cached user resources in subscriptions 2019-04-08 15:56:14 +01:00
Sadposter 87a01f9ee0
Use Pleroma.Config instead of Application.get_env 2019-04-08 13:04:30 +01:00
Sadposter 13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
Sadposter 9ca91cbb87 Change relationship direction of subscriptions 2019-04-05 17:02:07 +01:00
Sadposter d56866c824 Add subscribed status to user view 
Added in pleroma extensions, but can be moved whenever
 2019-04-05 15:30:31 +01:00
Sadposter 316fe20d86 Make subscriptions the same direction as blocks 
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
 2019-04-05 15:30:26 +01:00