clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,181 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

24181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 166b8ad440
Merge pull request #6342 from annando/notices 
Warning and notice fixed
 2018-12-29 12:16:37 -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 bf1f164ece
Merge pull request #6341 from MrPetovan/bug/parseurl-charset 
Replace latin-1 by latin1 in charset detection
 2018-12-29 11:00:06 +01:00
Michael fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Hypolite Petovan 37c7a18d00 Replace latin-1 by latin1 in charset detection 
- Simplify conditional for charset conversion
 2018-12-29 00:43:00 -05:00
Hypolite Petovan 16f58c8982
Merge pull request #6333 from annando/avoid-wsod 
Avoid a WSOD after PR 6315
 2018-12-27 13:14:22 -05:00
Michael 5ddf3898db Avoid a WSOD after PR 6315 2018-12-27 17:17:02 +00: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 c07fa5d069
Merge pull request #6332 from annando/assign-uid 
Only assign a uid to the profile if not defined by now
 2018-12-27 09:28:22 -05:00
Michael 826965f6df Only assign a uid to the profile if not defined by now 2018-12-27 09:58:21 +00:00
Hypolite Petovan 274274ad63
Fix mods/README.md format 2018-12-27 01:52:40 -05:00
Hypolite Petovan 7b8441101f
Delete friendica-to-smarty-tpl.py 2018-12-27 01:51:59 -05:00
Hypolite Petovan f9db5e32e7
Delete updatetpl.py 2018-12-27 01:51:50 -05:00
Hypolite Petovan 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 #6331 from MrPetovan/bug/6328-unescape-vcard-network-link 
Unescape vcard network link
 2018-12-26 23:35:40 +01: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 5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
Hypolite Petovan c5867df24c Remove useless intermediate network_name variable in include/api 2018-12-26 11:02:28 -05:00
Hypolite Petovan 5620184c54
Merge pull request #6330 from annando/issue-6329 
Issue-6329: Prevent double encoding
 2018-12-26 09:55:52 -05:00
Michael f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
Hypolite Petovan 7357de411d
Merge pull request #6326 from annando/dont-show-follow 
Don't show "follow" activity
 2018-12-25 16:16:25 -05:00
Hypolite Petovan a939581cf8
Merge pull request #6325 from annando/always-magic 
Always use magic on the same server
 2018-12-25 16:16:03 -05:00
Michael bb0d7a5c51 Don't show "follow" activity 2018-12-25 19:50:40 +00:00
Michael 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
Hypolite Petovan 761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
Hypolite Petovan 52ca6f34cd Unescape babel result panel content 2018-12-25 11:37:57 -05:00
Hypolite Petovan 4cd2c83d5c Replace q() calls in mod/viewcontacts 2018-12-25 11:37:57 -05:00
Hypolite Petovan 00f90571ad Remove random profile behavior from /profile 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
Hypolite Petovan 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
Michael 9feab828c8 Fixing double encoding here as well 2018-12-25 12:30:27 +00:00
Michael ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00: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
Tobias Diekershoff ef4ce69e4d
Merge pull request #6322 from MrPetovan/bug/6316-unescape-aes-allow 
Unescape aes allow
 2018-12-25 08:29:12 +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 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
Hypolite Petovan 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
Hypolite Petovan 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
Hypolite Petovan 3ddd622f8d [Composer] Update lock file 2018-12-24 09:57:06 -05:00
Hypolite Petovan ed7bada71e Move Composer autoload require out of boot.php 2018-12-24 09:56:48 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael 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
Hypolite Petovan 35a6e33e0d [Composer] Add global libraries to autoload 2018-12-24 00:57:22 -05:00
Hypolite Petovan 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