clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,862 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

15862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 2148a2bdb0 Merge pull request #3598 from annando/1707-expiration 
Check general expiration time at item storing as well
 2017-07-23 10:26:58 +02:00
Michael 2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
Michael 8d66909ba5 Check general expiration time at item storing as well 2017-07-23 05:51:55 +00:00
Tobias Diekershoff dd0a1cf586 Merge pull request #3595 from annando/1707-realpath 
Better use a wrapper
 2017-07-22 09:32:29 +02:00
Michael 79fe249c54 Better use a wrapper 2017-07-22 06:43:04 +00:00
Tobias Diekershoff 541dd9ec39 Merge pull request #3594 from annando/1707-realpath 
Use the realpath for the handling with (temporary) paths
 2017-07-22 08:14:08 +02:00
Michael 5d7e1e1a15 Use the realpath for the handling with (temporary) paths 2017-07-22 05:50:25 +00:00
Michael Vogel e854186134 Merge pull request #3591 from zotlabs/spammy_server_detection 
reduce the number of network fetches for server detection of hubzilla…
 2017-07-21 19:37:11 +02:00
Michael Vogel 0f67d82d05 Update socgraph.php 
Two little style changes
 2017-07-21 19:36:13 +02:00
zotlabs a583bda5fc reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes. 2017-07-19 17:56:40 -07:00
Tobias Diekershoff 6f661d50dc Merge pull request #3590 from annando/1707-bugfixes 
Fix crash with expiration, false logger constant, no empty postings
 2017-07-19 17:06:01 +02:00
Michael 4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00:00
Tobias Diekershoff f71bd4f1f7 Merge pull request #3587 from annando/1706-ostatus-attach 
Attached picture from OStatus posts are now displayed
 2017-07-17 22:38:56 +02:00
Michael a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
Michael 1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
Michael f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 2017-07-15 10:36:56 +00:00
Tobias Diekershoff a58f9b3aaa Merge pull request #3585 from annando/bugfix-like-signature 
Bugfix: Signatures for likes hadn't been stored
 2017-07-15 08:22:27 +02:00
Michael 2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
Michael b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
Michael Vogel db0efc3fa8 Merge pull request #3584 from tobiasd/20170714-missingstring 
there was a string not marked for translation
 2017-07-14 22:48:27 +02:00
Tobias Diekershoff b5f58d317e there was a string not marked for translation 2017-07-14 15:21:08 +02:00
Michael 181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 
Conflicts:
	include/text.php
 2017-07-13 20:38:18 +00:00
Tobias Diekershoff 86934119b1 Merge pull request #3580 from annando/issue-3571-2 
Reworked "get_contact"
 2017-07-13 08:34:59 +02:00
Tobias Diekershoff 3334e0332d Merge pull request #3582 from annando/duplicate-error 
Avoid duplicate database errors when storing the conversations
 2017-07-13 08:30:20 +02:00
Tobias Diekershoff e33a710d45 Merge pull request #3581 from annando/bugfix-markdown 
Bugfix: Some special characters weren't converted correctly
 2017-07-13 08:29:04 +02:00
Michael 4c7a197f4b Avoid duplicate database errors when storing the conversations 2017-07-13 06:00:53 +00:00
Michael beaa911bac Bugfix: Some special characters weren't converted correctly 2017-07-13 05:57:37 +00:00
Michael 568abd537a Fixed error reporting 2017-07-12 08:14:36 +00:00
Michael Vogel cbca16de75 Merge pull request #3579 from tobiasd/20170712-de 
DE translations
 2017-07-12 08:29:10 +02:00
Tobias Diekershoff 8654b028ec DE translations 2017-07-12 08:26:26 +02:00
Michael 69f20959ff Update existing contact records with data from probing 2017-07-12 06:07:22 +00:00
Michael a47e1e13d7 Process all data that we can fetch via probing 2017-07-12 05:56:35 +00:00
Michael a8db1282e2 Merge remote-tracking branch 'upstream/develop' into issue-3571-2 2017-07-12 05:41:58 +00:00
Tobias Diekershoff c54b7e84ab Merge pull request #3578 from annando/probe-warning 
Avoid "Invalid argument" warning in probing.
 2017-07-12 07:21:31 +02:00
Michael 35b3723c4a database logging now works for database errors 2017-07-11 19:14:49 +00:00
Michael 8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
Michael 41ec057813 Avoid "Invalid argument" warning in probing. 2017-07-11 17:34:38 +00:00
Tobias Diekershoff 81dedb3f92 Merge pull request #3577 from annando/2in1 
Issue 3571 and Diaspora mail bugfix
 2017-07-11 08:31:39 +02:00
Michael Vogel ee015a249e Merge pull request #3576 from tobiasd/20170710-messages 
regenerated master messages.po file
 2017-07-11 05:58:43 +02:00
Michael 363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00:00
Tobias Diekershoff e88a999a72 regenerated master messages.po file 2017-07-10 18:59:59 +02:00
Michael Vogel 896bf4046c Merge pull request #3569 from tobiasd/20170702-delete 
delete item from admin panel
 2017-07-10 18:44:19 +02:00
Michael Vogel ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age 
fix big age
 2017-07-10 18:43:05 +02:00
Tobias Diekershoff dc41ac0f61 use drop_item and some magic 2017-07-10 14:55:40 +02:00
irhen c6137ca0df is empty check 2017-07-10 14:17:06 +03:00
Tobias Diekershoff 6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy 
DFRN: Update the public item copy as well
 2017-07-09 10:17:22 +02:00
Tobias Diekershoff 5921fd03e5 Merge pull request #3574 from annando/further-expire-split 
Split the delete process into a separate expire process
 2017-07-09 10:15:34 +02:00
Michael 9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00
Michael Vogel 6b1b02472a Merge pull request #3570 from beardyunixer/boot 
Fix/workaround weird load order issue.
 2017-07-09 05:56:03 +02:00
Michael Vogel 0092cdef44 Merge pull request #3572 from deantownsley/contactfix_basic 
Only delete uid=0 entries when cleaning up extra public entries
 2017-07-09 05:55:19 +02:00