4d30f2b292
Merge remote-tracking branch 'upstream/master'
2017-03-13 10:21:08 +00:00
bb59f105e7
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-13 10:18:56 +00:00
fbb84ee219
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 10:18:29 +00:00
52a35f9884
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-13 08:54:27 +00:00
611cbcfd06
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 08:53:57 +00:00
83e5c31d28
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-13 08:49:33 +00:00
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
6a16565642
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-13 07:23:32 +00:00
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
44888590e5
One error, one documentation, one brace
2017-03-13 06:32:33 +00:00
acadb8ecdb
Remove redundancies.
2017-03-13 06:09:00 +00:00
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
80e58964ce
Standard stuff
2017-03-13 00:09:32 +00:00
97d3176754
Querying via nodeinfo
2017-03-13 00:03:27 +00:00
d9da10975a
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-12 22:24:06 +00:00
49b22de705
Changes from previous pull request applied again
2017-03-12 21:57:09 +00:00
e10339a47f
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
2017-03-12 21:05:10 +00:00
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
1624150db4
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
...
Conflicts:
include/onepoll.php
2017-03-12 20:54:28 +00:00
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
b6a4a2ec7f
Merge remote-tracking branch 'upstream/develop' into 1702-no-language
2017-03-12 20:50:20 +00:00
18d23ca443
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-12 20:49:48 +00:00
Hypolite Petovan
5718e49e68
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-12 11:19:37 -04: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
bfad58a777
We don't need to show the id.
2017-03-12 09:41:10 +00:00
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
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
2d2a35af73
Make Hypolite happy
2017-03-08 18:03:41 +00:00
32f1b2de20
Forgotten debug output
2017-03-08 13:15:24 +00:00
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
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
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
