Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-01 04:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
33204 commits 3 branches 64 tags 241 MiB
Commit graph

33204 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Hypolite Petovan
ef2b08c0c4
Merge pull request #6295 from annando/issue-6294 
Issue 6294: Fix templates
 2018-12-21 16:13:52 -05:00
Michael
7c845dafc5 Issue 6294: Fix templates 2018-12-21 21:09:34 +00:00
Hypolite Petovan
00e9a6fd85
Merge pull request #6290 from annando/issue-6289 
Fixes issue 6289
 2018-12-21 08:52:10 -05: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
Hypolite Petovan
5019bcb5b8
Merge pull request #6286 from annando/fix-about 
Some more stuff to unescape
 2018-12-21 01:21:56 -05: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
Michael Vogel
be6031aa1b
Merge pull request #6285 from MrPetovan/task/6208-escape-html-true 
Smarty escaping fixes, AlfredSK edition
 2018-12-21 06:23:21 +01: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
Hypolite Petovan
fdb41cbb71
Merge pull request #6284 from annando/fix-about 
Fixing templates - unescaping it again
 2018-12-20 17:45:39 -05:00
Michael
c7a636fe18 Fixing templates - unescaping it again 2018-12-20 21:57:53 +00:00
Michael Vogel
0fe8b849bb
Merge pull request #6262 from MrPetovan/task/6208-escape-html-true 
Smarty: Add default HTML escaping to template variables
 2018-12-20 20:27:25 +01:00
Hypolite Petovan
66bf39216b Remove unreliable ANY_VALUE from message list query 2018-12-19 06:41:08 -05: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
Hypolite Petovan
9aee4cb174
Merge pull request #6251 from JonnyTischbein/issue_bg_for_pages 
[frio] Background wrapper + bootstrap buttons for newmember, un/follow
 2018-12-17 23:26:43 -05:00
Jonny Tischbein
5d81738034 Add page-wrapper for probe + webfinder 2018-12-17 23:15:14 +01:00
Jonny Tischbein
dc7e6edca9 Add page-wrapper to oauth/edit in frio 2018-12-17 23:09:08 +01:00
Jonny Tischbein
443210b4f0 move templates to frio theme 2018-12-17 23:09:08 +01:00
Jonny Tischbein
58067cdfbf Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn) 2018-12-17 23:09:08 +01:00
Hypolite Petovan
f413abb82b
Merge pull request #6277 from annando/nextcloud-ap 
Fix ActivityPub with Nextcloud
 2018-12-17 15:28:22 -05:00
Michael
c485ca6f06 Fix ActivityPub with Nextcloud 2018-12-17 20:13:56 +00:00
Hypolite Petovan
faff105f86
Fix feed display in browser when using emojis 2018-12-16 22:58:43 -05:00
Hypolite Petovan
fe3470d7c1 Remove erroring template comment 2018-12-16 22:38:33 -05:00
Hypolite Petovan
e1b3bcc77d Unescape yet more values with a focus on the vier theme 2018-12-16 22:38:32 -05:00
Hypolite Petovan
d0fa7f74c5 Unescape value of generic input field 2018-12-16 22:38:32 -05:00
Hypolite Petovan
698d12af79 Unescape variables in events and descriptions 2018-12-16 22:38:32 -05:00
Hypolite Petovan
c407fb7963 Avoid escaping relevant template variables 2018-12-16 22:38:32 -05:00
Hypolite Petovan
6d90d35d25 Enable Smarty default HTML escaping 2018-12-16 22:38:30 -05:00
Hypolite Petovan
38109665c7 Various improvements/fixes 
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
 2018-12-16 22:38:30 -05:00
Hypolite Petovan
2241ba4540 Remove uses of HTML escaping in Smarty templates 2018-12-16 22:38:30 -05:00
Michael Vogel
b6623216f0
Merge pull request #6270 from MrPetovan/bug/5932-fix-notices 
Fix various notices
 2018-12-16 08:41:28 +01:00
Hypolite Petovan
b6e1571b1e Fix various notices 2018-12-15 04:32:47 -05:00
Hypolite Petovan
607f7daf51 Add PHP 5 compatible recursive dirname() 2018-12-15 02:46:08 -05:00
Michael
b08e5ab41b Issue 6259: Suppress contact group widget only on network page 2018-12-14 06:33:57 +00:00
Hypolite Petovan
5a802bc474
Merge pull request #6261 from annando/fix-magic 
Fix for magic auth
 2018-12-13 17:03:44 -05:00
Michael
9ea0864394 Some added to-do 2018-12-13 21:41:19 +00:00
Michael
705211100b Fix for magic auth 2018-12-13 21:19:57 +00:00
Michael Vogel
e2f1fd1efb
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote 
Add check for relationship with remote user for connect display
 2018-12-13 22:18:24 +01:00
Hypolite Petovan
f6917dd8f4
Merge pull request #6260 from annando/issue-6257 
Issue 6257: Make notes visible again
 2018-12-13 15:41:56 -05:00