friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
22,054 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

5288 Commits

Author SHA1 Message Date
Tobias Diekershoff e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Michael Vogel dc05ada059
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text 
Unescape admin warning text
 2018-12-30 16:41:05 +01:00
Hypolite Petovan 5db5cc904a Unescape plaintext email body 2018-12-30 10:20:38 -05:00
Hypolite Petovan e0a763b07f Unescape admin warning text 2018-12-30 10:12:13 -05:00
Tobias Diekershoff 034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
Hypolite Petovan 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
Hypolite Petovan 62f5438bb3 Remove useless trailing slash in admin/addon_details.tpl 2018-12-29 15:40:05 -05:00
Hypolite Petovan fdcdbe287e [frio] Fix minimal layout 2018-12-29 15:40:04 -05:00
Hypolite Petovan 435cfd7de5 Fix screenshots URLs in frio readme 2018-12-29 15:39:50 -05:00
Tobias Diekershoff 7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael Vogel 94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan 620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan 52ca6f34cd Unescape babel result panel content 2018-12-25 11:37:57 -05:00
Hypolite Petovan a3928ec3b6 Restore escaping for textarea field template 2018-12-25 11:37:56 -05:00
Hypolite Petovan b56aec9a29 Add page wrapper to wallmessage.tpl 2018-12-25 11:37:56 -05:00
Hypolite Petovan e2a0cee8c2 [frio] Fix remaining user profile link icon 2018-12-25 11:37:56 -05:00
Tobias Diekershoff 6488738790
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output 
Escape event output
 2018-12-25 08:33:43 +01:00
Hypolite Petovan c5a3cdcf82 Unescape aes_allow in dfrn_req_confirm.tpl 2018-12-24 23:14:30 -05:00
Hypolite Petovan 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
Hypolite Petovan 787428f68c Remove template escaping for event title 2018-12-24 23:00:35 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Hypolite Petovan b1e85ba605 Fix template escaping in photo gallery view 2018-12-23 10:51:18 -05:00
Hypolite Petovan 3fc5c1ad84 Fix escaping in email notification template 2018-12-23 10:51:00 -05:00
Michael f19f67add5 Issue 6308 - and again ... 2018-12-22 20:25:23 +00:00
Hypolite Petovan 92214b8867
Merge pull request #6302 from annando/issue-6300 
Isse 6300: And again templates ...
 2018-12-21 19:04:45 -05:00
Hypolite Petovan 97d278109d
Merge pull request #6299 from annando/issue-6296 
Issue 6296 - and again templates
 2018-12-21 19:02:06 -05:00
Hypolite Petovan 6d4412ffea
Merge pull request #6298 from annando/issue-6297 
Issue 6297 - and again template stuff
 2018-12-21 19:01:17 -05:00
Michael 3f4cead189 Isse 6300: And again templates ... 2018-12-21 23:02:43 +00:00
Michael 68f3ae5020 Issue 6296 - and again templates 2018-12-21 22:01:28 +00:00
Michael 4a633527d2 And some more templates 2018-12-21 21:50:18 +00:00
Michael 768ad3cfd9 Issue 6297 - and again template stuff 2018-12-21 21:44:54 +00:00
Michael Vogel 1cab44827f
Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query 
Fix message list query
 2018-12-21 22:17:20 +01:00
Michael 7c845dafc5 Issue 6294: Fix templates 2018-12-21 21:09:34 +00:00
Michael 80ea1ea51f This template change had been missing 2018-12-21 13:48:48 +00:00
Michael fd7c47ed55 Fixes issue 6289 2018-12-21 13:43:06 +00:00
Michael bd356a4149 Unescape tags 2018-12-21 06:15:22 +00:00
Michael f31ca8a818 Some more stuff to unescape 2018-12-21 05:26:29 +00:00
Hypolite Petovan 2776b1443b Fix post location escaping 2018-12-21 00:06:37 -05:00
Hypolite Petovan 6b481aaac6 Fix advanced profile fields escaping 2018-12-21 00:06:22 -05:00
Hypolite Petovan c8b6778cde Fix home escaping 2018-12-21 00:05:55 -05:00
Hypolite Petovan 989bfb53b1 Fix install escaping 2018-12-21 00:05:31 -05:00
Hypolite Petovan 1c58363696 Remove unused/empty template variables in register 2018-12-20 23:59:15 -05:00
Michael c7a636fe18 Fixing templates - unescaping it again 2018-12-20 21:57:53 +00:00
Hypolite Petovan c7abb1d82b Remove unused template variable $tabcontent in mail_head.tpl 2018-12-19 06:39:36 -05:00
Hypolite Petovan a01bdbbe2d Fix wrong merge + nofilter in contact_edit 2018-12-18 08:39:26 -05:00
Hypolite Petovan 21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true 2018-12-18 08:36:36 -05:00
Hypolite Petovan 091193ad64
Merge pull request #6278 from annando/fix-contact-edit 
Fix: Contacts can now be edited again
 2018-12-18 08:02:49 -05:00
Michael 99e69e30a3 Fix: Contacts can now be edited again 2018-12-18 06:52:09 +00:00