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

26613 Commits

Author SHA1 Message Date
Michael c261457b03 Store the interaction date as well. 2020-03-10 22:04:03 +00:00
Michael 07a487cfdc Fixed indentation 2020-03-10 21:21:48 +00:00
Michael f27900ad78 Reduce the load of "gfollower" 2020-03-10 21:10:59 +00:00
Michael Vogel 2b5ef80912
Merge pull request #8395 from AlfredSK/AlfredSK-remove-checkbox 
Remove orphaned checkbox for compose page
 2020-03-09 21:37:06 +01:00
Steffen K9 61f0fb9dcf
Remove orphaned checkbox for compose page 2020-03-09 21:22:10 +01:00
Michael Vogel d19bc3116c
Merge pull request #8392 from MrPetovan/bug/fatal-errors 
Ensure non-NULL values in $data array in Contact::updateAvatar
 2020-03-09 20:44:18 +01:00
Hypolite Petovan 07dde8deb8 Remove unused return value of Contact::updateAvatar 2020-03-09 11:39:48 -04:00
Hypolite Petovan 89534b5be3 Ensure non-NULL values in $data array in Contact::updateAvatar 
- Throw Exception instead of returning false if contact doesn't exist
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-596271239
 2020-03-09 11:13:09 -04:00
Hypolite Petovan 2702732308 Import FriendicaNetwork\HTTPException in Model\Contact 2020-03-09 11:11:06 -04:00
Hypolite Petovan 8d9d8512ce
Merge pull request #8385 from annando/issue-8383 
Issue 8383: Fixes probing requests with doubled protocols
 2020-03-09 10:11:19 -04:00
Michael Vogel f68553c99c
Merge pull request #8391 from tobiasd/20200309-de 
DE, FR, JA, ZH-CN translation updated
 2020-03-09 12:42:13 +01:00
Tobias Diekershoff c8328a8446 update to the zh-cn translation THX Tomacat 2020-03-09 11:14:31 +01:00
Tobias Diekershoff 4683cfee12 updated JA translation THX Ozero Dien 2020-03-09 11:13:58 +01:00
Tobias Diekershoff 53cd36885d update FR translations THX Pbutterflyoffire_temp 2020-03-09 11:13:18 +01:00
Tobias Diekershoff ddb6335d22 DE translation update 2020-03-09 10:59:00 +01:00
Tobias Diekershoff 50c2cb6535
Merge pull request #8390 from annando/fix-fatal 
Fix fatal error (TypeError)
 2020-03-09 10:12:28 +01:00
Michael c514da1738 Fix fatal error (TypeError) 2020-03-09 08:59:56 +00:00
Tobias Diekershoff d6ed0068e6
Merge pull request #8388 from annando/fetch 
Additional logging and additional path for fetching posts
 2020-03-09 07:20:13 +01:00
Tobias Diekershoff 09a0be73bf
Merge pull request #8389 from annando/gitignore 
Added VSCode to .gitignore
 2020-03-09 07:16:37 +01:00
Michael d1833ee13e Added VSCode to .gitignore 2020-03-09 06:15:29 +00:00
Michael Vogel a0b00aee30 Additional logging and additional path for fetching posts 2020-03-09 06:50:01 +01:00
Tobias Diekershoff 1f4d371923 Merge branch '2020.03-rc' of https://github.com/friendica/friendica into 2020.03-rc 2020-03-09 06:44:12 +01:00
Tobias Diekershoff 416b0b814e 2020.03-rc 2020-03-09 06:43:37 +01:00
Hypolite Petovan 8c10099abf
Merge pull request #8387 from annando/gcontact-discovery 
Performance changes to the gcontact discovery
 2020-03-09 01:30:44 -04:00
Hypolite Petovan f788cd5851
Merge pull request #8384 from annando/issue-8371 
Issue 8371: Improvements for picture permissions
 2020-03-09 01:25:13 -04:00
Hypolite Petovan d89f90e80e
Merge pull request #8381 from annando/Invalid-consumer-key 
API: Only perform OAuth when no login data are provided
 2020-03-09 01:23:36 -04:00
Michael Vogel 02027fff13
Merge pull request #8386 from nupplaphil/bug/fix_mail 
Fix & align HTML mail text
 2020-03-08 22:27:02 +01:00
Michael 03e8609e4e Performance changes to the gcontact discovery 2020-03-08 19:48:26 +00:00
nupplaPhil 06b0df8e46
Fix mail text ... again 2020-03-08 20:24:17 +01:00
Michael 4453e7e47a Standards 2020-03-08 19:07:36 +00:00
Hypolite Petovan ea1bdcc710
Merge pull request #8382 from annando/issue-8268 
issue 8268: Birthday reminders are now more visible
 2020-03-08 12:25:32 -04:00
Michael 0b8b226ee2 Issue 8383: Fixes probing requests with doubled protocols 2020-03-08 14:07:24 +00:00
Michael 37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
Michael 0e22036d0e issue 8268: Birthday reminders are now more visible 2020-03-08 09:33:17 +00:00
Michael bcf9430822 Only perform OAuth when no login data are provided 2020-03-08 08:30:19 +00:00
nupplaPhil 70f35565e1
Fix & align mail text ... again 2020-03-08 08:26:21 +01:00
Hypolite Petovan 95bfc094e8
Merge pull request #8380 from annando/issue-8151 
Issue 8151: Automatic Friend is working again
 2020-03-07 18:33:32 -05:00
Michael e14ed2ce35 Issue 8151: Automatic Friend is working again 2020-03-07 23:19:19 +00:00
Hypolite Petovan 01f8847074
Merge pull request #8377 from annando/show-twitter 
Show the relations of Twitter contacts
 2020-03-07 13:52:14 -05:00
Michael Vogel b8672d08a8
Merge pull request #8379 from tobiasd/20200307-msg 
regen messages.po
 2020-03-07 18:28:25 +01:00
Tobias Diekershoff c9c612598d regen messages.po 2020-03-07 18:09:42 +01:00
Michael 6bef9fb230 Show the relations of Twitter contacts 2020-03-07 13:05:16 +00:00
Hypolite Petovan 79eeb40969
Merge pull request #8365 from nupplaphil/bug/mail_fix_text 
Mail: Remove redundant body creation in case of only a preamble is set
 2020-03-07 06:42:09 -05:00
nupplaPhil 1d15f6f848
Optimize "withMessage()" default 2020-03-07 12:50:19 +01:00
Hypolite Petovan 8487e0be17
Merge pull request #8368 from annando/ap-stuff 
AP: Bugfixing / GContact discovery
 2020-03-07 06:40:57 -05:00
Michael 2722c8e595 Some systems return an array instead of a string for the followers/following 2020-03-07 11:16:10 +00:00
Michael d6905e29cf Query the same contact only once a month 2020-03-07 05:31:03 +00:00
Michael Vogel 668bd8543f
Merge pull request #8376 from MrPetovan/bug/fatal-errors 
Return early if link is missing from share block in Model\Item
 2020-03-07 06:16:34 +01:00
Hypolite Petovan e6e4baa872 Return early if link is missing from share block in Model\Item 
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-594992869
 2020-03-06 20:49:43 -05:00
Michael 9adf09be51 Don't delete and recreate the rows over and over again 2020-03-06 13:51:36 +00:00