9545ff614b
Limit smilies replacement to BBCode::convert
2019-06-23 17:53:25 -04:00
b9ab613777
Merge branch 'master' into develop
2019-06-23 17:40:52 -04:00
c1f99c70b1
Merge branch '2019.06-rc'
...
# Conflicts:
# CHANGELOG
# VERSION
# boot.php
2019-06-23 15:30:44 -04:00
289bcfa121
Fix receiving of DFRN posts with public envelope
2019-06-22 04:17:38 +00:00
fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button
...
Normalize message button in profile sidebar
2019-06-12 17:56:05 +02:00
3aebb92cf3
Rework Profile::sidebar profile link conditions
...
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
2019-06-10 21:56:03 -04:00
7c54edd4b4
Fixing Network::post() caused by wrong argument
2019-06-10 19:34:16 +02:00
d7d44e1af7
Merge pull request #7245 from annando/unify-constants
...
Fix delivery counter for poking / unify delivery commands
2019-06-10 11:59:40 -04:00
41dc243186
Fix delivery counter for poking / unify delivery commands
2019-06-10 14:19:24 +00:00
cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters
2019-06-10 14:34:54 +02:00
44a49a8d7d
Ensure that pokes are always send only via DFRN
2019-06-06 04:26:02 +00:00
f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag
...
Adding null checks before FileTag method (fix fatal)
2019-05-31 01:47:52 -04:00
ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings
...
Add hexadecimal check (fix warnings)
2019-05-30 09:31:50 -04:00
c76258c370
catching nulls for FileTag
2019-05-30 13:54:35 +02:00
03ca26f0c4
Change fallback logic
2019-05-30 13:45:39 +02:00
aa33a79e13
normal comparison
2019-05-30 13:38:00 +02:00
4c5dd9f47c
Add more Strings::isHex() checks to photos
2019-05-30 10:30:15 +02:00
e4a63bc219
Replace $_SESSION with Session::get()
2019-05-30 10:18:52 +02:00
7334be803d
Bugfix - `item_id`
2019-05-29 21:40:21 +02:00
392137b433
Adding hexadecimal check for parse_rul
...
see https://github.com/friendica/friendica/issues/6917#issuecomment-475461338
2019-05-29 20:32:16 +02:00
3de540d1d1
Adding hexadecimal check for photos
...
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
2019-05-29 20:28:25 +02:00
e853e256c7
Checking all values for $_SESSION
...
See https://github.com/friendica/friendica/issues/6918#issuecomment-491492826
2019-05-29 20:07:22 +02:00
3015135750
Adding fallback route in case of a non valid route
...
see https://github.com/friendica/friendica/issues/6918#issuecomment-491009954
2019-05-29 20:06:50 +02:00
59bbb1ac99
Merge pull request #7203 from MrPetovan/bug/warnings
...
Fix condition in dfrn_request_content() when $a->profile isn't set
2019-05-29 07:06:06 +02:00
9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network
...
Allow commas in saved folder names
2019-05-29 07:03:44 +02:00
8f4dbec696
Fix condition in dfrn_request_content() when $a->profile isn't set
...
See https://github.com/friendica/friendica/issues/6917#issuecomment-494087890
2019-05-28 21:14:21 -04:00
ed768c71ee
Remove "f=&" nonsense from network module
...
- Fixes wrong redirect when using the sidebar filters
2019-05-27 17:45:27 -04:00
cd05d15b04
Replace build_querystring() by http_build_query() introduced in PHP 5
2019-05-27 17:40:12 -04:00
0fadc7730c
Replace deprecated string-bases Model\FileTag calls with array-based ones
2019-05-27 17:40:08 -04:00
3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime
...
Fix NULL datetime for uimport/uexport
2019-05-27 09:13:01 -04:00
01e71254d9
Replace defaults() calls on $_SESSION by Core\Session calls
...
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
2019-05-26 21:26:59 -04:00
26d4214c19
added suggestions
2019-05-26 21:53:24 +02:00
220f8f0862
friendica-6950 uimport doesn't support `"pwdreset_time":null`
2019-05-26 15:49:44 +02:00
2652787460
friendica-7130 Edits of images not possible
2019-05-26 15:00:19 +02:00
d27d4d8927
Move posted date widget to Content\Widget
2019-05-25 19:08:15 -04:00
c65faecc8c
Add current tab parameter to Model\Profile::getTabs
2019-05-20 15:09:33 -04:00
709eba6ce3
Move /viewcontacts to /profile/{nickname}/contacts[/{type}]
...
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
2019-05-20 14:50:09 -04:00
862159c712
Merge pull request #7165 from nupplaphil/task/mod_dirfind
...
Move mod/dirfind to src/Module/Search/Directory
2019-05-20 14:45:19 -04:00
0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember
...
Move mod/newmember to src/Module/Welcome
2019-05-20 14:14:58 -04:00
f97b72eb9f
Move mod/newmember to src/Module/Welcome
2019-05-20 20:12:20 +02:00
6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe
...
Move mod/probe to src/Module/Probe
2019-05-19 15:06:13 -04:00
3ca64185a6
Merge pull request #7169 from annando/send-suggest
...
Sending contact suggestions does work again
2019-05-19 14:59:28 -04:00
a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets
...
Refactor widgets
2019-05-19 20:52:00 +02:00
a6cf036db2
Sending contact suggestions does work again
2019-05-19 17:59:37 +00:00
14d4132ad0
Fixed contact suggestion
2019-05-19 08:54:26 +00:00
a7aae9603a
Split Directory Search as a base for further changes
2019-05-19 05:06:02 +02:00
5b44fdc202
Split Directory Search as a base for further changes
2019-05-19 05:01:46 +02:00
e00f110ef1
Move mod/dirfind to src/Module/DirFind
2019-05-19 04:28:16 +02:00
48bba87abe
Move mod/probe to src/Module/Probe
2019-05-19 04:24:18 +02:00
7a13582c67
Merge pull request #7159 from nupplaphil/task/mod_notice
...
Move mod/notice to src/Module/Notice
2019-05-18 22:16:35 -04:00
Hypolite Petovan
Michael
Philipp