Commit graph

5851 commits

Author SHA1 Message Date
1aafb80743 Added log information 2017-09-25 06:04:40 +00:00
66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
9d7ab9d941 OStatus: Thread completition hadn't worked for (some) Mastodon systems 2017-09-24 15:31:09 +00:00
bcdccac39c Merge pull request #3729 from annando/plaintext-again
And another plaintext correction :)
2017-09-24 16:00:39 +02:00
2b3bc54049 And another plaintext correction :) 2017-09-24 13:47:31 +00:00
ff6f937f2b Author check works now 2017-09-24 13:27:35 +00:00
80d787d990 Bugfix: Diaspora retractions not always worked 2017-09-24 12:02:32 +00:00
e6f80b3bc1 Merge pull request #3726 from annando/plaintext
Improved type detection
2017-09-24 09:48:36 +02:00
17f2928535 Improved type detection 2017-09-24 06:36:03 +00:00
d6d1ee9112 Merge pull request #3724 from annando/plaintext
Better content detection for posts to Twitter
2017-09-24 07:23:47 +02:00
fc1bfe043b The "else" case was only confusing 2017-09-23 23:15:04 +00:00
d72e6b2c82 Bugfix for better mail import 2017-09-23 22:53:44 +00:00
aeb6e53d02 Better content detection for posts to Twitter 2017-09-23 20:13:09 +00:00
7360945d8a Merge pull request #3722 from annando/diaspora-plink
The plink in Diaspora posts now links to the correct place
2017-09-23 17:41:57 +02:00
8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
e8a2c68647 The plink in Diaspora posts now links to the correct place 2017-09-23 08:52:06 +00:00
cb5b155083 Bugfix: The API picture upload created an invalid link 2017-09-20 21:47:12 +00:00
3e8dc38180 Merge pull request #3716 from annando/bugfix-mail
Bugfix: Mails weren't created
2017-09-19 15:10:22 +02:00
fdc010bb1b Bugfix: Mails weren't created 2017-09-19 12:59:24 +00:00
b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
5ed24954f0 Bugfix: Pleroma was detected as Mastodon 2017-09-18 06:09:18 +00:00
926314a24c gcontact is now updated with the new database functions as well 2017-09-17 08:13:10 +00:00
8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
af44e96fc9 Merge pull request #3710 from annando/diaspora-retraction
Diaspora: Sending retractions only worked for posts
2017-09-16 21:24:50 +02:00
ef8ad9f1ed Diaspora: Sending retractions only worked for posts - nor for comments or likes 2017-09-16 18:23:24 +00:00
0982a30c89 Improvement for PR 3705: The detection has to be changed here as well 2017-09-16 17:22:22 +00:00
0eb92bf12a Unused functions removed 2017-09-16 05:09:14 +00:00
dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
0384e875a2 Merge pull request #3702 from annando/new-dba
The old database function is now replaced with a wrapper
2017-09-15 08:31:25 +02:00
f8d34e35e7 "exists", "select" whre is the difference? 2017-09-15 06:15:25 +00:00
88ada98245 Added documentation 2017-09-15 06:07:34 +00:00
ad3566aeaa Merge pull request #3704 from annando/ostatus-improved
OStatus: Only fetch items that don't exist in the system
2017-09-15 07:18:14 +02:00
cf90e3571f Merge remote-tracking branch 'upstream/develop' into new-dba 2017-09-15 03:17:40 +00:00
cd16155c96 Only warn when there are arguments at all 2017-09-15 03:10:04 +00:00
f29e21eb5c We now avoid prepared statements without an argument 2017-09-15 03:00:38 +00:00
d10eaefaa9 Improved regular expression for the Diaspora link detection 2017-09-14 22:04:37 +00:00
87fffde80e Documented some unknown verbs 2017-09-14 20:40:05 +00:00
9dfb9c1c45 Only fetch items that don't exist in the system 2017-09-14 19:23:14 +00:00
9468b7427d Allow replies as well 2017-09-14 10:00:45 +00:00
641e41067e Merge pull request #3701 from annando/issue-3700
Issue 3700: Security and Privacy related Headers
2017-09-14 10:28:03 +02:00
4b99d122dd Added explanation 2017-09-14 05:48:43 +00:00
7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
e18a037fb2 API: Improvements for clients with bad HTML support 2017-09-14 05:16:23 +00:00
519a8807f1 Added documentation 2017-09-11 22:15:16 +00:00
ec929d8207 Fetch the own single post if we are processing a feed of multiple entries 2017-09-11 12:44:37 +00:00
8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
b847f63e2a Added logging 2017-09-10 08:27:24 +00:00
bdf490e2fa Added missing function 2017-09-10 07:58:14 +00:00
21a630ebae Added documentation 2017-09-10 07:52:07 +00:00
746169eabf Improve comparabilty 2017-09-10 07:29:24 +00:00
c98c157efe Only some tabs 2017-09-10 07:23:14 +00:00
4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
52b12fccc9 OStatus: Attached pictures now show up in repeated posts as well. 2017-09-09 07:43:50 +00:00
637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
c44448dd57 We should reset the session variable 2017-09-08 08:50:08 +00:00
a5a4f53287 This is a better place 2017-09-08 07:08:06 +00:00
3c6d83acd9 Remote self should now finally trigger all addons 2017-09-08 07:00:38 +00:00
6e196a6afd Diaspora will introduce "like on comment" so we doing it as well 2017-09-08 05:36:00 +00:00
c3eaf336dc Removed code 2017-09-07 15:48:25 +00:00
6e670df80f OStatus: Better attachment handling for pictures 2017-09-07 15:34:50 +00:00
66968efb9a Logger date format is now ISO8601 compatible 2017-09-06 21:13:06 +00:00
c35a43bcb8 "remote-self" hadn't worked well with addons 2017-09-06 06:02:26 +00:00
cb8581b29a Support for server independant Diaspora style links 2017-09-06 04:55:36 +00:00
65f1bcb780 Merge pull request #3673 from annando/contact-updating
Better updating of contacts
2017-08-30 22:34:01 +02:00
1cc50a80f4 Only update if there is a change 2017-08-30 19:33:16 +00:00
0083c16e87 Better updating of contacts 2017-08-30 18:05:41 +00:00
dbaed91a75 Bugfix: Repeating of posts generated a SQL error 2017-08-30 17:55:23 +00:00
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
83ce42172b Don't add "redir" links on mentions 2017-08-27 09:56:41 +00:00
12ae59dba3 No linefeeds 2017-08-27 07:12:27 +00:00
d8acb62ba6 Small formatting issue 2017-08-27 07:02:44 +00:00
a36c8a0173 Possibly Issue 3611: Better feed handling when there is no body 2017-08-27 06:59:07 +00:00
a729519de9 And some more static warnings removed 2017-08-26 10:01:50 +00:00
c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
b0c26921ad Statically used methods should be defined statically as well 2017-08-25 15:56:08 +00:00
959d6ae15e Merge pull request #3654 from annando/externalpubsubhubbub
Removed external pubsubhubbub URL
2017-08-25 09:47:58 +02:00
5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
2ecd5a55b7 Bugfix for "1" instead of "connect" 2017-08-24 19:11:27 +00:00
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
c09c806f78 Probing sometimes failed / problems with some web servers 2017-08-24 07:56:46 +00:00
ba52dd9fa7 Merge remote-tracking branch 'upstream/develop' into pleroma2 2017-08-24 06:26:58 +00:00
6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
e533572ca3 Issue 3645: Avoid problems with boolean values 2017-08-23 19:40:42 +00:00
b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00
51dca9b034 Compatibility with pleroma added 2017-08-21 20:21:04 +00:00
85c49060e2 Preparation for Unicode Emojis 2017-08-20 19:47:00 +00:00
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
f8946c9e0a When "local_search" is activated, then point all hashtags to the local server 2017-08-18 22:12:40 +00:00
e10bb40e1a Added logging 2017-08-16 04:53:15 +00:00
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
6c9953809a Improved position of "close" 2017-08-15 10:10:09 +00:00
a0567d4081 dbm::is_result now checks whether a dba:... call returns at least one result 2017-08-15 06:08:26 +00:00
d2b7a44299 Merge pull request #3631 from annando/1708-libertree
Shared posts to Libertree now look better.
2017-08-15 07:44:53 +02:00
3290ccc779 Now some more stuff is fixed 2017-08-14 21:46:58 +00:00
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
3c59eefa22 Shared posts to Libertree now look better. 2017-08-14 19:16:28 +00:00
796cee6273 Cleaning code 2017-08-14 05:52:36 +00:00
1fa82581b6 Avoid warning 2017-08-14 05:47:25 +00:00
217a8ce6ee Events now work again 2017-08-14 05:05:32 +00:00
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
51f6c46923 Issue 3616: Don't create notifications for forum accounts 2017-08-12 05:08:45 +00:00
4ada71081f No timeout problem anymore in preview. 2017-08-11 20:25:02 +00:00
556cc0cc4c And some more changed lines 2017-08-11 19:26:08 +00:00
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
7b6664f0f7 Improved parameter handling 2017-08-10 12:38:32 +00:00
33b61ab262 Database connections should be closed 2017-08-10 06:33:24 +00:00
eb7cbb9ada Now there are fewer than 300 updates left ... 2017-08-10 05:07:23 +00:00
bd8efb7f92 Several updates are transformed as well 2017-08-10 04:31:46 +00:00
03b86d3766 Now we have less than 100 insert commands, yeah 2017-08-09 23:02:57 +00:00
c6b04aa922 And some more inserts 2017-08-09 22:23:46 +00:00
6180d62ebc Some more inserts 2017-08-09 22:04:00 +00:00
f248f9cc85 Merge remote-tracking branch 'upstream/develop' into new-dba 2017-08-09 21:42:51 +00:00
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
b01ab3e64c DBA: Do a fallback to other db functions on problems 2017-08-09 06:02:48 +00:00
4d77c8a90a Merge pull request #3618 from annando/mysqli-fix
Quickfix for MYSQLi (prepared statement problem)
2017-08-08 09:32:26 +02:00
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
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
1bd85971a4 Avoid some PHP warnings, no functional changes 2017-08-03 05:50:44 +00:00
a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self 2017-08-03 05:42:44 +00:00
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes 2017-07-27 14:02:25 +00:00
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
b266d7d6ff Bugfix: the expiration check in item_store now works again 2017-07-23 19:59:29 +00:00
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
2e704d79eb In the acl there is now a separation between groups, forums and contacts 2017-07-23 06:49:31 +00:00
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
4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings 2017-07-19 05:51:39 +00:00
a5baba84af Only show the attachment elements if there are one. 2017-07-17 19:49:58 +00:00
1c8e74edce Attachments now look fine. 2017-07-17 19:38:15 +00:00
f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach 2017-07-15 10:36:56 +00:00
2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
b49a36f949 The attached image has now a class 2017-07-15 04:02:12 +00:00
181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
Conflicts:
	include/text.php
2017-07-13 20:38:18 +00:00
86934119b1 Merge pull request #3580 from annando/issue-3571-2
Reworked "get_contact"
2017-07-13 08:34:59 +02:00
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
4c7a197f4b Avoid duplicate database errors when storing the conversations 2017-07-13 06:00:53 +00:00
beaa911bac Bugfix: Some special characters weren't converted correctly 2017-07-13 05:57:37 +00:00
568abd537a Fixed error reporting 2017-07-12 08:14:36 +00:00
69f20959ff Update existing contact records with data from probing 2017-07-12 06:07:22 +00:00
a47e1e13d7 Process all data that we can fetch via probing 2017-07-12 05:56:35 +00:00
35b3723c4a database logging now works for database errors 2017-07-11 19:14:49 +00:00
8ec7f1de56 Issue 3571: Reworked "get_contact" function 2017-07-11 18:32:35 +00:00
81dedb3f92 Merge pull request #3577 from annando/2in1
Issue 3571 and Diaspora mail bugfix
2017-07-11 08:31:39 +02:00
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
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
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
9f92fddb00 DFRN: Update the public item copy as well 2017-07-09 04:29:35 +00:00
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
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
30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00
99b86c9fd9 Just found the handbrake ... 2017-06-29 21:19:31 +00:00
18d6eba8d0 Some more performance stuff 2017-06-29 05:40:02 +00:00
4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
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
29ca5b3021
added missing curly brace ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 23:15:50 +02:00
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
dc8f758860
Opps, also this!
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-18 22:14:31 +02:00
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
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
fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
ec8a945189 Corrected query 2017-06-17 14:15:17 +00:00
cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
e33ac224b0 Now the Salmons flys 2017-06-17 08:58:28 +00:00
2ee8d1694f Added documentation 2017-06-16 21:01:56 +00:00
9c4bf6b0d5 The new envelope could work now 2017-06-16 20:57:35 +00:00
c031482d7d "unsharing" is now done different 2017-06-16 16:39:17 +00:00
5a11ef5b90 Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2 2017-06-16 06:10:35 +00:00
0dc1c932f8 We now should send all data in the new format 2017-06-16 05:21:25 +00:00
a453ae4f66 Removed unneeded stuff 2017-06-15 21:45:36 +00:00
f36ffe3c03 Just some more message types 2017-06-15 21:20:18 +00:00
6482495001 We now use the new Diaspora format while sending 2017-06-15 20:50:53 +00:00
bafa26c060 We don't need the timeout there anymore 2017-06-13 22:25:24 +00:00
a7526f1291 New function for affected rows 2017-06-13 21:56:50 +00:00
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
a056afd566 Small corrections 2017-06-13 20:51:24 +00:00
5183de8075 Don't fork these calls 2017-06-13 15:14:53 +00:00
21e84e4d25 Fetching new queue tasks in a bulk to increase speed 2017-06-13 13:51:25 +00:00
e232c683b6 Changed timeout, logging added 2017-06-13 09:03:19 +00:00
cd129665ef örgs 2017-06-13 05:56:02 +00:00
97be344a4a Handle deadlocks centrally 2017-06-13 05:52:59 +00:00
228993596a Really fast, sadly with deadlocks 2017-06-12 21:39:20 +00:00
1301a29505 It's faster without locks, gnarl ... 2017-06-12 19:20:50 +00:00
1932a6d634 Replaced "table lock" - it is not so good, it seems 2017-06-12 14:19:47 +00:00
2372ef7fd5 Locking seems to be better here 2017-06-12 12:28:48 +00:00
dc00d89b9a Remove test message 2017-06-12 09:45:13 +00:00
8be52424f5 Only check for stale processes every 5 minutes 2017-06-12 09:44:46 +00:00
4fdaca861b Contact ID is integer 2017-06-11 20:25:51 +00:00
7d0a7f6be9 We got rid of two workerqueue queries, yeah! 2017-06-11 19:51:18 +00:00
06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster
Conflicts:
	include/poller.php
2017-06-11 07:49:34 +00:00
4f70682f7a Inherit the creation date 2017-06-11 07:41:38 +00:00
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
34815de99c Changed documentation 2017-06-08 21:00:45 +00:00
f1119b4198 Removed commented out line 2017-06-08 20:53:21 +00:00
8f336bffc2 further improvements to the workerqueue 2017-06-08 20:43:30 +00:00
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
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
d5cc757943 Merge branch 'bugfix-index' of github.com:annando/friendica into acl-speedup 2017-06-07 20:26:00 +00:00
1916f7858f Increase the page load speed with Frio 2017-06-07 19:51:37 +00:00
71a5de40f1 The index mustn't be 192 characters long 2017-06-07 18:34:17 +00:00
5aee2fde1b Merge remote-tracking branch 'upstream/develop' into issue-2864 2017-06-07 18:17:37 +00:00
1b5f1effa0 Code beautification 2017-06-07 09:51:21 +00:00
2ad784d37a Speeded up calling "proc_run" 2017-06-07 05:42:30 +00:00
6161ceff64 Merge remote-tracking branch 'upstream/develop' into 1706-lock 2017-06-07 05:28:37 +00:00
6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
4e748668c6 Spaces 2017-06-06 20:10:47 +00:00
910cca0629 Attached pictures in OStatus posts are now displayed 2017-06-06 17:55:14 +00:00
929f518e5c Added documentation 2017-06-06 17:38:58 +00:00
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
f96423feae Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock 2017-06-06 12:12:07 +00:00
8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
e00105d649 Don't fork a new worker 2017-06-06 11:59:38 +00:00
f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
ba7b4fddea memory check is now also only done once in a while 2017-06-06 04:00:24 +00:00
2b04865cdb We found the handbrake ... 2017-06-05 22:41:33 +00:00
2bff8e302a Removing the lock after the process was removed is better 2017-06-05 16:56:21 +00:00
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
8db079c65e Don't always fork the poller. 2017-06-05 06:08:26 +00:00