friendica.git/.git
5 years agoMerge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text
Michael Vogel [Sun, 30 Dec 2018 15:41:05 +0000 (16:41 +0100)]
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text

Unescape admin warning text

5 years agoMerge pull request #6352 from MrPetovan/bug/6349-normalize-config-line-endings
Michael Vogel [Sun, 30 Dec 2018 15:40:47 +0000 (16:40 +0100)]
Merge pull request #6352 from MrPetovan/bug/6349-normalize-config-line-endings

Normalize config file line endings to LF

5 years agoMerge pull request #6353 from MrPetovan/bug/6343-unescape-plaintext-email
Michael Vogel [Sun, 30 Dec 2018 15:40:15 +0000 (16:40 +0100)]
Merge pull request #6353 from MrPetovan/bug/6343-unescape-plaintext-email

Unescape plaintext email body

5 years agoUnescape plaintext email body
Hypolite Petovan [Sun, 30 Dec 2018 15:20:38 +0000 (10:20 -0500)]
Unescape plaintext email body

5 years agoNormalize config file line endings to LF
Hypolite Petovan [Sun, 30 Dec 2018 15:15:12 +0000 (10:15 -0500)]
Normalize config file line endings to LF

5 years agoUnescape admin warning text
Hypolite Petovan [Sun, 30 Dec 2018 15:12:13 +0000 (10:12 -0500)]
Unescape admin warning text

5 years agoMerge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings
Tobias Diekershoff [Sun, 30 Dec 2018 09:35:44 +0000 (10:35 +0100)]
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings

Fix site theme settings modal form

5 years agoUse minimal mode to change site theme settings
Hypolite Petovan [Sat, 29 Dec 2018 05:21:57 +0000 (00:21 -0500)]
Use minimal mode to change site theme settings

- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies

5 years agoRemove useless trailing slash in admin/addon_details.tpl
Hypolite Petovan [Sat, 29 Dec 2018 05:19:40 +0000 (00:19 -0500)]
Remove useless trailing slash in admin/addon_details.tpl

5 years ago[frio] Fix minimal layout
Hypolite Petovan [Sat, 29 Dec 2018 05:19:07 +0000 (00:19 -0500)]
[frio] Fix minimal layout

5 years agoAllow theme setting in module
Hypolite Petovan [Sat, 29 Dec 2018 05:18:52 +0000 (00:18 -0500)]
Allow theme setting in module

- Restore theme name caching

5 years agoFix screenshots URLs in frio readme
Hypolite Petovan [Sat, 29 Dec 2018 05:08:30 +0000 (00:08 -0500)]
Fix screenshots URLs in frio readme

5 years agoMerge pull request #6342 from annando/notices
Hypolite Petovan [Sat, 29 Dec 2018 17:16:37 +0000 (12:16 -0500)]
Merge pull request #6342 from annando/notices

Warning and notice fixed

5 years agoMerge pull request #6209 from MrPetovan/task/move-config-to-php-array
Tobias Diekershoff [Sat, 29 Dec 2018 10:43:55 +0000 (11:43 +0100)]
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array

Remove util/ folder

5 years agoMerge pull request #6341 from MrPetovan/bug/parseurl-charset
Michael Vogel [Sat, 29 Dec 2018 10:00:06 +0000 (11:00 +0100)]
Merge pull request #6341 from MrPetovan/bug/parseurl-charset

Replace latin-1 by latin1 in charset detection

5 years agoWarning and notice fixed
Michael [Sat, 29 Dec 2018 09:53:31 +0000 (09:53 +0000)]
Warning and notice fixed

5 years agoReplace latin-1 by latin1 in charset detection
Hypolite Petovan [Tue, 4 Sep 2018 14:52:17 +0000 (10:52 -0400)]
Replace latin-1 by latin1 in charset detection

- Simplify conditional for charset conversion

5 years agoMerge pull request #6333 from annando/avoid-wsod
Hypolite Petovan [Thu, 27 Dec 2018 18:14:22 +0000 (13:14 -0500)]
Merge pull request #6333 from annando/avoid-wsod

Avoid a WSOD after PR 6315

5 years agoAvoid a WSOD after PR 6315
Michael [Thu, 27 Dec 2018 17:17:02 +0000 (17:17 +0000)]
Avoid a WSOD after PR 6315

5 years agoMerge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile
Michael Vogel [Thu, 27 Dec 2018 17:04:06 +0000 (18:04 +0100)]
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile

Rework mod/match and mod/msearch

5 years agoMerge pull request #6332 from annando/assign-uid
Hypolite Petovan [Thu, 27 Dec 2018 14:28:22 +0000 (09:28 -0500)]
Merge pull request #6332 from annando/assign-uid

Only assign a uid to the profile if not defined by now

5 years agoOnly assign a uid to the profile if not defined by now
Michael [Thu, 27 Dec 2018 09:58:21 +0000 (09:58 +0000)]
Only assign a uid to the profile if not defined by now

5 years agoFix mods/README.md format
Hypolite Petovan [Thu, 27 Dec 2018 06:52:40 +0000 (01:52 -0500)]
Fix mods/README.md format

5 years agoDelete friendica-to-smarty-tpl.py
Hypolite Petovan [Thu, 27 Dec 2018 06:51:59 +0000 (01:51 -0500)]
Delete friendica-to-smarty-tpl.py

5 years agoDelete updatetpl.py
Hypolite Petovan [Thu, 27 Dec 2018 06:51:50 +0000 (01:51 -0500)]
Delete updatetpl.py

5 years agoMerge branch '2018.12-rc' into task/move-config-to-php-array
Hypolite Petovan [Thu, 27 Dec 2018 06:47:53 +0000 (01:47 -0500)]
Merge branch '2018.12-rc' into task/move-config-to-php-array

5 years agoMerge pull request #6331 from MrPetovan/bug/6328-unescape-vcard-network-link
Michael Vogel [Wed, 26 Dec 2018 22:35:40 +0000 (23:35 +0100)]
Merge pull request #6331 from MrPetovan/bug/6328-unescape-vcard-network-link

Unescape vcard network link

5 years agoNormalize uses of Strings::formatNetworkName to $network_link
Hypolite Petovan [Wed, 26 Dec 2018 16:03:41 +0000 (11:03 -0500)]
Normalize uses of Strings::formatNetworkName to $network_link

- Unescape HTML template variable $network_link

5 years agoFix formatting in Util\Strings
Hypolite Petovan [Wed, 26 Dec 2018 16:02:50 +0000 (11:02 -0500)]
Fix formatting in Util\Strings

5 years agoRemove useless intermediate network_name variable in include/api
Hypolite Petovan [Wed, 26 Dec 2018 16:02:28 +0000 (11:02 -0500)]
Remove useless intermediate network_name variable in include/api

5 years agoMerge pull request #6330 from annando/issue-6329
Hypolite Petovan [Wed, 26 Dec 2018 14:55:52 +0000 (09:55 -0500)]
Merge pull request #6330 from annando/issue-6329

Issue-6329: Prevent double encoding

5 years agoIssue-6329: Prevent double encoding
Michael [Wed, 26 Dec 2018 11:21:42 +0000 (11:21 +0000)]
Issue-6329: Prevent double encoding

5 years agoMerge pull request #6326 from annando/dont-show-follow
Hypolite Petovan [Tue, 25 Dec 2018 21:16:25 +0000 (16:16 -0500)]
Merge pull request #6326 from annando/dont-show-follow

Don't show "follow" activity

5 years agoMerge pull request #6325 from annando/always-magic
Hypolite Petovan [Tue, 25 Dec 2018 21:16:03 +0000 (16:16 -0500)]
Merge pull request #6325 from annando/always-magic

Always use magic on the same server

5 years agoDon't show "follow" activity
Michael [Tue, 25 Dec 2018 19:50:40 +0000 (19:50 +0000)]
Don't show "follow" activity

5 years agoAlways usa magic on the same server
Michael [Tue, 25 Dec 2018 19:43:57 +0000 (19:43 +0000)]
Always usa magic on the same server

5 years agoMerge pull request #6324 from MrPetovan/bug/6316-remove-html-encode
Michael Vogel [Tue, 25 Dec 2018 19:02:33 +0000 (20:02 +0100)]
Merge pull request #6324 from MrPetovan/bug/6316-remove-html-encode

Remove redundant html encoding

5 years agoRemove redundant htmlentities/htmlspecialchars
Hypolite Petovan [Tue, 25 Dec 2018 16:37:32 +0000 (11:37 -0500)]
Remove redundant htmlentities/htmlspecialchars

5 years agoUnescape babel result panel content
Hypolite Petovan [Tue, 25 Dec 2018 16:37:11 +0000 (11:37 -0500)]
Unescape babel result panel content

5 years agoReplace q() calls in mod/viewcontacts
Hypolite Petovan [Tue, 25 Dec 2018 16:36:41 +0000 (11:36 -0500)]
Replace q() calls in mod/viewcontacts

5 years agoRemove random profile behavior from /profile
Hypolite Petovan [Tue, 25 Dec 2018 16:33:48 +0000 (11:33 -0500)]
Remove random profile behavior from /profile

5 years agoRestore escaping for textarea field template
Hypolite Petovan [Tue, 25 Dec 2018 16:32:42 +0000 (11:32 -0500)]
Restore escaping for textarea field template

5 years agoAdd page wrapper to wallmessage.tpl
Hypolite Petovan [Tue, 25 Dec 2018 16:32:14 +0000 (11:32 -0500)]
Add page wrapper to wallmessage.tpl

5 years ago[frio] Fix remaining user profile link icon
Hypolite Petovan [Tue, 25 Dec 2018 16:31:55 +0000 (11:31 -0500)]
[frio] Fix remaining user profile link icon

5 years agoMerge pull request #6323 from annando/issue-6316
Hypolite Petovan [Tue, 25 Dec 2018 16:26:54 +0000 (11:26 -0500)]
Merge pull request #6323 from annando/issue-6316

Issue 6316: Do not double encode / Avoid notice

5 years agoFixing double encoding here as well
Michael [Tue, 25 Dec 2018 12:30:27 +0000 (12:30 +0000)]
Fixing double encoding here as well

5 years agoIssue 6316: Do not double encode / Avoid notice
Michael [Tue, 25 Dec 2018 12:12:59 +0000 (12:12 +0000)]
Issue 6316: Do not double encode / Avoid notice

5 years agoMerge pull request #6321 from MrPetovan/bug/6316-escape-event-output
Tobias Diekershoff [Tue, 25 Dec 2018 07:33:43 +0000 (08:33 +0100)]
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output

Escape event output

5 years agoMerge pull request #6322 from MrPetovan/bug/6316-unescape-aes-allow
Tobias Diekershoff [Tue, 25 Dec 2018 07:29:12 +0000 (08:29 +0100)]
Merge pull request #6322 from MrPetovan/bug/6316-unescape-aes-allow

Unescape aes allow

5 years agoUnescape aes_allow in dfrn_req_confirm.tpl
Hypolite Petovan [Tue, 25 Dec 2018 04:14:30 +0000 (23:14 -0500)]
Unescape aes_allow in dfrn_req_confirm.tpl

5 years agoRemove unused template variable in dfrn_req_confirm
Hypolite Petovan [Tue, 25 Dec 2018 04:14:09 +0000 (23:14 -0500)]
Remove unused template variable in dfrn_req_confirm

- Replace killme() by exit() in mod/dfrn_request

5 years agoRemove template escaping for event title
Hypolite Petovan [Tue, 25 Dec 2018 03:52:38 +0000 (22:52 -0500)]
Remove template escaping for event title

5 years agoNormalize expected format for event fields summary, desc and location
Hypolite Petovan [Tue, 25 Dec 2018 03:52:21 +0000 (22:52 -0500)]
Normalize expected format for event fields summary, desc and location

- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events

5 years agoCode cleanup in events
Hypolite Petovan [Tue, 25 Dec 2018 03:50:29 +0000 (22:50 -0500)]
Code cleanup in events

- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json

5 years agoMerge pull request #6318 from annando/no-diaspora-follow
Hypolite Petovan [Mon, 24 Dec 2018 15:43:32 +0000 (10:43 -0500)]
Merge pull request #6318 from annando/no-diaspora-follow

The "Follow" activity shouldn't be send to Diaspora

5 years ago[Composer] Update lock file
Hypolite Petovan [Mon, 24 Dec 2018 14:57:06 +0000 (09:57 -0500)]
[Composer] Update lock file

5 years agoMove Composer autoload require out of boot.php
Hypolite Petovan [Mon, 24 Dec 2018 14:56:48 +0000 (09:56 -0500)]
Move Composer autoload require out of boot.php

5 years agoRemove include/ requires that are now done directly from Composer
Hypolite Petovan [Mon, 24 Dec 2018 14:56:25 +0000 (09:56 -0500)]
Remove include/ requires that are now done directly from Composer

5 years agoThe "Follow" activity shouldn't be send to Diaspora
Michael [Mon, 24 Dec 2018 14:50:21 +0000 (14:50 +0000)]
The "Follow" activity shouldn't be send to Diaspora

5 years agoMerge pull request #6314 from MrPetovan/task/6208-escape-html-true
Michael Vogel [Mon, 24 Dec 2018 07:40:30 +0000 (08:40 +0100)]
Merge pull request #6314 from MrPetovan/task/6208-escape-html-true

 Fix template escaping in photo gallery view

5 years ago[Composer] Add global libraries to autoload
Hypolite Petovan [Mon, 24 Dec 2018 00:45:33 +0000 (19:45 -0500)]
[Composer] Add global libraries to autoload

5 years agoRework mod/msearch
Hypolite Petovan [Mon, 24 Dec 2018 00:45:03 +0000 (19:45 -0500)]
Rework mod/msearch

- Remove deprecated q()/killme() calls
- Ensure an output on empty search string
- Fix page number nonsense (-1, +1,...)

5 years agoRework mod/match
Hypolite Petovan [Mon, 24 Dec 2018 00:42:50 +0000 (19:42 -0500)]
Rework mod/match

- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link

5 years agoAdd expected FULLTEXT index to profile table
Hypolite Petovan [Sun, 23 Dec 2018 23:54:06 +0000 (18:54 -0500)]
Add expected FULLTEXT index to profile table

5 years agoMerge pull request #6312 from annando/check-json
Hypolite Petovan [Sun, 23 Dec 2018 23:53:32 +0000 (18:53 -0500)]
Merge pull request #6312 from annando/check-json

Checks if JSON is enabled

5 years agoAdd support for FULLTEXT indices in Database\DBStructure
Hypolite Petovan [Sun, 23 Dec 2018 20:40:49 +0000 (15:40 -0500)]
Add support for FULLTEXT indices in Database\DBStructure

5 years ago[Composer] Add ext-curl dependency
Hypolite Petovan [Sun, 23 Dec 2018 20:32:38 +0000 (15:32 -0500)]
[Composer] Add ext-curl dependency

5 years agoFix formatting in Database\DBStructure
Hypolite Petovan [Sun, 23 Dec 2018 20:32:23 +0000 (15:32 -0500)]
Fix formatting in Database\DBStructure

5 years agoFix template escaping in photo gallery view
Hypolite Petovan [Sun, 23 Dec 2018 15:51:18 +0000 (10:51 -0500)]
Fix template escaping in photo gallery view

5 years agoFix escaping in email notification template
Hypolite Petovan [Sun, 23 Dec 2018 15:51:00 +0000 (10:51 -0500)]
Fix escaping in email notification template

5 years agoMerge pull request #6311 from annando/issue-6308
Hypolite Petovan [Sat, 22 Dec 2018 23:15:52 +0000 (18:15 -0500)]
Merge pull request #6311 from annando/issue-6308

Issue 6308 - and again ...

5 years agoMerge pull request #6310 from annando/issue-6122
Hypolite Petovan [Sat, 22 Dec 2018 23:15:02 +0000 (18:15 -0500)]
Merge pull request #6310 from annando/issue-6122

Handles issue 6122 - the self contact will be updated when invalid

5 years agoBite by bite ...
Michael [Sat, 22 Dec 2018 22:56:57 +0000 (22:56 +0000)]
Bite by bite ...

5 years agoAnd again tests ...
Michael [Sat, 22 Dec 2018 22:36:53 +0000 (22:36 +0000)]
And again tests ...

5 years agoHopefully this fixes the tests again
Michael [Sat, 22 Dec 2018 22:04:47 +0000 (22:04 +0000)]
Hopefully this fixes the tests again

5 years agoChecks if JSON is enabled
Michael [Sat, 22 Dec 2018 20:40:00 +0000 (20:40 +0000)]
Checks if JSON is enabled

5 years agoIssue 6308 - and again ...
Michael [Sat, 22 Dec 2018 20:25:23 +0000 (20:25 +0000)]
Issue 6308 - and again ...

5 years agoHandles issue 6122 - the self contact will be updated when it seems to be invalid
Michael [Sat, 22 Dec 2018 20:12:32 +0000 (20:12 +0000)]
Handles issue 6122 - the self contact will be updated when it seems to be invalid

5 years agoMerge pull request #6306 from annando/curl-fix
Hypolite Petovan [Sat, 22 Dec 2018 19:35:30 +0000 (14:35 -0500)]
Merge pull request #6306 from annando/curl-fix

The curl result is an object, not an array

5 years agoMerge pull request #6304 from JeroenED/bugfix/utzer-bug
Michael Vogel [Sat, 22 Dec 2018 17:03:56 +0000 (18:03 +0100)]
Merge pull request #6304 from JeroenED/bugfix/utzer-bug

Fixed bug reported by Utzer

5 years agoThe curl result is an object, not an array
Michael [Sat, 22 Dec 2018 17:00:28 +0000 (17:00 +0000)]
The curl result is an object, not an array

5 years agoToo fast
Jeroen De Meerleer [Sat, 22 Dec 2018 16:23:18 +0000 (17:23 +0100)]
Too fast

5 years agoFixed bug
Jeroen De Meerleer [Sat, 22 Dec 2018 16:19:34 +0000 (17:19 +0100)]
Fixed bug

$curlResult is not an array

5 years agoMerge pull request #6302 from annando/issue-6300
Hypolite Petovan [Sat, 22 Dec 2018 00:04:45 +0000 (19:04 -0500)]
Merge pull request #6302 from annando/issue-6300

Isse 6300: And again templates ...

5 years agoMerge pull request #6301 from annando/api-repeat
Hypolite Petovan [Sat, 22 Dec 2018 00:02:53 +0000 (19:02 -0500)]
Merge pull request #6301 from annando/api-repeat

API: Fix author of repeated items from Diaspora

5 years agoMerge pull request #6299 from annando/issue-6296
Hypolite Petovan [Sat, 22 Dec 2018 00:02:06 +0000 (19:02 -0500)]
Merge pull request #6299 from annando/issue-6296

Issue 6296 - and again templates

5 years agoMerge pull request #6298 from annando/issue-6297
Hypolite Petovan [Sat, 22 Dec 2018 00:01:17 +0000 (19:01 -0500)]
Merge pull request #6298 from annando/issue-6297

Issue 6297 - and again template stuff

5 years agoIsse 6300: And again templates ...
Michael [Fri, 21 Dec 2018 23:02:43 +0000 (23:02 +0000)]
Isse 6300: And again templates ...

5 years agoAPI: Fix author of repeated items from Diaspora
Michael [Fri, 21 Dec 2018 22:55:36 +0000 (22:55 +0000)]
API: Fix author of repeated items from Diaspora

5 years agoIssue 6296 - and again templates
Michael [Fri, 21 Dec 2018 22:01:28 +0000 (22:01 +0000)]
Issue 6296 - and again templates

5 years agoAnd some more templates
Michael [Fri, 21 Dec 2018 21:50:18 +0000 (21:50 +0000)]
And some more templates

5 years agoIssue 6297 - and again template stuff
Michael [Fri, 21 Dec 2018 21:44:54 +0000 (21:44 +0000)]
Issue 6297 - and again template stuff

5 years agoMerge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query
Michael Vogel [Fri, 21 Dec 2018 21:17:20 +0000 (22:17 +0100)]
Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query

Fix message list query

5 years agoMerge pull request #6295 from annando/issue-6294
Hypolite Petovan [Fri, 21 Dec 2018 21:13:52 +0000 (16:13 -0500)]
Merge pull request #6295 from annando/issue-6294

Issue 6294: Fix templates

5 years agoIssue 6294: Fix templates
Michael [Fri, 21 Dec 2018 21:09:34 +0000 (21:09 +0000)]
Issue 6294: Fix templates

5 years agoMerge pull request #6290 from annando/issue-6289
Hypolite Petovan [Fri, 21 Dec 2018 13:52:10 +0000 (08:52 -0500)]
Merge pull request #6290 from annando/issue-6289

Fixes issue 6289

5 years agoThis template change had been missing
Michael [Fri, 21 Dec 2018 13:48:48 +0000 (13:48 +0000)]
This template change had been missing

5 years agoFixes issue 6289
Michael [Fri, 21 Dec 2018 13:43:06 +0000 (13:43 +0000)]
Fixes issue 6289

5 years agoMerge pull request #6286 from annando/fix-about
Hypolite Petovan [Fri, 21 Dec 2018 06:21:56 +0000 (01:21 -0500)]
Merge pull request #6286 from annando/fix-about

Some more stuff to unescape

5 years agoUnescape tags
Michael [Fri, 21 Dec 2018 06:15:22 +0000 (06:15 +0000)]
Unescape tags