924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all
2018-12-02 10:24:50 -05:00
2fd65503da
Avoid database error that the field "guid" is not present in the contact table
2018-12-02 15:01:08 +00:00
3d14977b73
Avoid problems with too long URI (should only happen some RSS feeds)
2018-12-02 14:49:28 +00:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x
...
Remove x()
2018-12-01 23:40:51 +01:00
e88781164a
Merge pull request #6221 from wouter705/20181201-nginx-sample-doc
...
Updated .well-known location within Nginx Sample Config:
2018-12-01 13:29:50 -05:00
Wouter Broers
2b38b7b7de
Updated .well-known location within Nginx Sample Config:
...
Replaced try_files with a rewrite rule to prevent Nginx
from spitting out 404 errors on addresses like:
- <server.tld>/.well-known/host-meta
- <server.tld>/.well-known/x-social-ray
- <server.tld>/.well-known/nodeinfo
- <server.tld>/.well-known/webfinger?resource=<resource>
2018-12-01 19:04:34 +01:00
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129
...
Fixing permanent deletion counter
2018-12-01 08:19:38 -05:00
4e20c0e50a
Typo
2018-12-01 13:25:58 +07:00
14b4fac818
Fixing permanent deletion counter
2018-12-01 13:21:54 +07:00
9c534546e4
Fix condition in api_fr_photo_create_update
2018-11-30 10:48:47 -05:00
065509cc9a
Remove x() function
2018-11-30 09:07:02 -05:00
458981f75c
Replace x() by isset(), !empty() or defaults()
...
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
2018-11-30 09:06:22 -05:00
00011dfeae
Merge pull request #6217 from annando/url-detection
...
Improved url detection for redirects
2018-11-30 07:25:38 -05:00
4a1f9a9bdd
Improved url detection for redirects
2018-11-30 11:27:17 +00:00
663ba65f17
Remove "all" value for nets parameter
2018-11-30 05:43:07 -05:00
1bd38d1f10
Merge pull request #6214 from annando/issue-6212
...
Issue 6212: No need of a redirect for fetching content
2018-11-29 18:54:34 -05:00
9d8eca2287
Using the same function for display and objects
2018-11-29 22:42:10 +00:00
39ce33f7ed
Issue 6212: No need of a redirect for fetching content
2018-11-29 15:06:00 +00:00
df7bf38f8a
Restore hard wrapping in INSTALL documentation
2018-11-29 09:19:56 -05:00
90f0fdc93b
Add details to translation documentation
2018-11-29 09:19:33 -05:00
653b8ac16e
Update INSTALL file
2018-11-28 23:10:49 -05:00
1c5a19e245
Update path to friendica-to-smarty-tpl.py
2018-11-28 23:10:33 -05:00
11a0dd4d4c
Remove util directory
2018-11-28 23:10:21 -05:00
e02295e8e8
Move testargs to bin
2018-11-28 23:10:05 -05:00
c3c7c50dc5
Move Doxyfile to base directory
2018-11-28 23:09:35 -05:00
c0b3b73c88
Move files from util to mods
...
- Move local.config.vagrant.php
- Move fpostit
- Move bookmarklet-share2friendica
- Updated Readme file
2018-11-28 23:08:43 -05:00
b42760b0e6
Move credits out of util/
2018-11-28 22:59:06 -05:00
9102a37b37
Move master translation file away from util
...
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
2018-11-28 22:57:55 -05:00
e64a14b84b
Merge pull request #6210 from JonnyTischbein/issue_multiple_hashtag
...
Fix insert multiple hashtags to term
2018-11-27 18:19:51 -05:00
Jonny Tischbein
f0d290eb18
Fix Term exists check on link which isn't stored for hashtags anymore to check on term.
2018-11-27 22:54:16 +01:00
a69d010410
Regenerate master messages.po file
2018-11-27 02:47:15 -05:00
e15074a980
Improve Settings and Translations docs
2018-11-27 02:46:53 -05:00
60aedb1df9
Add constant case to config migration tables
...
- Remove triple points in config example
2018-11-27 02:46:37 -05:00
1141e15ccf
Fix indentation style in settings docs
2018-11-27 02:46:01 -05:00
16f845d7fc
Fix Vagrant config values
2018-11-27 02:44:32 -05:00
0eb72ae1d6
Fix addon-sample config file values
2018-11-27 02:44:19 -05:00
Michael Vogel
ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array
...
Move config to PHP array
2018-11-26 23:57:56 +01:00
5a929c587f
Merge pull request #6204 from annando/escaping
...
We are now escaping many template fields
2018-11-26 16:31:13 -05:00
3ed9f8268e
Merge pull request #6207 from tobiasd/20181126-fixmissingclose
...
Add missing closing tags
2018-11-26 07:45:04 -05:00
0c21bd488f
Use constants instead of strings for register_policy
2018-11-26 07:40:44 -05:00
ce099b6cd3
Add missing closing tags
...
The summery template for the admin panel was missing a closing link tag
for the deferred worker queue. This tag has been added for the general
template and the template used by the frio theme.
2018-11-26 11:58:58 +01:00
c77926be03
Merge pull request #6206 from annando/parent
...
Missing '
2018-11-26 11:43:16 +01:00
563a24e30b
Missing '
2018-11-26 08:52:40 +00:00
069c92049a
Just some misspelling
2018-11-25 23:49:40 +00:00
73528fa279
Some correction
2018-11-25 20:40:30 +00:00
6075245b84
Much more escapes
2018-11-25 20:34:02 +00:00
7381540039
Escaping the address field
2018-11-25 20:04:01 +00:00
4ce320fc79
Contact search is now escaped
2018-11-25 19:48:26 +00:00
56f21a4b89
Some more escaping
2018-11-25 19:26:46 +00:00
bbc033cc9f
Merge pull request #6203 from annando/hidden-user
...
Show contact posts from hidden users
2018-11-25 14:16:51 -05:00
