hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8,260 commits 1 branch 0 tags 241 MiB
Commit graph

625 commits

Author SHA1 Message Date
Henry Jameson
192426b485 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (63 commits)
  Fix email mix task on OTP releases
  Actually fix upload limit on OTP releases
  Questions: Add timezone to `closed` property
  deps: update plug to 1.9
  Add User.get_follow_state/2
  fix
  EmojiReactions: Rename to EmojiReacts
  Update FE bundle
  Update CHANGELOG
  Cancellation of a follow request for a remote user
  Simplify in-database config docs
  description change
  dropdown type
  removing confusing error
  Apply suggestion to CHANGELOG.md
  removing migrate_from_db endpoint from admin api
  Remove AutoLinker `scheme` option from the config
  Add support for cancellation of a follow request
  Add cheatsheet entry
  fix not being able to pin polls
  ...
 2020-02-09 21:28:21 +02:00
Alexander Strizhakov
7a2e153a8d
 		description change 2020-02-06 13:15:23 +03:00
Alexander Strizhakov
bdf0a87be9
 		dropdown type 2020-02-06 12:50:37 +03:00
feld
b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop' 
Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
 2020-02-05 20:32:45 +00:00
Egor Kislitsyn
3909b5b7b3
 		Remove AutoLinker scheme option from the config 2020-02-05 21:13:56 +04:00
Roman Chvanikov
8057157ee3 Make attachments cleanup optional 2020-01-31 01:20:37 +03:00
rinpatch
7499805abf config.exs: Re-enable rate limiter and enable remote ip 2020-01-30 00:06:58 +03:00
Henry Jameson
43ea736c37 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (466 commits)
  Fix compatibility with Elixir v1.10
  Add test for custom base_url when deleting an attachment
  Fix base_url string trimming
  Add logging
  Remove `whole_db` parameter everywhere, it's not used anymore
  Fix __MODULE__ usage
  DOCS General update for the "Introduction to Pleroma" section
  update ecto
  Remove unused var
  explicitly describe perform op in AttachmentsClenupWorker
  Remove user recommendation by third party engine
  little fixes
  Fix typo
  description typos, Oban verbose type fix, new keys
  can be changed in runtime
  respect settings from database in mix tasks
  Document dynamic_configuration breaking change
  Emoji reactions: Update docs and changelog
  Emoji reactions: Change api format once more
  fix for non existing atom
  ...
 2020-01-28 18:07:04 +02:00
Hakaba Hitoyo
dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Alexander Strizhakov
f72727a409
 		little fixes 2020-01-27 12:53:21 +03:00
Alexander Strizhakov
5943d78c74
 		description typos, Oban verbose type fix, new keys 2020-01-25 19:45:51 +03:00
feld
0a5e792454 Merge branch 'fix/better-descriptions-for-email-fields' into 'develop' 
Better descriptions for email fields for admin-fe

Closes admin-fe#67

See merge request pleroma/pleroma!2138
 2020-01-24 13:54:44 +00:00
Alexander Strizhakov
e9d8a84790
 		better descriptions for email fields for admin-fe 2020-01-24 11:19:12 +03:00
Alexander Strizhakov
b0ae69d996
 		removing deleted MDII uploader from suggestions 2020-01-24 11:05:03 +03:00
Alexander Strizhakov
32a643a159
 		Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Roman Chvanikov
795a5fe441 Add delete_attachments queue to config 2020-01-21 19:48:14 +03:00
Alexander Strizhakov
f01ab6cd29
 		some refactor and tests 2020-01-21 18:42:00 +03:00
Alexander Strizhakov
503d966e9f
 		Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
Alexander Strizhakov
efb8ef5abe
 		releases support 2020-01-18 17:14:50 +03:00
Alexander Strizhakov
e699861690
 		full update for some subkeys 2020-01-18 12:25:56 +03:00
Ivan Tashkinov
5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
Alexander Strizhakov
41c7f34905
 		short labels and fixes for typos 2020-01-14 15:00:38 +03:00
Alexander Strizhakov
70c7a26de8
 		Merge branch 'develop' into admin-be 2020-01-14 14:52:00 +03:00
feld
6cc5341d26 Merge branch 'config/benchmark' into 'develop' 
Benchmark env uses test database so we should be able to use test.secret.exs

See merge request pleroma/pleroma!2057
 2020-01-12 18:31:10 +00:00
Hakaba Hitoyo
0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alexander Strizhakov
7d128ca208
 		dynamic_configuration renaming 
and moving it from instance settings
 2020-01-10 19:34:19 +03:00
Alexander Strizhakov
00aff5f78c
 		syncing new setting to descriptions.exs 2020-01-10 17:54:54 +03:00
Ivan Tashkinov
39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 
# Conflicts:
#	lib/pleroma/user.ex
 2020-01-10 16:18:32 +03:00
Alexander
0b02040327
 		little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander
cda2c1fc63
 		fix for subgroup tuple 
added settings for swoosh adapters local
 2020-01-10 15:52:01 +03:00
Alexander
f9d01068cf
 		suggestions fix 2020-01-10 15:52:01 +03:00
Alexander
4306769671
 		adapter children 2020-01-10 15:52:00 +03:00
Alex S
2753285b77
 		config editing through database 2020-01-10 15:51:59 +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
89243fee8e Fix captcha time, which was meant to be 5 minutes 2020-01-09 15:45:46 -06:00
Egor Kislitsyn
b012e66e4e
 		Increase CAPTCHA expiration time to 5 minutes 2019-12-23 15:14:46 +07:00
Mark Felder
b7811dfb7b Instead allow a dedicated benchmark config 2019-12-19 12:16:53 -06:00
Mark Felder
50638525db Merge branch 'develop' into config/benchmark 2019-12-19 12:16:33 -06:00
Egor Kislitsyn
b9a87b1baa
 		Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn
fc484e5ce6
 		Add Kocaptcha endpoint to config.exs 2019-12-16 19:35:10 +07:00
Egor Kislitsyn
8d242f52d4
 		Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" 
This reverts commit 82c62c5028.
 2019-12-16 19:33:51 +07:00
Egor Kislitsyn
82c62c5028
 		Add default endpoint to Pleroma.Captcha.Kocaptcha 2019-12-16 15:32:33 +07:00
Egor Kislitsyn
7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
Egor Kislitsyn
470a3a678d Add Kocaptcha endpoint to the test config 2019-12-12 18:04:52 +07:00
Egor Kislitsyn
e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
stwf
63ffa0e3ed try local sheduling 2019-12-11 14:57:33 -05:00
Mark Felder
df469b4468 Benchmark env uses test database so we should be able to use test.secret.exs 2019-12-11 12:52:57 -06:00
Ivan Tashkinov
835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes 
# Conflicts:
#	CHANGELOG.md
 2019-12-10 08:55:14 +03:00
Egor Kislitsyn
c098dec473 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-10 00:16:43 +07:00
Egor Kislitsyn
ed92784e7c Set Logger level to :info in prod 2019-12-09 19:11:54 +07:00