friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
31,892 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

31892 Commits

Author SHA1 Message Date
Hypolite Petovan 24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar 
Issue 10720: Use different path scheme for user avatars
 2021-09-18 09:30:08 -04:00
Hypolite Petovan 9c5a3eba53
Merge pull request #10723 from annando/issue-9871-photos 
Issue 9871: Deletion of photos is now possible again
 2021-09-18 09:28:10 -04:00
Michael Vogel 9e3cfc3d8c
Merge pull request #10704 from nupplaphil/bug/notices 
Fix various Notices
 2021-09-18 13:08:37 +02:00
Philipp Holzer c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp Holzer fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
Philipp Holzer 6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
Philipp Holzer 462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp Holzer 89a085a12c
Check DBA::count() result 2021-09-18 12:51:08 +02:00
Philipp Holzer 644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael 56a143c5c6 Duplicated "value" removed 2021-09-18 07:32:05 +00:00
Michael 21a3388096 Issue 9871: Deletion og photos is now possible again 2021-09-18 07:28:29 +00:00
Michael a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Hypolite Petovan 9b19fb9b4d
Merge pull request #10719 from annando/fatal-mail 
Fix fatal error when following mail accounts
 2021-09-16 18:34:17 -04:00
Michael 49e1cb9dd1 Fix fatal error when following mail accounts 2021-09-16 18:19:36 +00:00
Tobias Diekershoff e6c054c276
Merge pull request #10666 from tobiasd/20210905-credits 
regen CREDITS for the 2021.09 release
 2021-09-16 11:19:34 +02:00
Michael Vogel 174a47cb71
Merge pull request #10715 from MrPetovan/bug/10691-scheduled-date-picker-timezone 
Simplify max_data parameter for Temporal::getDateTimeField in include/conversation
 2021-09-16 00:00:42 +02:00
Hypolite Petovan 9a0c3cc834 Simplify max_data parameter for Temporal::getDateTimeField 2021-09-15 15:56:44 -04:00
Philipp 69642132c1
Merge pull request #10717 from nupplaphil/bug/drone_missing_bin 
Bugfix Drone/Docker: forgot a file
 2021-09-15 08:31:53 +02:00
Philipp Holzer c9f451eeba
Bugfix Drone/Docker: forgot a file 2021-09-15 08:29:55 +02:00
Michael Vogel 695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token 
Use CSRF token as name and value for contact deletion confirm form
 2021-09-15 07:55:34 +02:00
Tobias Diekershoff 2dc5d8554c
Merge pull request #10714 from MrPetovan/bug/10705-stay-local-contact-url 
Link to displayed contact URL no matter the "Stay local" setting value
 2021-09-15 07:27:32 +02:00
Hypolite Petovan 2ed509f138
Merge pull request #10712 from annando/duplicates 
Avoid duplicated filed posts
 2021-09-14 17:39:45 -04:00
Hypolite Petovan 458e26b00a Link to displayed contact URL no matter the "Stay local" setting value 2021-09-14 17:39:03 -04:00
Hypolite Petovan da869260ef
Merge pull request #10711 from annando/indentation 
Fixed indendation
 2021-09-14 17:30:11 -04:00
Hypolite Petovan 44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04:00
Hypolite Petovan 06b8f93eae Add support for specific confirm value in confirm.tpl 
- button tags allow for a different value from the label
 2021-09-14 17:28:07 -04:00
Hypolite Petovan 3068cb5788 [frio] Fix contact deletion modal URL concatenation 
- The deletion URL now has an initial query string parameter in the form of a CSRF token
 2021-09-14 17:27:16 -04:00
Michael 7a51a7f6c6 Avoid duplicated filed posts 2021-09-14 21:27:09 +00:00
Michael Vogel a689db7b64
Update src/Protocol/ActivityPub.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-09-14 23:22:57 +02:00
Michael b18f92ea72 Fixed indendation 2021-09-14 20:46:59 +00:00
Hypolite Petovan 39e4ab89fa
Merge pull request #10708 from annando/peertube-videos 
Better handling of displaying peertube videos
 2021-09-14 15:34:30 -04:00
Michael Vogel 67a2444bc8
Merge pull request #10709 from tobiasd/20210914-hu 
HU translation updated THX Balázs Úr
 2021-09-14 18:59:31 +02:00
Tobias Diekershoff f0b589f6d7 HU translation updated THX Balázs Úr 2021-09-14 18:09:09 +02:00
Michael f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
Michael 72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
Tobias Diekershoff c3172cf3cb
Merge pull request #10707 from annando/issue-10706 
Issue 10706: Publish public custom fields in AP
 2021-09-14 06:54:48 +02:00
Michael d33fea1993 Fix: Use the $uid 2021-09-14 02:00:40 +00:00
Michael e3413cf959 Issue 10706: Publish public custom fields in AP 2021-09-14 01:28:58 +00:00
Michael 2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
Michael 5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
Michael Vogel c8344886fd
Merge pull request #10703 from tobiasd/20210913-fr 
update FR translations THX MrPetovan
 2021-09-13 14:29:06 +02:00
Tobias Diekershoff a0c31fad84 update FR translations THX MrPetovan 2021-09-13 14:13:59 +02:00
Hypolite Petovan d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir 
Add the possibility to use a different configuration directory
 2021-09-13 07:02:52 -04:00
Michael 84666a314a Rearranged fields 2021-09-13 08:22:11 +00:00
Michael Vogel 399930e7a6
Merge pull request #10702 from tobiasd/20210913-deru 
DE, RU translation updates
 2021-09-13 10:17:13 +02:00
Tobias Diekershoff 558e06ff5a DE translation updates 2021-09-13 07:41:35 +02:00
Tobias Diekershoff 5f1016bb61 RU translations THX Alexander An 2021-09-13 07:41:26 +02:00
Michael 7c2913488c Remove deprecated fields 2021-09-12 21:02:29 +00:00
Michael 0a01f0443e Deprecated fields 2021-09-12 20:50:03 +00:00
Michael Vogel e3fbc2d99f
Merge pull request #10701 from nupplaphil/bug/10699 
Fixing #10699 (prohibits blocking and ignoreing from the photo menu)
 2021-09-12 21:58:09 +02:00