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