Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 18:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
29156 commits 3 branches 64 tags 237 MiB
Commit graph

29156 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
0edc058a17 Ensure that the daemon is called faster and more reliably 2020-11-18 13:29:10 +00:00
Hypolite Petovan
46ea5dc4a5
Merge pull request #9541 from annando/post-user 
New table "post-user" and more foreign keys
 2020-11-18 08:13:18 -05:00
Michael
f36ecdf6bf Replacing deprecated log calls 2020-11-18 09:14:12 +00:00
Michael
4f7d42a0d3 Fixed copy&paste error 2020-11-18 05:55:15 +00:00
Michael
b09ffa0697 Relocate system user creation 2020-11-18 05:33:17 +00:00
Michael
d7fa58d81c Ensure to never delete the "0" user 2020-11-18 05:24:04 +00:00
Michael
81a03b137b Test: only insert empty user 2020-11-18 05:04:17 +00:00
Michael
a2c652bef5 No "not null" 2020-11-18 00:31:05 +00:00
Michael
4c78ac3ce2 Avoid foreign key problem 2020-11-18 00:24:38 +00:00
Michael
1e9d3342a3 Changed order of inserts 2020-11-18 00:13:39 +00:00
Michael
fed1ace311 Fix condition 2020-11-17 23:59:14 +00:00
Michael
317921e51c Changed order 2020-11-17 23:45:16 +00:00
Michael
3fe7d035d4 Merge remote-tracking branch 'upstream/develop' into post-user 2020-11-17 23:31:41 +00:00
Michael Vogel
dc5624b0b6
Merge pull request #9543 from MrPetovan/bug/notices 
Address several notices
 2020-11-18 00:30:31 +01:00
Michael Vogel
c6d647b8df
Merge pull request #9540 from MrPetovan/bug/9538-security-blind-attack-username 
Escape contact names in several HTML snippets/jQuery insert contexts
 2020-11-18 00:20:43 +01:00
Hypolite Petovan
096cb19d12 Suppress notice when causer-id exists but not causer-link in Model\Item::isAllowedByUser 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-723440980
 2020-11-17 18:06:16 -05:00
Hypolite Petovan
260b9e7bd3 Improve expectation for not modified check in theme/vier/style 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-721994406
 2020-11-17 18:01:03 -05:00
Hypolite Petovan
ccad67c68f Use correct contact key in Protocol\ActivityPub\Transmitter 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-719866843
 2020-11-17 17:59:39 -05:00
Hypolite Petovan
93380b8471 Suppress notice while logging in Model\Contact 
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-716042132
 2020-11-17 17:57:37 -05:00
Hypolite Petovan
283b70928d Remove top-level parent check from Protocol\OStatus 
- It's done in Item::insert instead
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
 2020-11-17 17:54:07 -05:00
Hypolite Petovan
54aef550c5 Remove superfluous mentions of parent-uri in Protocol\Diaspora 
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
 2020-11-17 17:54:07 -05:00
Michael
5668192f38 Moved table definition 2020-11-17 22:49:55 +00:00
Michael
7615c022be Improved logging 2020-11-17 22:41:53 +00:00
Michael
219c651289 Removed test logging 2020-11-17 22:38:52 +00:00
Michael
eaa58da25b New table "post-user" and more foreign keys 2020-11-17 22:33:44 +00:00
Hypolite Petovan
b2666e7794 Escape user name in introduction fields help text 
- HTML help text aren't escaped in the template

# Conflicts:
#	src/Module/Notifications/Introductions.php
 2020-11-16 18:21:11 -05:00
Hypolite Petovan
bbd3e44bb2 Escape user names in notifications 
- The HTML notification message interpolation is unfiltered by the template

# Conflicts:
#	mod/ping.php
 2020-11-16 18:20:23 -05:00
Hypolite Petovan
b2c4116357 Replace JQuery .text by .html 
- Prevents inserting unescaped HTML in page
 2020-11-16 18:19:24 -05:00
Hypolite Petovan
ba0d3b2435
Merge pull request #9537 from annando/item-lock 
Fallback to database lock if locking fails
 2020-11-16 16:05:24 -05:00
Michael
deb6b7a7c3 Fallback to database lock if locking fails 2020-11-16 19:46:20 +00:00
Hypolite Petovan
a69c98e32f
Merge pull request #9535 from annando/ap-relay 
Relay code reworked to support AP delivery
 2020-11-15 20:27:08 -05:00
Michael
0384bf3e76 Relay code reworked to support AP delivery 2020-11-15 23:28:05 +00:00
Michael Vogel
42be636118
Merge pull request #9515 from MrPetovan/task/9464-block-replies 
Reject replies when author is blocked by thread owner
 2020-11-15 18:44:48 +01:00
Hypolite Petovan
682b9c24f8 Update database.sql with the latest structure changes 2020-11-15 11:42:46 -05:00
Michael Vogel
64ce43cdef
Merge pull request #9534 from MrPetovan/bug/smilies-image-description 
Prevent image descriptions from being replaced by local smilies
 2020-11-15 07:21:27 +01:00
Hypolite Petovan
dbb33399bc Prevent image descriptions from being replaced by local smilies 
- AP-received emojis have their code in the image description
 2020-11-15 00:12:26 -05:00
Hypolite Petovan
b5d3fcb8d4 Move top-level permission check outside of Model\Item::getTopLevelParentData 
- It wasn't checked when the direct parent was also the top-level parent
 2020-11-14 10:11:26 -05:00
Hypolite Petovan
cb963a3259 Retrieve local top level parent item separately to check permissions in Model\Item::getTopLevelParentData 2020-11-14 10:11:26 -05:00
Hypolite Petovan
c98da63041 [Database version 1375] Add update method to populate missing item.thr-parent values 2020-11-14 10:11:26 -05:00
Hypolite Petovan
2e7c505ac0 Revert wrong item.thr-parent field usage in Protocol\OStatus 2020-11-14 10:08:52 -05:00
Hypolite Petovan
042f6b98ac Remove unnecessary data array assignment in Protocol\Feed 2020-11-14 10:08:51 -05:00
Hypolite Petovan
5ce8cc24de Clarify parameter type in DFRN::mail 2020-11-14 10:08:51 -05:00
Hypolite Petovan
ff66633a44 Remove references to item.parent-uri in Worker\OnePoll 2020-11-14 10:08:51 -05:00
Hypolite Petovan
a9d114316d Ensure the parent field isn't set during Item insertion 
- Avoid a database error if a null value is provided
 2020-11-14 10:08:51 -05:00
Hypolite Petovan
c36ca3cffe Fix null value for item.parent column 2020-11-14 10:08:51 -05:00
Hypolite Petovan
d3708cf1c2 Fix wrong variable use in Model\Item::getTopLevelParent 
- It was preventing items at levels 3 and beyond to be inserted
- Logging for missing top level parent has been bumped to notice
 2020-11-14 10:08:51 -05:00
Hypolite Petovan
eebcf1ae86 Separate $parent_item and $toplevel_item in mod/item 2020-11-14 10:08:51 -05:00
Hypolite Petovan
355cd401ae Replace uri fields conditions by gravity condition in Model\Item::insert 2020-11-14 10:08:51 -05:00
Hypolite Petovan
ffc364f2a4 Reject replies when author is blocked by thread owner in Model\Item::insert 
- Move user-level item permission to Model\Item::isAllowedByUser
- Add user-level check for comments on top-level item
 2020-11-14 10:08:50 -05:00
Hypolite Petovan
5e76def1ff Clarify item.parent-uri use in database field comment 2020-11-14 10:08:50 -05:00