keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22216 commits 4 branches 0 tags 179 MiB
Commit graph

22216 commits

This branch
This branch
All branches
Author SHA1 Message Date
Unknown
c44ca31aec Why got this even approved? 2019-01-21 08:40:46 -05:00
Unknown
24dbb69421 Added EMPTY key + updated to hypolite's suggestions 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
4d81158dd1 Translated gender etc. in profile view 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
1d8c64cfec Added original keys to maritial status 2019-01-21 08:40:44 -05:00
Jeroen De Meerleer
b70d762574 Added original keys to sexual preference 2019-01-21 08:40:43 -05:00
Jeroen De Meerleer
ab49a613c9 Added original keys to gender 2019-01-21 08:40:43 -05:00
Tobias Diekershoff
7441277e74 missed the day 2019-01-21 09:53:51 +01:00
Tobias Diekershoff
45a5e4a93b Welcome 2019.01 2019-01-21 09:45:16 +01:00
Tobias Diekershoff
92e3ce748f It is 2019 2019-01-21 09:44:58 +01:00
Tobias Diekershoff
c45e57d892
Merge pull request #6474 from tobiasd/2019.01-CHANGELOG 
CHANGELOG for 2019.01
 2019-01-21 09:40:39 +01:00
Tobias Diekershoff
59bcb952b4 forgotten issue 5966 2019-01-21 05:35:02 +01:00
Hypolite Petovan
aba617ae25
Merge pull request #6476 from annando/ap-reshare 
AP: Only reshare stuff that is AP content
 2019-01-20 19:12:19 -05:00
Michael
70c183b495 AP Bugfix: We hadn't transmitted an tag url at all ... 2019-01-20 23:13:55 +00:00
Michael
e2427eb9da We only need to fetch the content once 2019-01-20 22:56:33 +00:00
Michael
9e7c59481f Improved ID detection 2019-01-20 22:19:53 +00:00
Michael
e5d694f7fa AP: Only reshare stuff that is AP content 2019-01-20 21:52:43 +00:00
Tobias Diekershoff
0e476ee21e AP also tested with Hubzilla and Osada 2019-01-20 19:18:26 +01:00
Michael Vogel
ad7b85e0ec
Merge pull request #6475 from tobiasd/20190120-unescapealbums 
HTML unescape existing albums
 2019-01-20 18:58:46 +01:00
Tobias Diekershoff
10b5e7c73f updated CHANGELOG 2019-01-20 18:54:27 +01:00
Tobias Diekershoff
6e258fc760 HTML unescape existing albums 
When uploading a new photo the selection list for chosing existing albums was not shown. With this PR it is now again.xj

Part of #6208
 2019-01-20 18:47:20 +01:00
Tobias Diekershoff
8daac62919 1st round of the CHANGELOG for 2019.01 2019-01-20 16:45:36 +01:00
Michael Vogel
f018c23bd0
Merge pull request #6473 from MrPetovan/bug/5092-redux 
Move theme init after module init but before post/content
 2019-01-20 13:44:21 +01:00
Hypolite Petovan
f4502af239 Fix docblock in mod/admin.php 2019-01-19 22:04:01 -05:00
Hypolite Petovan
89cb1b276d Move rawContent before theme initialization 2019-01-19 22:03:49 -05:00
Hypolite Petovan
765784aad3 [frio] Remove unused code in frio_init() 2019-01-19 21:54:10 -05:00
Hypolite Petovan
6aa0899d67 Move theme selection to init() in mod/admin 2019-01-19 21:53:17 -05:00
Hypolite Petovan
af7b852d04 Insert theme init after module init but before post/content 2019-01-19 21:52:43 -05:00
Tobias Diekershoff
892a395eb7
Merge pull request #6471 from annando/ap-bcc 
Transmit via BCC if contact is hidden, don't store announces
 2019-01-19 18:23:44 +01:00
Michael
809e556009 Transmit via BCC if contact is hidden, don't store announces 2019-01-19 16:44:15 +00:00
Hypolite Petovan
6aebece494
Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links 
use magic links for common/all friends and the directory
 2019-01-19 10:06:35 -05:00
rabuzarus
7b78ba3929 Bugfix - use magicLinks also for common/all friends and the directory 2019-01-19 15:12:46 +01:00
Hypolite Petovan
906f7b5698
Merge pull request #6469 from annando/diaspora-priority 
Avoid that forum posts are received via the Diaspora protocol first
 2019-01-19 08:08:28 -05:00
Michael
103b92fc48 Avoid that forum posts are received via the Diaspora protocol first 2019-01-19 12:30:16 +00:00
Tobias Diekershoff
8bd04cb515
Merge pull request #6465 from annando/theme-fix 
Bugfix: Theme functions hadn't been executed anymore
 2019-01-19 07:24:05 +01:00
Michael
2a0e18c7dd Bugfix: Theme functions hadn't been executed anymore 2019-01-18 20:08:35 +00:00
Hypolite Petovan
3e9f72cdad
Merge pull request #6464 from annando/check-vendor 
Check if the vendor path is missing and complain about it
 2019-01-18 14:25:16 -05:00
Michael
3b5f55d3c6 Check if the vendor path is missing and complain about it 2019-01-18 19:10:05 +00:00
rabuzarus
528d175baa Bugfix - provide magic links for remote user in magicLink() 2019-01-18 17:50:21 +01:00
Tobias Diekershoff
678004e15a
Merge pull request #6461 from annando/contacts-post 
Private posts of contacts hadn't been displayed on the contact's page
 2019-01-18 09:39:10 +01:00
Tobias Diekershoff
97c120d8f2
Merge pull request #6462 from annando/gplus 
Google+ will be history soon, so we remove the first traces
 2019-01-18 09:37:54 +01:00
Michael
d8d72083c0 Google+ will be history soon, so we remove the first traces 2019-01-18 06:58:23 +00:00
Michael
c8bfa0c661 Bugfix: Private posts of contacts hadn't been displayed on the contact's page 2019-01-18 06:22:15 +00:00
Hypolite Petovan
9efe140b54
Merge pull request #6460 from annando/relaying 
Simplyfies AP relaying, fixes relaying of public contacts
 2019-01-17 19:09:33 -05:00
Michael
d813d72b1a Simplyfies AP relaying, fixes relaying of public contacts 2019-01-17 23:06:27 +00:00
Tobias Diekershoff
09a44b3039
Merge pull request #6456 from annando/long-url 
This fixes a problem when the URL is too long
 2019-01-17 07:44:15 +01:00
Tobias Diekershoff
5aacb335ae
Merge pull request #6457 from annando/onepoll-bug 
The "]" had been at the wrong place
 2019-01-17 07:42:45 +01:00
Michael
98d44ce7c7 The "]" had been at the wrong place 2019-01-17 05:32:06 +00:00
Hypolite Petovan
8dbab8f8ce
Merge pull request #6455 from annando/issue-6282 
Issue 6282: Update the contact data regularly (including the network)
 2019-01-16 18:53:27 -05:00
Michael
ce37e981cb This fixes a problem when the URL is too long 2019-01-16 22:34:57 +00:00
Michael
fe0339dabe Fixing a bug, adding some logging 2019-01-16 22:19:41 +00:00