6488738790
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output
...
Escape event output
2018-12-25 08:33:43 +01:00
ef4ce69e4d
Merge pull request #6322 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
a8b0aa8c8d
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
2018-12-24 23:00:35 -05:00
c9c9fc3a96
Code cleanup in events
...
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
2018-12-24 23:00:35 -05:00
a8cbeab8a0
Merge pull request #6318 from annando/no-diaspora-follow
...
The "Follow" activity shouldn't be send to Diaspora
2018-12-24 10:43:32 -05:00
c43bd890a5
The "Follow" activity shouldn't be send to Diaspora
2018-12-24 14:50:21 +00:00
Michael Vogel
3b5bcd35f9
Merge pull request #6314 from MrPetovan/task/6208-escape-html-true
...
Fix template escaping in photo gallery view
2018-12-24 08:40:30 +01:00
a16e8d97f6
Merge pull request #6312 from annando/check-json
...
Checks if JSON is enabled
2018-12-23 18:53:32 -05:00
b1e85ba605
Fix template escaping in photo gallery view
2018-12-23 10:51:18 -05:00
3fc5c1ad84
Fix escaping in email notification template
2018-12-23 10:51:00 -05:00
d7d685ad6b
Merge pull request #6311 from annando/issue-6308
...
Issue 6308 - and again ...
2018-12-22 18:15:52 -05:00
2af0542eaa
Merge pull request #6310 from annando/issue-6122
...
Handles issue 6122 - the self contact will be updated when invalid
2018-12-22 18:15:02 -05:00
75e63212d1
Bite by bite ...
2018-12-22 22:56:57 +00:00
6a501d99af
And again tests ...
2018-12-22 22:36:53 +00:00
732308ce6d
Hopefully this fixes the tests again
2018-12-22 22:04:47 +00:00
439afc89b6
Checks if JSON is enabled
2018-12-22 20:40:00 +00:00
f19f67add5
Issue 6308 - and again ...
2018-12-22 20:25:23 +00:00
faa30adf68
Handles issue 6122 - the self contact will be updated when it seems to be invalid
2018-12-22 20:12:32 +00:00
1c2e5ae708
Merge pull request #6306 from annando/curl-fix
...
The curl result is an object, not an array
2018-12-22 14:35:30 -05:00
Michael Vogel
6f8c9a08a1
Merge pull request #6304 from JeroenED/bugfix/utzer-bug
...
Fixed bug reported by Utzer
2018-12-22 18:03:56 +01:00
c06f7ad11e
The curl result is an object, not an array
2018-12-22 17:00:28 +00:00
Jeroen De Meerleer
2d9f4b560f
Too fast
2018-12-22 17:23:18 +01:00
Jeroen De Meerleer
27eddfee27
Fixed bug
...
$curlResult is not an array
2018-12-22 17:19:34 +01:00
92214b8867
Merge pull request #6302 from annando/issue-6300
...
Isse 6300: And again templates ...
2018-12-21 19:04:45 -05:00
5fb7c3aebc
Merge pull request #6301 from annando/api-repeat
...
API: Fix author of repeated items from Diaspora
2018-12-21 19:02:53 -05:00
97d278109d
Merge pull request #6299 from annando/issue-6296
...
Issue 6296 - and again templates
2018-12-21 19:02:06 -05:00
6d4412ffea
Merge pull request #6298 from annando/issue-6297
...
Issue 6297 - and again template stuff
2018-12-21 19:01:17 -05:00
3f4cead189
Isse 6300: And again templates ...
2018-12-21 23:02:43 +00:00
1f432d006b
API: Fix author of repeated items from Diaspora
2018-12-21 22:55:36 +00:00
68f3ae5020
Issue 6296 - and again templates
2018-12-21 22:01:28 +00:00
4a633527d2
And some more templates
2018-12-21 21:50:18 +00:00
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
ef2b08c0c4
Merge pull request #6295 from annando/issue-6294
...
Issue 6294: Fix templates
2018-12-21 16:13:52 -05:00
7c845dafc5
Issue 6294: Fix templates
2018-12-21 21:09:34 +00:00
00e9a6fd85
Merge pull request #6290 from annando/issue-6289
...
Fixes issue 6289
2018-12-21 08:52:10 -05:00
80ea1ea51f
This template change had been missing
2018-12-21 13:48:48 +00:00
fd7c47ed55
Fixes issue 6289
2018-12-21 13:43:06 +00:00
5019bcb5b8
Merge pull request #6286 from annando/fix-about
...
Some more stuff to unescape
2018-12-21 01:21:56 -05:00
bd356a4149
Unescape tags
2018-12-21 06:15:22 +00:00
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
2776b1443b
Fix post location escaping
2018-12-21 00:06:37 -05:00
6b481aaac6
Fix advanced profile fields escaping
2018-12-21 00:06:22 -05:00
c8b6778cde
Fix home escaping
2018-12-21 00:05:55 -05:00
989bfb53b1
Fix install escaping
2018-12-21 00:05:31 -05:00
1c58363696
Remove unused/empty template variables in register
2018-12-20 23:59:15 -05:00
