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

15,284 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Strizhakov
103f3dcb9e
 		rich media parser ttl files consistency 2020-10-13 16:38:15 +03:00
Alexander Strizhakov
7dffaef479
 		tests consistency 2020-10-13 16:35:09 +03:00
Alexander Strizhakov
6bf85440b3
 		mix tasks consistency 2020-10-13 16:33:24 +03:00
Alexander Strizhakov
b573711e9c
 		file locations consistency 2020-10-13 16:33:24 +03:00
Mark Felder
eea879eb36 Update AdminFE build to latest develop 2020-10-13 07:51:48 -05:00
lain
5ed7eb1a26 Merge branch 'preload-frontend-config' into 'develop' 
Preload `/api/pleroma/frontend_configurations`, fixes #1932

Closes #1932

See merge request pleroma/pleroma!3075
 2020-10-13 11:33:39 +00:00
Alex Gleason
83ae45b000
 		Preload /api/pleroma/frontend_configurations, fixes #1932 2020-10-12 18:49:37 -05:00
Alex Gleason
66e00ace7c
 		Refactor User.post_register_action/1 emails 2020-10-12 17:21:08 -05:00
Ali Riza Keles
06934b820e
 		Add ejabberd auth document 2020-10-12 23:20:10 +01:00
Alex Gleason
cb29769a22
 		Make User.confirm/1 and User.approve/1 idempotent 2020-10-12 16:42:59 -05:00
Alex Gleason
6ebec50df6
 		Refactor User.confirm/1, add more tests 2020-10-12 16:32:34 -05:00
Alex Gleason
9ddc292ca8
 		TwitterAPI: test pending approval user email 2020-10-12 15:25:14 -05:00
feld
42b4b95467 Merge branch 'docs/improve-backup-restore' into 'develop' 
Further improvements to backup/restore docs

See merge request pleroma/pleroma!3072
 2020-10-12 17:46:25 +00:00
Mark Felder
c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
feld
03855f9789 Merge branch 'improve/instance-gen' into 'develop' 
#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070
 2020-10-12 17:24:24 +00:00
Mark Felder
6ec1b1615b Further improvements 2020-10-12 12:23:20 -05:00
feld
68d0380633 Merge branch 'chore/copyright-headers' into 'develop' 
Add missing Copyright headers

See merge request pleroma/pleroma!3071
 2020-10-12 17:20:09 +00:00
Mark Felder
8539e386c3 Add missing Copyright headers 2020-10-12 12:00:50 -05:00
Mark Felder
6c61ef14c3 Support enabling upload filters during instance gen 2020-10-12 11:19:48 -05:00
Alex Gleason
bb8c0614ef
 		Move admin approval email logic into User.post_register_action/1 2020-10-11 21:46:10 -05:00
Alex Gleason
521e965884
 		Registration tests 2020-10-11 21:38:01 -05:00
Alex Gleason
28005563f0
 		Send approval pending email during registration 2020-10-11 20:50:09 -05:00
Alex Gleason
c69b205409
 		Registration: user state is separate from instance state 2020-10-11 19:25:34 -05:00
Alex Gleason
b2fed59209
 		Handle User.post_register_action/1 in steps 2020-10-11 18:52:35 -05:00
Ivan Tashkinov
2498e569f1 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-11 22:34:48 +03:00
Ivan Tashkinov
89c595b772 [#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests. 2020-10-11 22:34:28 +03:00
Henry Jameson
5f23876552 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (180 commits)
  Deep link to the user account in AdminFE in account confirmation emails
  Spelling
  Ask user to use matching values for database setup
  Syntax error
  Don't always need to drop
  Improve backup/restore documentation
  Lint
  Apply 1 suggestion(s) to 1 file(s)
  Apply 1 suggestion(s) to 1 file(s)
  Apply 2 suggestion(s) to 2 file(s)
  Improve description yet again
  Don't leak internal variables in the docs. They're useless to users.
  Credo
  Improve descriptions for reserved and proxies
  Add test for an entry without CIDR format
  Move hardcoded default configuration into config.exs
  Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
  Document the NSFW link preview change
  Add helper function to convert single IPs into CIDR format if they were not provided that way
  Docs: Modify docs so the postgres config is harder to get wrong.
  ...
 2020-10-11 21:13:29 +03:00
Ivan Tashkinov
e1eb54d389 [#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity). 2020-10-11 13:37:19 +03:00
Alex Gleason
5c8d2c468c
 		Blocks: update CHANGELOG 2020-10-10 03:44:20 -05:00
Alex Gleason
7c2d0e378c
 		Blocks: make blockers_visible config work 2020-10-10 03:41:35 -05:00
Alex Gleason
2fc7ce3e1e
 		Blocks: add blockers_visible config 2020-10-10 01:58:57 -05:00
Alex Gleason
d2364276a1
 		Blocks: always see your own posts 2020-10-10 01:58:48 -05:00
feld
bc3cf0fee0 Merge branch 'feat/deep-link-account-approval' into 'develop' 
Deep link to the user account in AdminFE in account confirmation emails

See merge request pleroma/pleroma!3065
 2020-10-09 22:35:09 +00:00
Mark Felder
3ca98878d2 Deep link to the user account in AdminFE in account confirmation emails 2020-10-09 17:08:05 -05:00
feld
1aabc0672e Merge branch 'docs/improve-backup-restore' into 'develop' 
Spelling

See merge request pleroma/pleroma!3063
 2020-10-09 16:30:35 +00:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Mark Felder
ec217ca638 Spelling 2020-10-09 11:18:48 -05:00
feld
d239bd3ca4 Merge branch 'docs/improve-backup-restore' into 'develop' 
#2219 Improve backup/restore documentation

See merge request pleroma/pleroma!3061
 2020-10-09 14:25:24 +00:00
Mark Felder
1e5fec8d45 Ask user to use matching values for database setup 2020-10-09 09:14:02 -05:00
Alex Gleason
9c672ecbb5
 		Remote Timeline: add Streaming support 2020-10-08 20:07:03 -05:00
Alex Gleason
3f9263fb16
 		Merge remote-tracking branch 'upstream/develop' into restrict-origin 2020-10-08 17:24:09 -05:00
Alex Gleason
5ec7d88b77
 		Aliases: fix URL regex 2020-10-08 16:33:47 -05:00
Mark Felder
e0c5adcc20 Syntax error 2020-10-08 15:56:37 -05:00
Mark Felder
5f38e03c8a Don't always need to drop 2020-10-08 15:54:28 -05:00
Mark Felder
a02ed3920f Improve backup/restore documentation 2020-10-08 15:51:56 -05:00
Alex Gleason
a3964b373e
 		Aliases: move changelog entry 2020-10-08 15:46:03 -05:00
Alex Gleason
77b1ea68a7
 		Merge remote-tracking branch 'upstream/develop' into aliases 2020-10-08 15:44:48 -05:00
Haelwenn
74be4de3f6 Merge branch 'fix/2209-remoteip' into 'develop' 
#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057
 2020-10-08 17:29:00 +00:00
Mark Felder
ed6511a086 Lint 2020-10-07 15:28:29 -05:00
Mark Felder
a702f9fb5b Lint 2020-10-07 15:07:03 -05:00