Commit graph

14368 commits

Author SHA1 Message Date
Hypolite Petovan
79f14749df Merge branch 'develop' into improvement/frio-action-links-to-buttons
# Conflicts:
#	view/theme/frio/templates/search_item.tpl
#	view/theme/frio/templates/wall_thread.tpl
2017-03-14 10:45:17 -04:00
Hypolite Petovan
6d087aae23 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-14 10:30:04 -04:00
rabuzarus
3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2
frio: Revert guid truncation for scrollToItem() and improve dropItem()
2017-03-14 13:04:47 +01:00
Hypolite Petovan
f7855ecfe5 Merge remote-tracking branch 'friendica/develop' into develop 2017-03-14 07:58:37 -04: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 Vogel
199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195
Improve pagination on frio
2017-03-14 06:05:42 +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
Hypolite Petovan
327b00117d Improve dropItem() functionality
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
2017-03-13 12:12:13 -04:00
Hypolite Petovan
f2a0c9fad1 Fix scrollToItem breaking dropItem functionality
- Add doc
- Refactor function by removing double jQuery wrapping
2017-03-13 12:10:03 -04:00
Hypolite Petovan
054f43a332 Merge remote-tracking branch 'friendica/develop' into develop 2017-03-13 11:53:34 -04: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
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
eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael
80e58964ce Standard stuff 2017-03-13 00:09:32 +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
b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +00:00
Hypolite Petovan
5718e49e68 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-12 11:19:37 -04: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
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
Michael
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
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
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
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
Hypolite Petovan
da5bbe8b50 Add public_contact() function
- Add function to retrieve the public contact id (uid = 0) of the
current logged-in user
2017-03-06 05:06:05 -05: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
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
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
Tobias Diekershoff
1d667d7a45 tag change 2017-03-03 17:18:09 +01:00