lain
|
9b5cd8b1b7
|
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
|
2020-01-10 13:07:20 +00:00 |
|
Alexander Strizhakov
|
6395ad942c
|
Update AdminFE build
|
2020-01-10 15:52:02 +03:00 |
|
Alexander Strizhakov
|
88a16bb9fc
|
deep merge in config update
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
c841174de8
|
flag for delete fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
0b02040327
|
little fixes and typos fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
9c1f3bfeff
|
fixes for logger backends
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
cda2c1fc63
|
fix for subgroup tuple
added settings for swoosh adapters local
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
063ab6d911
|
logger backends fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
583cee4607
|
parsing proxy url setting
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
f9d01068cf
|
suggestions fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
bb9a43c3ae
|
typo fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
4306769671
|
adapter children
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
a71393dd29
|
fix for endpoints after env update
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
e412d2f152
|
test fixes after rebase
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
5cacb988b9
|
partially settings update
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
0656816c77
|
tests for setttings without an explicit key
|
2020-01-10 15:51:59 +03:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03:00 |
|
lain
|
e118d639a0
|
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
|
2020-01-10 11:09:07 +00: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
|
89243fee8e
|
Fix captcha time, which was meant to be 5 minutes
|
2020-01-09 15:45:46 -06:00 |
|
feld
|
e8b0c7689a
|
Merge branch 'update/adminfe-20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
|
2020-01-09 18:35:17 +00:00 |
|
Mark Felder
|
fd3c23af63
|
Update AdminFE build
|
2020-01-09 10:00:15 -06:00 |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
2020-01-08 16:40:49 +03:00 |
|
rinpatch
|
fcd5dd259a
|
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
|
2020-01-07 11:43:22 +00:00 |
|
lain
|
180f257ced
|
Update CHANGELOG.md
|
2020-01-06 14:10:07 +00:00 |
|
RX14
|
b55f2563d0
|
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
|
2020-01-05 19:00:48 +00:00 |
|
eugenijm
|
0b6d1292d2
|
Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
|
2020-01-05 17:38:51 +03:00 |
|
Maksim Pechnikov
|
fa7d8e77e6
|
fixed Metadata.Utils.scrub_html_and_truncate
|
2020-01-03 16:28:13 +03:00 |
|
Ivan Tashkinov
|
badd0a96ea
|
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
|
2020-01-02 13:03:33 +03:00 |
|
rinpatch
|
ee0c40831e
|
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
|
2019-12-28 12:57:21 +00:00 |
|
Egor Kislitsyn
|
520940d3e2
|
Update captcha dependency
|
2019-12-28 19:48:54 +07:00 |
|
Maksim Pechnikov
|
933dc12043
|
added code of mr#2067
|
2019-12-25 15:12:43 +03:00 |
|
Haelwenn
|
11e010fc77
|
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
|
2019-12-24 19:57:41 +00:00 |
|
Maksim Pechnikov
|
385356aad0
|
fix oauth scopes for AdminApi#reports_update
|
2019-12-24 20:51:52 +03:00 |
|
lain
|
10ce7185c2
|
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
|
2019-12-23 16:31:15 +00:00 |
|
Maksim Pechnikov
|
969769730e
|
update tests
|
2019-12-23 17:12:55 +03:00 |
|
Egor Kislitsyn
|
b012e66e4e
|
Increase CAPTCHA expiration time to 5 minutes
|
2019-12-23 15:14:46 +07:00 |
|
Maksim Pechnikov
|
bdd71669da
|
update test
|
2019-12-22 21:21:31 +03:00 |
|
Maksim
|
4c505bc615
|
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
|
2019-12-22 17:58:54 +00:00 |
|
Maksim
|
c9a44ec4a6
|
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
|
2019-12-22 17:58:45 +00:00 |
|
Maksim Pechnikov
|
5b84156013
|
moved remote follow in separate controller
|
2019-12-21 21:27:42 +03:00 |
|
rinpatch
|
c51e93978e
|
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
|
2019-12-21 11:56:24 +00:00 |
|
rinpatch
|
7447c80e33
|
Merge branch 'revert-a54aa5af' into 'develop'
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
|
2019-12-21 11:49:35 +00:00 |
|
Maxim Filippov
|
e71a13ad57
|
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
|
2019-12-21 11:41:19 +00:00 |
|
feld
|
0193b0862f
|
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
|
2019-12-20 22:40:52 +00:00 |
|
Mark Felder
|
06ae56a3ae
|
Posts without media attachments should get the Summary TwitterCard
|
2019-12-20 16:32:04 -06:00 |
|
feld
|
a54aa5af43
|
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
|
2019-12-20 16:30:26 +00:00 |
|
feld
|
60819fd973
|
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
|
2019-12-20 16:30:00 +00:00 |
|
Maksim Pechnikov
|
7bd0bca2ab
|
fixed remote follow
|
2019-12-20 16:33:44 +03:00 |
|