Commit graph

22391 commits

Author SHA1 Message Date
36f995ed20 Add notification clear on private message display 2018-12-30 01:11:02 -05:00
3095d4aa70 Add parent to private message notifications
- Fix item id for Diaspora private message notification
2018-12-30 01:10:10 -05:00
5abc22f6c5 Replace q() with DBA methods, fix code style
- Remove unused variables
- Fix doc block
- Fix indentation
2018-12-30 01:08:51 -05:00
d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
12dfb8e5cf Make NOTIFY_* constant values human-readable 2018-12-30 01:04:20 -05:00
838c0f96de 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
2018-12-29 15:40:05 -05:00
62f5438bb3 Remove useless trailing slash in admin/addon_details.tpl 2018-12-29 15:40:05 -05:00
fdcdbe287e [frio] Fix minimal layout 2018-12-29 15:40:04 -05:00
979230da27 Allow theme setting in module
- Restore theme name caching
2018-12-29 15:40:04 -05:00
435cfd7de5 Fix screenshots URLs in frio readme 2018-12-29 15:39:50 -05:00
166b8ad440
Merge pull request from annando/notices
Warning and notice fixed
2018-12-29 12:16:37 -05:00
7efde8e334
Merge pull request from MrPetovan/task/move-config-to-php-array
Remove util/ folder
2018-12-29 11:43:55 +01:00
Michael Vogel
bf1f164ece
Merge pull request from MrPetovan/bug/parseurl-charset
Replace latin-1 by latin1 in charset detection
2018-12-29 11:00:06 +01:00
fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
37c7a18d00 Replace latin-1 by latin1 in charset detection
- Simplify conditional for charset conversion
2018-12-29 00:43:00 -05:00
16f58c8982
Merge pull request from annando/avoid-wsod
Avoid a WSOD after PR 6315
2018-12-27 13:14:22 -05:00
5ddf3898db Avoid a WSOD after PR 6315 2018-12-27 17:17:02 +00:00
Michael Vogel
94eca77041
Merge pull request from MrPetovan/bug/6309-add-fulltext-index-profile
Rework mod/match and mod/msearch
2018-12-27 18:04:06 +01:00
c07fa5d069
Merge pull request from annando/assign-uid
Only assign a uid to the profile if not defined by now
2018-12-27 09:28:22 -05:00
826965f6df Only assign a uid to the profile if not defined by now 2018-12-27 09:58:21 +00:00
274274ad63
Fix mods/README.md format 2018-12-27 01:52:40 -05:00
7b8441101f
Delete friendica-to-smarty-tpl.py 2018-12-27 01:51:59 -05:00
f9db5e32e7
Delete updatetpl.py 2018-12-27 01:51:50 -05:00
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Michael Vogel
86f4cc90a2
Merge pull request from MrPetovan/bug/6328-unescape-vcard-network-link
Unescape vcard network link
2018-12-26 23:35:40 +01:00
620395378e Normalize uses of Strings::formatNetworkName to $network_link
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
c5867df24c Remove useless intermediate network_name variable in include/api 2018-12-26 11:02:28 -05:00
5620184c54
Merge pull request from annando/issue-6329
Issue-6329: Prevent double encoding
2018-12-26 09:55:52 -05:00
f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
7357de411d
Merge pull request from annando/dont-show-follow
Don't show "follow" activity
2018-12-25 16:16:25 -05:00
a939581cf8
Merge pull request from annando/always-magic
Always use magic on the same server
2018-12-25 16:16:03 -05:00
bb0d7a5c51 Don't show "follow" activity 2018-12-25 19:50:40 +00:00
a565406b47 Always usa magic on the same server 2018-12-25 19:43:57 +00:00
Michael Vogel
7d6717d97e
Merge pull request from MrPetovan/bug/6316-remove-html-encode
Remove redundant html encoding
2018-12-25 20:02:33 +01:00
761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
52ca6f34cd Unescape babel result panel content 2018-12-25 11:37:57 -05:00
4cd2c83d5c Replace q() calls in mod/viewcontacts 2018-12-25 11:37:57 -05:00
00f90571ad Remove random profile behavior from /profile 2018-12-25 11:37:57 -05:00
a3928ec3b6 Restore escaping for textarea field template 2018-12-25 11:37:56 -05:00
b56aec9a29 Add page wrapper to wallmessage.tpl 2018-12-25 11:37:56 -05:00
e2a0cee8c2 [frio] Fix remaining user profile link icon 2018-12-25 11:37:56 -05:00
56d612b2f0
Merge pull request from annando/issue-6316
Issue 6316: Do not double encode / Avoid notice
2018-12-25 11:26:54 -05:00
9feab828c8 Fixing double encoding here as well 2018-12-25 12:30:27 +00:00
ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
6488738790
Merge pull request from MrPetovan/bug/6316-escape-event-output
Escape event output
2018-12-25 08:33:43 +01:00
ef4ce69e4d
Merge pull request from MrPetovan/bug/6316-unescape-aes-allow
Unescape aes allow
2018-12-25 08:29:12 +01:00
c5a3cdcf82 Unescape aes_allow in dfrn_req_confirm.tpl 2018-12-24 23:14:30 -05:00
4285f2f8bb Remove unused template variable in dfrn_req_confirm
- Replace killme() by exit() in mod/dfrn_request
2018-12-24 23:14:09 -05:00
787428f68c Remove template escaping for event title 2018-12-24 23:00:35 -05:00