Roland Haeder
64cf909ca2
added spaces
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-05 19:26:37 +02:00
Hypolite Petovan
1ab28bbe03
Add Text_Highlighter to Composer
...
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments
Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
2017-04-05 00:31:49 -04:00
Roland Haeder
03571f6e74
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-04 19:46:56 +02:00
Hypolite Petovan
9237b2611a
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-03 06:35:27 -04:00
Michael
c574c317ef
Removed unneeded comment
2017-04-02 20:43:54 +00:00
Michael
884c75a350
Issue 3278: Attachments in Reshares should now work
2017-04-02 19:18:11 +00:00
Michael Vogel
d9451ef969
Merge pull request #3279 from Hypolite/improvement/add-composer
...
Add Composer
2017-04-02 14:57:37 +02:00
Michael
94f3f0887b
Issue 2957: The avatar problem with mastodon should now finally be solved
2017-04-02 12:37:22 +00:00
Michael
54f49169d4
Show real platform names
2017-04-02 07:53:55 +00:00
Michael
07fd61b912
Mastodon: plink for reshares, missing hostnames for avatars
2017-04-01 23:39:19 +00:00
Roland Häder
49527b70d3
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-01 22:16:08 +02:00
Michael
16d4392573
Documentation added
2017-04-01 09:05:56 +00:00
Michael
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
Hypolite Petovan
799e60aa62
Replace existing autoloader with Composer-supplied
...
- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader
2017-03-31 23:02:38 -04:00
Roland Haeder
8bdc906013
Continued a bit:
...
- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:42:20 +02:00
Michael
3796a141c6
We don't need this include anymore
2017-03-31 06:25:48 +00:00
Michael
1560534621
Now it's openssl - and no copy&paste failure anymore
2017-03-31 06:22:43 +00:00
Michael
973fcd3624
Test with OpenSSL
2017-03-30 23:21:52 +00:00
Roland Haeder
d091759888
space to the rescue ... ;-) CR request
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
Michael
54c8fb2bb8
Replaces mcrypt with phpsec.
2017-03-30 18:29:12 +00:00
Michael
4fc1ebd4ea
Doing some Hypolyzation
2017-03-27 21:02:56 +00:00
Michael
c85331d8ac
Reestablish the communication with Mastodon
2017-03-27 20:58:15 +00:00
Tobias Diekershoff
8580cd87a6
Merge pull request #3271 from Hypolite/issue/#3189
...
Fix Diaspora code blocks being mangled
2017-03-27 09:26:39 +02:00
Michael
fa7721c735
Prevent Hypolite from doing comments about standards ;-)
2017-03-27 06:11:45 +00:00
Michael
364d88fa70
Only import new OStatus posts if they are from our followers
2017-03-27 05:33:43 +00:00
Hypolite Petovan
3e285a690a
Fix Diaspora code blocks being mangled
...
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
2017-03-26 19:00:04 -04:00
Hypolite Petovan
f1a75a57fe
Merge pull request #3257 from annando/1703-gcontact
...
Improved gcontact handling
2017-03-25 15:35:41 -04:00
Michael
585c2119d7
Remove the "call by reference"
2017-03-25 18:00:56 +00:00
Roland Haeder
9ddb032bf2
strange that this curly brace didn't make it in. now it is, thanks to @annando
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 18:32:33 +01:00
Roland Haeder
33fa1e79af
some spaces ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 18:32:21 +01:00
Michael
444de52859
Use of exceptions
2017-03-25 16:56:04 +00:00
Tobias Diekershoff
6e35c49cb9
Merge pull request #3263 from annando/1601-api-statuses-lookup
...
More GNU Social compatibility for the API
2017-03-25 16:26:21 +01:00
Michael
adf9ed64bb
Avoid API error when calling "/api/friendica/profile/show"
2017-03-25 14:16:21 +00:00
Roland Haeder
0e6b009425
fixed another parser error, opps
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 15:04:07 +01:00
Roland Haeder
fccdc63964
Opps, fixed parser error. indending was confusing here
...
+ added much more curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 14:56:23 +01:00
Roland Haeder
a391ab9a99
was a bit confusing for me or I was not sleeping to much ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:46:51 +01:00
Roland Haeder
89bd080e7e
don't kill when no result is found, this may break communication, thanks to @annando explaining it
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:42:09 +01:00
Roland Haeder
6d5826e188
PHP5 does not support native type-hints, except `array` + used dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:38:11 +01:00
Roland Haeder
fd468f20fd
merged 2 if() into one, closes internal TODO
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:08:56 +01:00
Roland Haeder
47ae5a9a47
removed parentheses, added curly ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:07:33 +01:00
Roland Haeder
2f5c796886
removed TODO, one day this all needs refacturizing ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-25 13:02:09 +01:00
Michael
a9dfd1fcb7
One more API call added
2017-03-25 11:31:31 +00:00
Michael
4665cda00e
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
2017-03-25 11:25:47 +00:00
Michael
0d49143a63
"no_utf" wasn't in use anymore - it is now removed completely
2017-03-25 10:51:00 +00:00
Michael
a419bbe7c7
Hypolite is right (not always, but in this case)
2017-03-25 10:11:02 +00:00
Michael
5060300138
Reset the static variable $baseurl
2017-03-25 10:07:45 +00:00
Hypolite Petovan
29fb28de43
Remove Embedly integration
...
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0
Code cleanup + standards
2017-03-25 01:54:16 -04:00
Roland Haeder
d45e79dfe9
Continued:
...
- converted multiple single-line comments into one multi-line comment (please
stop abusing programming languages!)
- added more TODO tags for type-hints (upcoming rewrite)
- opps, one space was only fixed in develop branch, not in this PR branch
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-24 20:39:00 +01:00
Michael
b7242c3fa0
poco_last_updated is optimized
2017-03-23 22:56:22 +00:00
Roland Haeder
db1c2e4041
fixed comment and explained one
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 23:37:58 +01:00
Roland Haeder
e4ad359f5a
added curely braces + TODO for maybe avoiding multi-lined if() blocks as it confuses #3254
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:53:03 +01:00
Roland Haeder
f94a10bf00
old behaviour restored
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:49:34 +01:00
Roland Haeder
66366b2804
added more spaces and curely braces
...
killed ?> as it is discouraged
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:46:25 +01:00
Roland Haeder
d8eee2be55
added curely branches + reverted back to old behaviour (may come back one day)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:33:57 +01:00
Roland Haeder
09ab141404
better comment added by @Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:29:26 +01:00
Roland Haeder
dad6a61be4
it is space-season ... ;-) #3254
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 22:19:25 +01:00
Michael
2ce5ab1467
removed commented out line
2017-03-23 07:36:22 +00:00
Michael
5b6215d7bd
Better server_url handling
2017-03-23 07:34:45 +00:00
Michael
c25af197c9
baseurl should now be set correctly at all the time.
2017-03-23 07:10:22 +00:00
Michael
26ec56dfa5
server_url was forgotten
2017-03-23 06:45:00 +00:00
Michael
9e5bec1bc8
"poco_check" is now replaced and removed
2017-03-23 06:23:23 +00:00
Michael
8e240a1e8c
New function to validate gcontact array data
2017-03-22 23:13:32 +00:00
Michael
1d6910277d
Remove more deprecated "poco_check" calls
2017-03-22 07:11:58 +00:00
Michael
bc517ef3d2
Remove reduncancies
2017-03-22 05:26:44 +00:00
Michael
a376f55c1f
Linefeed added
2017-03-21 22:06:57 +00:00
Roland Häder
ddb5a8ea78
Continued:
...
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:51:22 +01:00
Roland Häder
830af774d3
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:50:45 +01:00
Michael Vogel
4ebebe96fe
Merge branch 'develop' into 1703-worker-splitting
2017-03-21 17:08:07 +01:00
Hypolite Petovan
7b352f3f74
Revert "Coding convention applied - part 1"
2017-03-21 12:02:59 -04:00
Michael Vogel
5a6da8b447
Merge branch 'develop' into 1703-worker-splitting
2017-03-21 16:38:59 +01:00
Michael
f7b0c2082b
Some standards
2017-03-21 15:24:49 +00:00
Michael
9c16b47f55
Strange comment removed
2017-03-21 15:15:58 +00:00
Hypolite Petovan
9c2c483996
Merge pull request #3112 from Quix0r/rewrites/coding-convention
...
Coding convention applied - part 1
2017-03-21 10:19:53 -04:00
Michael
19825eddf7
Changed probing call. Removed dupolicated code.
2017-03-21 13:43:53 +00:00
Michael
be9db7f060
Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting
2017-03-21 07:59:14 +00:00
Michael
74cc5ade0c
Worker processes are split into many more separate tasks
2017-03-21 07:57:09 +00:00
Tobias Diekershoff
0fd874a683
Merge pull request #3246 from annando/1701-poco
...
Split poco discovery in smaller function calls
2017-03-21 07:27:10 +01:00
Roland Haeder
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-20 20:51:32 +01:00
rabuzarus
0879b46125
add NULL_DATE & coding standard work
2017-03-20 16:59:21 +01:00
rabuzarus
0060e2449e
Merge develop into 20170316_-_fix_event_edit
...
Conflicts:
mod/events.php
2017-03-20 16:46:36 +01:00
Michael
b42a977894
Bugfix for issue 3242 - forgotten "use"
2017-03-19 22:58:35 +00:00
Michael
41ee4ec60a
Standards and just some more poco slitting
2017-03-19 21:32:11 +00:00
Michael
e684fff477
Added documention
2017-03-19 18:24:49 +00:00
Michael
2615d40d6b
Split the POCO discovery process in several small processes
2017-03-19 17:43:59 +00:00
Michael
7f61b2ee15
Merge remote-tracking branch 'upstream/develop' into 1701-poco
...
Conflicts:
include/socgraph.php
2017-03-19 15:36:41 +00:00
Hypolite Petovan
65f809f5cb
Merge pull request #3245 from annando/issue-3242
...
Issue 3242: Define a maintenance reason
2017-03-19 11:06:25 -04:00
Michael
e93825b9f0
Some more standards
2017-03-19 14:43:24 +00:00
Michael
8dd732a896
Issue 3242: Define a maintenance reason
2017-03-19 13:24:07 +00:00
Michael
b06d787130
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
2017-03-19 08:06:02 +00:00
Michael
132688d663
Standards, what else?
2017-03-19 08:04:04 +00:00
Michael
e9b083d13d
You shoudln't use a text variable like an array.
2017-03-19 01:23:34 +01:00
Roland Haeder
5e1c303c08
added spaces according to coding-convention
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:04:30 +01:00
Roland Haeder
1946cf143d
added logger ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:00:35 +01:00
Roland Haeder
621a77b275
added spaces around + curly braces ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:58:46 +01:00
Roland Haeder
6ca6c6813a
better log here ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:56:58 +01:00
Roland Häder
aeaafb5d71
Continued:
...
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
4fe5cdf3fd
don't quit silently, at least a TODO is now around
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
e8e51d8535
Missed a 't', thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
fbd559a823
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
4c72cb3584
Continued:
...
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
bf0a07b7ae
Continued:
...
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
015561fec6
Opps ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
4a96c280d0
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
d9c22c7f3e
Continued a bit:
...
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
Roland Häder
cc83e9d72a
fixed curly brace (opps)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
6a3dc8b286
added more curly braces + fixed one
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
3ad0fd442e
Continued:
...
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
c6ef84a964
Continued:
...
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
6a171a96aa
Opps ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder
3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:47 +01:00
Roland Häder
92901d8626
more curly braces added + dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Michael
fb5f1f61fc
You shoudln't use a text variable like an array.
2017-03-18 23:32:59 +00:00
Michael
1a436264cd
Some standards
2017-03-18 12:13:43 +00:00
Michael
222550e784
From now on we are using 0001-01-01 as lowest date
2017-03-18 11:42:54 +00:00
Michael
62ccb4499a
Some more unneeded changes reverted
2017-03-18 08:54:25 +00:00
Michael
a2a171af06
"dob" is not a date field, so the changes are reverted
2017-03-18 08:50:27 +00:00
Michael
e301fa0832
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
2017-03-18 08:31:43 +00:00
rabuzarus
497df57ef7
more standards work
2017-03-18 04:41:54 +01:00
Michael
f3bcf63d46
Standards and some logging improvements
2017-03-17 19:25:01 +00:00
rabuzarus
c785eb29c6
more work on standards compliance
2017-03-17 17:57:57 +01:00
Michael
87771cf617
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
...
Conflicts:
include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
Michael
24a57020b9
Better version transformation for nodeinfo and statistics.json
2017-03-16 21:34:53 +00:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
Michael
58bf1c50af
Bugfix: When a query fails we mustn't use the result value.
2017-03-16 09:23:12 +00:00
Michael
4812f4c0f9
Without only the worker queue we don't need the deliverq anymore.
2017-03-16 07:30:59 +00:00
Michael
a211c8cb77
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-16 05:51:22 +00:00
rabuzarus
6fdc219143
Merge pull request #3227 from annando/1703-pdo
...
We now support PDO
2017-03-16 00:25:16 +01:00
Michael
8e12b159d9
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
2017-03-15 14:37:30 +00:00
Michael
9f9497f2ca
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-15 14:34:09 +00:00
Michael
88a69b93d5
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-15 13:56:17 +00:00
Michael
8decd15565
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-15 13:55:43 +00:00
Michael
dc3fcf0487
Standard stuff
2017-03-15 06:00:22 +00:00
Michael
35ec1c8f26
Bugfix for pull request 3216 - feed items were mixed
2017-03-14 21:14:09 +00:00
Michael Vogel
e57bd5fe55
Merge pull request #3233 from rabuzarus/20170314_-_pagination
...
limit pagination page buttons to max 10
2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54
limit pagination page buttons to max 10
2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800
Merge pull request #3221 from strk/remember-openid
...
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
Michael
0d32f0be46
One forgotten standard
2017-03-14 15:18:56 +00:00
Michael
f73389dd12
Standard stuff
2017-03-14 15:17:21 +00:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael
43ceb72196
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-14 07:26:15 +00:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Michael
748caa0807
Removed debug output
2017-03-14 04:58:05 +00:00
Michael
a2b7b2a968
Daily updating the server status
2017-03-13 22:16:09 +00:00
Sandro Santilli
0b46a5f935
Standards: add braces
...
(thanks @Hypolite)
2017-03-13 23:09:09 +01:00
Sandro Santilli
8517ba1fab
Remove extra space after open parentheses
2017-03-13 23:08:03 +01:00
Michael Vogel
98945eb6fa
Merge pull request #3213 from Hypolite/issue/#2792-2
...
Like behavior fix/improvements
2017-03-13 18:35:32 +01:00
Michael
ae64f6f7e2
z_fetch_url now always returns an array
2017-03-13 14:37:51 +00:00
Sandro Santilli
cbaf196f50
Only remove the "remember me" cookie at submitting the auth form
...
Fixes loss of remember (Friendica) cookie on switching Managed accounts
2017-03-13 11:59:05 +01:00
Michael
fbb84ee219
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 10:18:29 +00:00
Michael
6a16565642
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-13 07:23:32 +00:00
Michael
44888590e5
One error, one documentation, one brace
2017-03-13 06:32:33 +00:00
Michael
acadb8ecdb
Remove redundancies.
2017-03-13 06:09:00 +00:00
Michael
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
Michael
80e58964ce
Standard stuff
2017-03-13 00:09:32 +00:00
Michael
97d3176754
Querying via nodeinfo
2017-03-13 00:03:27 +00:00
Michael
49b22de705
Changes from previous pull request applied again
2017-03-12 21:57:09 +00:00
Michael
e10339a47f
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
2017-03-12 21:05:10 +00:00
Michael
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
Michael
1624150db4
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
...
Conflicts:
include/onepoll.php
2017-03-12 20:54:28 +00:00
Michael
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
Michael
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
Michael
18d23ca443
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-12 20:49:48 +00:00
Tobias Diekershoff
7d1e54664a
Merge pull request #3133 from mexon/mat/cidfix
...
Allow cid URLs for images
2017-03-12 15:44:22 +01:00
Tobias Diekershoff
7275319eb6
Merge pull request #3214 from Hypolite/get_contact-rewrite
...
Reformatted get_contact()
2017-03-12 15:42:17 +01:00
Tobias Diekershoff
1bf089e424
Merge pull request #3216 from annando/1701-performance
...
Better network handling, improved structure
2017-03-12 15:40:56 +01:00
Tobias Diekershoff
e29d7f19d1
Merge pull request #3222 from Hypolite/issue/#3220
...
Diaspora: Normalize line endings instead of adding <br> before Markdown()
2017-03-12 15:35:42 +01:00
Michael
bfad58a777
We don't need to show the id.
2017-03-12 09:41:10 +00:00
Michael
3a3fa017a6
Discovery of new servers
2017-03-12 09:13:04 +00:00
Hypolite Petovan
2310bf994a
Normalize line endings instead of adding <br> before Markdown()
2017-03-12 03:55:22 -04:00
Sandro Santilli
df6304cc42
Fix "remember me" cookie for OpenID logins
...
Closes #2432
NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
2017-03-12 01:11:35 +01:00
Michael
2d2a35af73
Make Hypolite happy
2017-03-08 18:03:41 +00:00
Michael
32f1b2de20
Forgotten debug output
2017-03-08 13:15:24 +00:00
Michael
d898616f8d
Remove junk from the version number
2017-03-08 05:40:57 +00:00
Hypolite Petovan
37b15995d8
Add pump.io network to probing supported networks
...
- Remove useless condition
2017-03-07 16:43:22 -05:00
Hypolite Petovan
d7f62e82b9
Fix behavior regression
...
Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.
2017-03-07 16:28:15 -05:00
Michael
f7f23038db
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-03-07 21:24:20 +00:00
Michael
f09a8609df
Better separation between queries with or without result
2017-03-07 17:16:17 +00:00
Hypolite Petovan
97378893cd
Switch nurl and addr lookups
...
- nurl lookup is more frequent than addr lookup, saves queries
2017-03-06 16:26:04 -05:00
Hypolite Petovan
89f0b85905
Split slow catch-all query into three fast queries
...
Thanks @annando for the tip.
2017-03-06 16:19:12 -05:00
Hypolite Petovan
116b9e1c1f
Use Probe::uri instead of probe_url()
...
- Moved file inclusion to enable lazy loading
2017-03-06 06:01:08 -05:00
Hypolite Petovan
ff64beeb4e
Reformatted get_contact()
...
- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance
2017-03-06 05:37:01 -05:00
Hypolite Petovan
4931ecafbb
Rewriting of do_like()
...
- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set
2017-03-06 05:28:01 -05:00
Michael
d686bdcf09
Quickfix for SQL commands that should return "true" instead of an empty array
2017-03-06 10:10:22 +00:00
Hypolite Petovan
67ae0fed7f
Fix response "self" assigment
...
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
2017-03-06 05:07:17 -05:00
Michael
2ea50d9c47
Emulation for the mysqli behaviour when executing insert, update, ...
2017-03-05 23:59:53 +00:00
Michael
07516c318c
We now support PDO for database connections as well
2017-03-05 21:56:50 +00:00
Michael
9a71472be6
Only store a new gserver entry if it is a valid one
2017-03-04 14:32:40 +00:00
Michael
953477de87
Improved check for the server base url
2017-03-04 13:30:34 +00:00
Michael
b42167f0ac
We can now return a list of known servers
2017-03-04 11:04:00 +00:00
Michael
25e6244950
BlaBlaNet is now detected again. No false positive for Statusnet anymore
2017-03-04 07:57:55 +00:00
Michael
9965061359
Better detection for Hubzilla
2017-03-02 21:20:33 +00:00
Michael
324d8bfe8e
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-02 20:20:38 +00:00
Michael
5c92e97173
Added index for performance issues
2017-03-02 05:46:44 +00:00
Hypolite Petovan
07aefe61bf
Update paginate_data()
...
- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type
2017-03-01 23:26:49 -05:00
Michael
60adf67f13
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date
2017-02-28 06:50:46 +00:00
Michael
4de057804c
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker
2017-02-28 06:49:21 +00:00
Michael
c829dc8e71
The service at gstools.org doesn't exist anymore.
2017-02-28 06:26:50 +00:00
Michael
0afb0c2ea4
NULL_DATE is now a constant
2017-02-27 23:37:15 +00:00
Michael
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
Michael
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
Michael
3c220dd40c
Queue.php is now reworked
2017-02-27 21:07:32 +00:00
Michael
df6913f7e1
pidfile.php is in use by two addons. So we restore it here.
2017-02-27 06:31:49 +00:00
Michael
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
Michael
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
Michael
2a8a5a6d88
Improved server vitality detection
2017-02-26 18:19:20 +00:00
Michael
6bd59cd094
Bugfix: "ALTER IGNORE" was missing on structure and index change
2017-02-26 08:36:05 +00:00
Michael
da8a48f89e
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
2017-02-25 13:59:24 +00:00
Michael
ca6171eb5c
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
2017-02-23 07:21:47 +00:00
Michael
06b16cce8b
Define the lowest possible datetime string as "0001-01-01 00:00:00"
2017-02-23 07:09:55 +00:00
Michael
f9f27c2f5f
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-23 06:55:35 +00:00
Michael
8986edf070
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
2017-02-23 06:54:50 +00:00
Michael
ffeae7e048
Bugfix for bugfix :-)
2017-02-23 05:45:06 +00:00
Michael
c84565633e
Added check for invalid "contact-type"
2017-02-22 22:25:35 +00:00
Michael
194d80c326
Bugfix for badly formatted date time string.
2017-02-22 22:04:56 +00:00
Michael
564bc22900
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
2017-02-19 18:46:20 +00:00
Michael
9251d2af6f
Ensure that the spool path is set
2017-02-19 10:13:40 +00:00
Michael
2bfc40d74c
Bugfix for not createable spool path
2017-02-19 08:23:21 +00:00
Hypolite Petovan
58a444b430
Add original_url() param documentation
2017-02-18 20:39:16 -05:00
Hypolite Petovan
2c959b925d
Add param documentation
2017-02-18 20:35:31 -05:00
Hypolite Petovan
432587464c
Fix Diaspora link attachment probe
...
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
2017-02-17 22:35:46 -05:00
Hypolite Petovan
99cfae63d7
Clean trailing whitespaces
2017-02-17 22:32:33 -05:00
Tobias Diekershoff
e647aa8846
Merge pull request #3169 from annando/bugfix-delete-spool
...
We have to delete spool files after posting in any case
2017-02-17 08:04:22 +01:00
Michael
03653072a2
We have to delete spool files after posting in any case
2017-02-16 20:23:07 +00:00
Michael
531074a72f
Handle the case when a contact is unknown.
2017-02-16 20:03:44 +00:00
Michael
7ba5228814
Bugfix: Only delete spool files that are spool files
2017-02-14 21:13:00 +00:00
Michael
e5e6f4fd19
Better logging to analyze unwanted messages from Diaspora
2017-02-11 23:37:15 +00:00
Tobias Diekershoff
a4dcd8be55
Merge pull request #3159 from annando/bugfix-diaspora-relay
...
Bugfix: Only accept postings from anyone when the relay is configured
2017-02-11 08:58:38 +01:00
Michael
40390cc5ec
Diaspora Relay: Only accept postings from anyone when the relay is configured
2017-02-10 20:45:22 +00:00
Michael
f5a634abbc
Changed server detection.
2017-02-10 19:23:46 +00:00
rabuzarus
3474b40732
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
2017-02-10 03:51:01 +01:00
Michael
6dd27b83ef
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-06 21:28:42 +00:00
Tobias Diekershoff
3c5f7e457a
Merge pull request #3149 from annando/1601-new-diaspora-mention
...
Support for the new Diaspora mention format
2017-02-05 16:38:09 +01:00
Michael
e9d719a299
removed to-do
2017-02-05 07:02:20 +00:00
Michael
9f706fcfbb
Add include
2017-02-04 22:27:49 +00:00
Michael
0d1f88033b
Support for the new Diaspora mention format
2017-02-04 22:22:12 +00:00
Michael
21accc0a53
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-04 16:28:36 +00:00
Michael
9c4a53e380
Optimized query for nodeinfo, better way to analyze posting problems with DFRN
2017-02-04 16:16:15 +00:00
Tobias Diekershoff
adedf18b30
Merge pull request #3146 from annando/1701-pnut
...
Preparation to add the social network "pnut"
2017-02-02 09:10:28 +01:00
Michael
5ffef9c96d
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-02 06:27:10 +00:00
Michael
275a1c6574
Preparation to add the social network "pnut"
2017-02-02 06:06:23 +00:00
Michael
9a19ae7ce1
The queue now works with the cache - whoch should speed it up
2017-02-02 05:52:45 +00:00
Michael
ef0fb5148c
Some more timeout checks
2017-02-01 21:35:01 +00:00
Michael
8a75a20d26
Bugfix: An index was missing
2017-02-01 21:08:13 +00:00
Michael
f6e1fbfcaa
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-01 17:29:20 +00:00
Michael
da30538a98
Bugfix for pull request 3125
2017-02-01 13:50:05 +00:00