bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
14370 commits 4 branches 62 tags 178 MiB
Commit graph

14370 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael ae64f6f7e2 z_fetch_url now always returns an array 2017-03-13 14:37:51 +00:00
Michael 0cb3dc92d3 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 14:10:28 +00:00
rabuzarus e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107 
Delete frio obsolete Colors.php library
 2017-03-13 14:17:37 +01:00
Michael bb59f105e7 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-13 10:18:56 +00:00
Michael fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 10:18:29 +00:00
Michael 52a35f9884 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-13 08:54:27 +00:00
Michael 611cbcfd06 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 08:53:57 +00:00
Tobias Diekershoff dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language 
The language string isn't displayed anymore
 2017-03-13 08:26:43 +01:00
Tobias Diekershoff e2c515baa9 Merge pull request #3225 from annando/1702-no_old_share 
The old share option is removed
 2017-03-13 07:52:38 +01:00
Michael 44888590e5 One error, one documentation, one brace 2017-03-13 06:32:33 +00:00
Michael 97d3176754 Querying via nodeinfo 2017-03-13 00:03:27 +00:00
Michael d9da10975a Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-12 22:24:06 +00:00
Michael 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +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
Tobias Diekershoff 30d82f4391 mark the develop version in the version string 2017-03-12 14:40:08 +01:00
Tobias Diekershoff 4cddb74f27 Merge branch 'master' into develop 2017-03-12 14:39:09 +01:00
Tobias Diekershoff 2bfa870c47 Friendica Version 3.5.1 2017-03-12 14:38:01 +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
Michael 3249152ac3 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-11 19:29:55 +00:00
Hypolite Petovan 3fa4605ace Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-09 21:11:14 -05:00
fabrixxm 3f6fd8ee69 Merge pull request #3208 from Hypolite/issue/#3194 
Strip @hubzilla.server part from guid for autoscrolling purpuses
 2017-03-09 09:37:21 +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
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
Michael 0989f725a6 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-05 16:23:58 +00:00
Tobias Diekershoff 9cbab5cd7a Merge pull request #3212 from annando/followup2-profile 
Second followup for profile issue
 2017-03-05 13:29:48 +01:00
Michael Vogel 7867f6fcef Merge pull request #3211 from tobiasd/3.5.1rc 
DE translation and one solved issue for the CHANGELOG
 2017-03-05 13:09:28 +01:00
Tobias Diekershoff 67dda52f4b issue solved 2017-03-05 12:41:02 +01:00
Tobias Diekershoff 5097c74d21 DE translations 2017-03-05 12:40:31 +01:00
Michael 2775adfdf5 Second followup for profile issue 2017-03-05 11:07:10 +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 ec9dddb445 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-04 10:33:43 +00:00
Tobias Diekershoff ad9303868b Merge pull request #3209 from annando/followup-3196 
Follow up for issue 3196: We need an index hint for performance issues
 2017-03-04 09:41:00 +01:00
Michael 461ee5c8a8 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-04 08:38:04 +00:00