1
0
Fork 0
Commit graph

22460 commits

Author SHA1 Message Date
a939581cf8
Merge pull request #6325 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 #6324 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 #6323 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 #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
3ddd622f8d [Composer] Update lock file 2018-12-24 09:57:06 -05:00
ed7bada71e Move Composer autoload require out of boot.php 2018-12-24 09:56:48 -05:00
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -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
35a6e33e0d [Composer] Add global libraries to autoload 2018-12-24 00:57:22 -05:00
b962fc989a Rework mod/msearch
- Remove deprecated q()/killme() calls
- Ensure an output on empty search string
- Fix page number nonsense (-1, +1,...)
2018-12-24 00:57:21 -05:00
1938ec3ebe 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
2018-12-24 00:56:14 -05:00
c15fd9beb8 Add expected FULLTEXT index to profile table 2018-12-23 18:54:06 -05:00
a16e8d97f6
Merge pull request #6312 from annando/check-json
Checks if JSON is enabled
2018-12-23 18:53:32 -05:00
d53ff9c34d Add support for FULLTEXT indices in Database\DBStructure 2018-12-23 15:40:49 -05:00
21783f61b4 [Composer] Add ext-curl dependency 2018-12-23 15:32:38 -05:00
48a356dba2 Fix formatting in Database\DBStructure 2018-12-23 15:32:23 -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