Commit graph

5531 commits

Author SHA1 Message Date
Michael 6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
Michael f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
Michael fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Michael b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
Tobias Diekershoff 4d77c8a90a Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
2017-08-08 09:32:26 +02:00
Michael c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) 2017-08-08 06:07:04 +00:00
Johannes Schwab 37262c24d9 Catch exceptions in PDO constructor 2017-08-04 11:01:29 +02:00
Tobias Diekershoff 93fb98959a Merge pull request #3613 from annando/some-ostatus
Speed up of OStatus transmission/Ignoring "created" with remote self
2017-08-03 08:01:04 +02:00
Michael 1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
Michael a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
Michael c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Michael 57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
Tobias Diekershoff f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration
Bugfix: the expiration check in item_store now works again
2017-07-23 22:21:30 +02:00
Michael b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
Tobias Diekershoff 152eec4f2f Merge pull request #3597 from annando/1707-acl-separator
In the acl there is now a separation between groups, forums and contacts
2017-07-23 10:27:40 +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
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
Michael 4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00: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
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 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
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 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 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
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 363322ba78 Issue 3571 and Diaspora mail bugfix 2017-07-10 22:35:32 +00: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
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 af181941db Split the delete process into a separate expire process 2017-07-09 03:37:20 +00:00
irhen 534f79a5a5 fix big age 2017-07-08 23:30:30 +03:00
Dean Townsley 11d271f3c5 Only delete uid=0 entries when cleaning up extra public entries
This delete can inadvertently remove contacts from normal users under
some conditions.  Since it appears to be intended to only operate on
"public" (uid=0) contacts, this change constrains the delete query to
only uid=0 records.
2017-07-08 09:55:40 -05:00
Tobias Diekershoff d88584af69 Merge pull request #3567 from rjm6823/develop
Contacts page directory link
2017-07-08 08:36:54 +02:00
RJ Madsen d7de2e0750 Fixed minor spaces to tabs conversion 2017-07-06 17:33:30 -04:00
RJ Madsen c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen 7593152bcb re-named variable to match scheme 2017-07-06 16:37:55 -04:00
RJ Madsen b7b8c5477b Converted from space to tab indentation 2017-07-06 15:27:03 -04:00