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

5769 Commits

Author SHA1 Message Date
Tobias Diekershoff 417ea99ba5 Merge pull request #3650 from annando/feed-probing 
Probing sometimes failed / problems with some web servers
 2017-08-24 10:16:24 +02:00
Michael c09c806f78 Probing sometimes failed / problems with some web servers 2017-08-24 07:56:46 +00:00
Michael ba52dd9fa7 Merge remote-tracking branch 'upstream/develop' into pleroma2 2017-08-24 06:26:58 +00:00
Michael 6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
Michael e533572ca3 Issue 3645: Avoid problems with boolean values 2017-08-23 19:40:42 +00:00
Michael b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
Michael 51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
Michael 85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
Michael 17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
Michael e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
Michael 791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael 6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
Michael a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
Tobias Diekershoff d2b7a44299 Merge pull request #3631 from annando/1708-libertree 
Shared posts to Libertree now look better.
 2017-08-15 07:44:53 +02:00
Michael 3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
Michael 4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael 2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael 3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
Michael 796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
Michael 1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
Michael 217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
Michael 0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael 41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
Michael 89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael 1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael 51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
Michael 4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
Michael 556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
Michael 99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Michael 7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
Michael 33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
Michael eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
Michael bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
Michael 03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
Michael c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
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
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael 30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
Michael c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
Michael 0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
Michael bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
Michael 0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
Michael 7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00
Michael 99b86c9fd9 Just found the handbrake ... 2017-06-29 21:19:31 +00:00
Michael 18d6eba8d0 Some more performance stuff 2017-06-29 05:40:02 +00:00
Michael 4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
Michael 7097673fa1 Bugfix: Poller entries had been executed multiple times 2017-06-21 03:49:05 +00:00
Hypolite Petovan ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 
Coding convention applied split 2-6-2 (of 2-14-2)
 2017-06-18 18:44:34 -04:00
Roland Häder 29ca5b3021
added missing curly brace ... :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:50 +02:00
Roland Häder c0a0748831
converted upper-case to lower-case as they are no constants but keywords 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:11 +02:00
Roland Häder dc8f758860
Opps, also this! 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:14:31 +02:00
Roland Häder 470556764b
Fixed some stuff as requested by @Hypolite 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:10:03 +02:00
Tobias Diekershoff b000012bc3 Merge pull request #3537 from annando/1706-diaspora2 
We now use the new Diaspora protocol for sending
 2017-06-18 21:31:25 +02:00
Michael fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
Michael ec8a945189 Corrected query 2017-06-17 14:15:17 +00:00
Michael cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Michael e33ac224b0 Now the Salmons flys 2017-06-17 08:58:28 +00:00
Michael 2ee8d1694f Added documentation 2017-06-16 21:01:56 +00:00
Michael 9c4bf6b0d5 The new envelope could work now 2017-06-16 20:57:35 +00:00
Michael c031482d7d "unsharing" is now done different 2017-06-16 16:39:17 +00:00
Michael 5a11ef5b90 Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2 2017-06-16 06:10:35 +00:00
Michael 0dc1c932f8 We now should send all data in the new format 2017-06-16 05:21:25 +00:00
Michael a453ae4f66 Removed unneeded stuff 2017-06-15 21:45:36 +00:00
Michael f36ffe3c03 Just some more message types 2017-06-15 21:20:18 +00:00
Michael 6482495001 We now use the new Diaspora format while sending 2017-06-15 20:50:53 +00:00
Michael bafa26c060 We don't need the timeout there anymore 2017-06-13 22:25:24 +00:00
Michael a7526f1291 New function for affected rows 2017-06-13 21:56:50 +00:00
Roland Häder 4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Michael a056afd566 Small corrections 2017-06-13 20:51:24 +00:00
Michael 5183de8075 Don't fork these calls 2017-06-13 15:14:53 +00:00
Michael 21e84e4d25 Fetching new queue tasks in a bulk to increase speed 2017-06-13 13:51:25 +00:00
Michael e232c683b6 Changed timeout, logging added 2017-06-13 09:03:19 +00:00
Michael cd129665ef örgs 2017-06-13 05:56:02 +00:00
Michael 97be344a4a Handle deadlocks centrally 2017-06-13 05:52:59 +00:00
Michael 228993596a Really fast, sadly with deadlocks 2017-06-12 21:39:20 +00:00
Michael 1301a29505 It's faster without locks, gnarl ... 2017-06-12 19:20:50 +00:00
Michael 1932a6d634 Replaced "table lock" - it is not so good, it seems 2017-06-12 14:19:47 +00:00
Michael 2372ef7fd5 Locking seems to be better here 2017-06-12 12:28:48 +00:00
Michael dc00d89b9a Remove test message 2017-06-12 09:45:13 +00:00
Michael 8be52424f5 Only check for stale processes every 5 minutes 2017-06-12 09:44:46 +00:00
Michael 4fdaca861b Contact ID is integer 2017-06-11 20:25:51 +00:00
Michael 7d0a7f6be9 We got rid of two workerqueue queries, yeah! 2017-06-11 19:51:18 +00:00
Michael 06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster 
Conflicts:
	include/poller.php
 2017-06-11 07:49:34 +00:00
Michael 4f70682f7a Inherit the creation date 2017-06-11 07:41:38 +00:00
Tobias Diekershoff 1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
rabuzarus fa27256932 Merge pull request #3527 from annando/acl-speedup 
Increase the page load speed with Frio
 2017-06-08 23:09:49 +02:00
Michael 34815de99c Changed documentation 2017-06-08 21:00:45 +00:00
Michael f1119b4198 Removed commented out line 2017-06-08 20:53:21 +00:00
Michael 8f336bffc2 further improvements to the workerqueue 2017-06-08 20:43:30 +00:00
Tobias Diekershoff b9b047f2af Merge pull request #3523 from annando/issue-2864 
Issue 2864: Create a alternate link for every status
 2017-06-08 10:45:36 +02:00
Michael 0541a62134 The function "construct_acl_data" isn't used at all, it seems. it is deactivated now 2017-06-08 03:56:42 +00:00
Hypolite Petovan 2281989866 Replace && by AND in SQL queries 2017-06-07 22:01:14 -04:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael d5cc757943 Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup 2017-06-07 20:26:00 +00:00
Michael 1916f7858f Increase the page load speed with Frio 2017-06-07 19:51:37 +00:00
Michael 71a5de40f1 The index mustn't be 192 characters long 2017-06-07 18:34:17 +00:00
Michael 5aee2fde1b Merge remote-tracking branch 'upstream/develop' into issue-2864 2017-06-07 18:17:37 +00:00
Michael 1b5f1effa0 Code beautification 2017-06-07 09:51:21 +00:00
Michael 2ad784d37a Speeded up calling "proc_run" 2017-06-07 05:42:30 +00:00
Michael 6161ceff64 Merge remote-tracking branch 'upstream/develop' into 1706-lock 2017-06-07 05:28:37 +00:00
Michael 6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael 4e748668c6 Spaces 2017-06-06 20:10:47 +00:00
Michael 910cca0629 Attached pictures in OStatus posts are now displayed 2017-06-06 17:55:14 +00:00
Michael 929f518e5c Added documentation 2017-06-06 17:38:58 +00:00
Michael de9cddc82f Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced 2017-06-06 17:30:40 +00:00
Michael Vogel f4652d6e50 Merge branch 'develop' into 1706-lock 2017-06-06 14:16:00 +02:00
Michael f96423feae Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock 2017-06-06 12:12:07 +00:00
Michael 8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
Michael e00105d649 Don't fork a new worker 2017-06-06 11:59:38 +00:00
Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
Michael ba7b4fddea memory check is now also only done once in a while 2017-06-06 04:00:24 +00:00
Michael 2b04865cdb We found the handbrake ... 2017-06-05 22:41:33 +00:00
Michael 2bff8e302a Removing the lock after the process was removed is better 2017-06-05 16:56:21 +00:00
Michael b86c4d539e Locking waits now for a shorter period. DB locking is used at other locations as well 2017-06-05 14:59:53 +00:00
Michael 8db079c65e Don't always fork the poller. 2017-06-05 06:08:26 +00:00
Michael fb72fc77f5 Some code beautification 2017-06-04 20:03:37 +00:00
Michael 2d229ad856 Merge remote-tracking branch 'upstream/3.5.2rc' into 1706-lock 2017-06-04 19:06:40 +00:00
Michael 16276b21eb Typo 2017-06-04 19:05:15 +00:00
Michael bde4943da5 Every hour should mean: every hour :) 2017-06-04 19:01:22 +00:00
Michael 30b24a2908 Locking seems to work great now 2017-06-04 18:59:50 +00:00
Michael bca5776e9c Lock now can use the memcache as well 2017-06-04 15:59:20 +00:00
Michael d2cb87a200 Database locks are now having its very own functions 2017-06-04 12:59:29 +00:00
Michael ad53a03f83 It should be "e" not "p" 2017-06-04 09:00:07 +00:00
Michael 32f61016d3 Overhauled "lock" functionality 2017-06-04 07:26:21 +00:00
Michael 945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
Tobias Diekershoff ec5a3c3440 Merge pull request #3514 from annando/worker-locking 
Fixed locking behaviour for the worker
 2017-06-03 11:02:50 +02:00
Michael 21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
rabuzarus 8806688d68 restructure the conditions if gnetwork and gaddr is empty 2017-06-01 12:47:47 +02:00
rabuzarus a726056c5f use get_contact_details_by_url() instead of Probe:uri() 2017-06-01 11:44:59 +02:00
rabuzarus 8311af3e92 use Probe:uri() instead of probe_url 2017-05-31 18:43:57 +02:00
rabuzarus df7acc7655 Bugfix: don't probe for introduction if it is not necessary 2017-05-31 14:29:33 +02:00
gerhard6380 1a0e8723c5 corrected change 
sorry, I should not change code late in the evening when I am already tired.
 2017-05-31 10:33:35 +02:00
gerhard6380 bbddea03e9 API: link to original page for feed posts 
link to original page added to html output of feed posts if body is empty
 2017-05-31 02:24:09 +02:00
Michael 81c87885cf Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-30 21:07:28 +00:00
Michael f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
Michael c9ea18ce74 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-29 20:54:43 +00:00
Michael a32de855cc Don't quit if the own host cannot be reached via SSL 2017-05-29 19:14:44 +00:00
Michael 104acec09c The database structure is now checked ad the admin summary page 2017-05-28 08:39:41 +00:00
Michael 497778ef54 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-25 06:03:08 +00:00
Michael 646ef9842c Bugfix: pubsubpublish has always to be called with high priority 2017-05-25 03:04:26 +00:00
Michael d649873f80 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-24 20:55:12 +00:00
Michael 3d14fa3d81 Priority needs to be integer 2017-05-24 10:36:44 +00:00
Michael d2dd0b3248 Minimal poll intervall 2017-05-24 08:21:05 +00:00
Michael d7de7bb70a Optimized priorities for the automated expiring of items 2017-05-24 06:29:47 +00:00
Michael 8abdbb799a Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-23 08:13:37 +00:00
Michael 1bd6d7dd7a Bugfix OStatus: Avoid empty author data 2017-05-23 05:28:51 +00:00
Roland Häder e9c9c47a84
Continued a bit: 
- opps, cherry-pick/rebase/what-ever did not take all over
- used x() for array key check

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:09:07 +02:00
Roland Häder 291af19f25
Some improvements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-22 13:06:22 +02:00
Michael ac65423de1 Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced 2017-05-20 20:08:24 +00:00
Michael 44efdc3e1b Central item expiration routine for external items 2017-05-20 20:02:06 +00:00
Michael 6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Michael 192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
Michael 696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Roland Häder b6648215b8
Opps, missed them 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:42:40 +02:00
Roland Häder 98b407218d
Fixes: 
- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:39:10 +02:00
Roland Häder 0e0fb2b1ee
removed TODOs 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:34:16 +02:00
Roland Häder 11c16f1123
Continued: 
- added more curly braces
- replaced if (blaFoo()) { return true; } return false; with return blaFoo();
- added spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:32:03 +02:00
Roland Häder 0394004fee
reverted comments, but maintained multi-line comment. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:11:22 +02:00
Roland Häder 4c2d4934f7
Some CR applied: 
- removed todo
- added explanation
- merged next if() block with already merged

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:06:13 +02:00
Roland Häder f55ea4bc83
tpzo fixed again ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 18:02:44 +02:00
Roland Häder afb430b908
tpzo fixed 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:41:01 +02:00
Roland Häder 249065b421
opps, went in again? :-/ 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:31:46 +02:00
Roland Häder 031d96d933
improved some comments 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-17 15:28:01 +02:00
Roland Häder 635b26353c
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:08:15 +02:00
Roland Häder 347803fd5c
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:08:15 +02:00
Roland Häder f66c5c6823
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-17 15:07:31 +02:00
Michael cb3077b7a9 It is better this way 2017-05-17 06:07:55 +00:00
Michael 7daf5ecde1 Use the contact picture instead of the profile picture 2017-05-17 06:00:20 +00:00
Michael 80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
Roland Häder d7b420a44e
opps, re-introduced this out-dated code by mistake 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-16 20:13:08 +02:00
Roland Häder 79d524a9ad
opps, added missing curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-16 17:56:36 +02:00
Roland Häder f4a33ed3f0
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-16 14:40:07 +02:00
Roland Häder 701e761c68
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-05-16 14:37:12 +02:00
Hypolite Petovan 48e3f4f47f Merge pull request #3465 from annando/bugfix-dba-1 
Bugfix: dba::num_rows hadn't checked the object variable
 2017-05-16 02:05:16 -04:00
Michael 41f94a62fc Spelling 2017-05-16 06:00:01 +00:00
Michael 124690cc4d dba: Beautification is now a separate function 2017-05-15 21:06:17 +00:00
Michael 875592f285 API: Direct Messages via the API now work again. 2017-05-15 20:11:33 +00:00
Michael 83e4141639 Bugfix: dba::num_rows hadn't checked the object variable 2017-05-15 15:17:38 +00:00
Michael 05c890f256 Bugfix: The commit in dba::delete was never executed 2017-05-14 07:01:38 +00:00
Michael e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 
Conflicts:
	include/uimport.php
 2017-05-13 04:13:07 +00:00
Michael 74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan 2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 
Coding convention applied split 2-4-2 (of 2-14-2)
 2017-05-12 21:40:30 -04:00
Roland Häder cc4b481bc9
fixed parser error, need parentheses 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-12 21:02:58 +02:00
Michael 2b180d7804 Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 2017-05-12 16:12:00 +00:00
Michael 377fe31907 dba functions in poller / avoiding SQL errors in conversation / dbclean is better 2017-05-12 16:09:25 +00:00
Hypolite Petovan 06ea23665c Merge pull request #3460 from annando/1705-dbclean 
dbclean is now using the new database functions
 2017-05-12 11:45:27 -04:00
Michael acd9f453d7 And another one 2017-05-12 06:55:04 +00:00
Michael 58b2b1dbef Some more cleaner delete 2017-05-12 06:30:45 +00:00
Michael 11e524a555 This item removal is much more cleaner 2017-05-12 06:17:48 +00:00
Michael c00a5223d6 Removed code from the pre worker era. 2017-05-12 04:33:52 +00:00
Hypolite Petovan 4293e27d5c Improved usage of `use` in dba_pdo 2017-05-11 23:05:49 -04:00
Hypolite Petovan c0a6f1122b Removed useless usage of `use` 2017-05-11 23:01:49 -04:00
Michael c52f7657ab Now it should work 2017-05-11 20:19:43 +00:00
Michael 6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
Hypolite Petovan 39f894bd4a Use `use` instead of `\` 2017-05-11 11:53:04 -04:00
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
Hypolite Petovan 6f6b029c4d Merge pull request #3456 from annando/1704-mastodon-html 
HTML for OStatus posts look better (in Mastodon and GNU Social)
 2017-05-08 16:54:45 -04:00