|
|
e10339a47f
|
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
|
2017-03-12 21:05:10 +00:00 |
|
|
|
7d1e54664a
|
Merge pull request #3133 from mexon/mat/cidfix
Allow cid URLs for images
|
2017-03-12 15:44:22 +01:00 |
|
|
|
7275319eb6
|
Merge pull request #3214 from Hypolite/get_contact-rewrite
Reformatted get_contact()
|
2017-03-12 15:42:17 +01:00 |
|
|
|
1bf089e424
|
Merge pull request #3216 from annando/1701-performance
Better network handling, improved structure
|
2017-03-12 15:40:56 +01:00 |
|
|
|
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 |
|
|
|
30d82f4391
|
mark the develop version in the version string
|
2017-03-12 14:40:08 +01:00 |
|
|
|
4cddb74f27
|
Merge branch 'master' into develop
|
2017-03-12 14:39:09 +01:00 |
|
|
|
2bfa870c47
|
Friendica Version 3.5.1
|
2017-03-12 14:38:01 +01:00 |
|
Hypolite Petovan
|
2310bf994a
|
Normalize line endings instead of adding <br> before Markdown()
|
2017-03-12 03:55:22 -04: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 |
|
|
|
2d2a35af73
|
Make Hypolite happy
|
2017-03-08 18:03:41 +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 |
|
|
|
f7f23038db
|
Merge remote-tracking branch 'upstream/develop' into 1701-performance
|
2017-03-07 21:24:20 +00:00 |
|
|
|
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 |
|
|
|
d686bdcf09
|
Quickfix for SQL commands that should return "true" instead of an empty array
|
2017-03-06 10:10:22 +00:00 |
|
|
|
2ea50d9c47
|
Emulation for the mysqli behaviour when executing insert, update, ...
|
2017-03-05 23:59:53 +00:00 |
|
|
|
07516c318c
|
We now support PDO for database connections as well
|
2017-03-05 21:56:50 +00:00 |
|
|
|
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 |
|
|
|
67dda52f4b
|
issue solved
|
2017-03-05 12:41:02 +01:00 |
|
|
|
5097c74d21
|
DE translations
|
2017-03-05 12:40:31 +01:00 |
|
|
|
2775adfdf5
|
Second followup for profile issue
|
2017-03-05 11:07:10 +00:00 |
|
|
|
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 |
|
|
|
8690b97c27
|
Follow up for issue 3196: We need an index hint for performance issues
|
2017-03-04 08:25:47 +00:00 |
|
Hypolite Petovan
|
3ea830e221
|
Strip @hubzilla.server part from guid for autoscrolling purpuses
|
2017-03-03 21:45:36 -05:00 |
|
Michael Vogel
|
9ccb6072b8
|
Merge pull request #3205 from tobiasd/20170226-issue3187
Bugfix issue 3187
|
2017-03-03 21:36:37 +01:00 |
|
|
|
1d667d7a45
|
tag change
|
2017-03-03 17:18:09 +01:00 |
|
|
|
0d83082343
|
regenerated master messages.po file
|
2017-03-03 10:31:10 +01:00 |
|
|
|
2fa9f76e67
|
better wording and placeholder for name
|
2017-03-03 10:28:29 +01:00 |
|
Michael Vogel
|
372b660aa1
|
Merge pull request #3201 from tobiasd/20170302-changelog
issues solved
|
2017-03-02 10:16:14 +01:00 |
|
|
|
3476820529
|
issues solved
|
2017-03-02 09:05:24 +01:00 |
|
|
|
e66ad9d6bd
|
Merge pull request #3199 from annando/issue-3196
Bugfix Issue 3196: Not all forum posts weren't shown
|
2017-03-02 07:29:45 +01:00 |
|
|
|
5c92e97173
|
Added index for performance issues
|
2017-03-02 05:46:44 +00:00 |
|
|
|
3ab845dcf3
|
Issue 3196: Not all forum posts weren't shown
|
2017-03-01 21:47:10 +00:00 |
|
Michael Vogel
|
c23298b4c9
|
Merge pull request #3193 from tobiasd/20170228-CHANGELOG
this line is superfluous by now
|
2017-02-28 09:30:35 +01:00 |
|
|
|
59bfc3f4a8
|
this line is superfluous by now
|
2017-02-28 08:21:33 +01:00 |
|
|
|
1046f2573c
|
Merge pull request #3192 from annando/gstools-isnt-anymore
The service at gstools.org doesn't exist anymore.
|
2017-02-28 07:35:04 +01:00 |
|
|
|
c829dc8e71
|
The service at gstools.org doesn't exist anymore.
|
2017-02-28 06:26:50 +00:00 |
|
|
|
7442ce3d6d
|
change Fan/Admirer to Subscriber
|
2017-02-26 16:47:11 +01:00 |
|
|
|
86c6c48bd8
|
Merge pull request #3190 from annando/bugfix-dbstructure
Bugfix: "ALTER IGNORE" was missing on structure and index alteration
|
2017-02-26 10:05:02 +01:00 |
|
|
|
6bd59cd094
|
Bugfix: "ALTER IGNORE" was missing on structure and index change
|
2017-02-26 08:36:05 +00:00 |
|
|
|
b850eb248a
|
Merge pull request #3188 from annando/bugfix-fetch_url
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
|
2017-02-26 04:19:22 +01:00 |
|
|
|
da8a48f89e
|
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
|
2017-02-25 13:59:24 +00:00 |
|
Michael Vogel
|
450b1fa6ff
|
Merge pull request #3186 from tobiasd/20170224-changelog
small update for the CHANGELOG
|
2017-02-25 00:17:10 +01:00 |
|
