0d004a9d04
Email admins when a new unapproved account is up for review
2020-07-14 20:31:20 -05:00
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
2020-07-14 00:22:12 -05:00
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
2f77842bd3
Fix account registration when captcha is enabled but not provided
2020-04-29 21:26:07 +04:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
2019-07-17 18:09:31 +00:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
2019-05-01 12:29:33 +07:00
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
ac04311b3f
Fix search in TwitterAPI
2019-04-18 10:24:06 +03:00
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
db4badc6aa
move user disable into deactivation
2019-04-11 17:22:42 +07:00
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-11 15:51:52 +07:00
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
a53d591ac5
code style
2019-04-06 20:47:05 +07:00
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
2019-04-02 17:47:02 +07:00
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
2019-04-02 16:50:31 +07:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
a2e03d4f3c
Initial attempt at updating return type
2019-03-18 13:56:59 +00:00
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
c3d41b2b6e
[Credo] make all variables use snake_case
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
22ac2288be
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-03-04 20:48:43 +07:00
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
2019-03-04 01:00:37 +03:00
efa506b874
delegate user retrieval to the User module
2019-02-24 13:23:47 -05:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
2019-02-10 20:54:21 +00:00
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +01:00
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
Alex Gleason
Egor Kislitsyn
Alexander Strizhakov
Maksim Pechnikov
rinpatch
Ariadne Conill
Eugenij
lambda
Haelwenn (lanodan) Monnier
William Pitcock
Zachary Dunn
11backslashes
lambda
kaniini
Ekaterina Vaartis