Mikael Nordfeldth
7e6783bb8f
Replace htmLawed with HTMLPurifier
2016-01-28 19:01:13 +01:00
Mikael Nordfeldth
daea5647b6
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-28 17:27:08 +01:00
mmn
9b3cbb373e
Merge branch 'oembed_fb_wp_branch' into 'nightly'
...
Oembed: Fix UTF-8 bug and better wp&fb data (updated!)
See merge request !97
2016-01-28 16:26:33 +00:00
Mikael Nordfeldth
efe23ed404
updateWithKeys now understands multi-column keys
...
and automatically identifies _which_ columns are the right ones,
so for example 'uri' primary keys don't need to be explicitly set
2016-01-28 16:42:59 +01:00
hannes
05439831e7
add comment that DOMDocument('1.0', 'UTF-8') does not work
2016-01-28 15:32:11 +00:00
hannes
06e325d61b
fixes two issues when the oembed thumbnail is blank
2016-01-28 15:19:29 +00:00
Mikael Nordfeldth
d94f9031ff
Changelog deleted in php-gettext
2016-01-28 14:43:01 +01:00
Mikael Nordfeldth
10f16e4f32
php-gettext extlib updated as req !88
...
Thanks postblue
2016-01-28 14:41:25 +01:00
Mikael Nordfeldth
c459bded53
Markdown library updated to 1.6.0, merge req !90
...
Thanks postblue
2016-01-28 14:37:14 +01:00
Mikael Nordfeldth
fb15dc5080
htmLawed updated (manually merging !89 )
...
Thanks postblue
2016-01-28 14:24:03 +01:00
mmn
bf38fb7bef
Merge branch 'upstream-changes/google-analytics-removal' into 'master'
...
Removed plugin Google-Analytics
... as this is free/libre and decentralized software and should not promote centralized proprietary software. Please see the included Piwik plugin for a more decentralized alternative!
See merge request !94
2016-01-28 12:55:10 +00:00
Mikael Nordfeldth
7c80c9a1f9
Meh, let's just remove FirePHP, I don't think anyone uses it
2016-01-28 13:48:44 +01:00
mmn
dfc11f99ad
Merge branch 'update-extlib-firephp' into 'nightly'
...
Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
See merge request !92
2016-01-28 12:41:34 +00:00
Mikael Nordfeldth
bb0cb9b3f6
Manual merge of !87 Update LDAP2 extlib to 2.2.0 (stable) released on 2015-10-30
...
Thanks postblue
2016-01-28 13:35:23 +01:00
Mikael Nordfeldth
d73c264e25
Haha, forgot that the $content content must also be there!
2016-01-27 23:04:19 +01:00
Mikael Nordfeldth
34093388a7
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-27 22:43:37 +01:00
Mikael Nordfeldth
a47563cf3d
Don't add space if there's no string in new notice content
2016-01-27 22:41:53 +01:00
Mikael Nordfeldth
03d2b680f8
Allow empty new-notice content via web if there's an upload
2016-01-27 22:39:43 +01:00
mmn
52778e1882
Merge branch 'json_encode_fail_branch' into 'nightly'
...
output error if json_encode fails
See merge request !86
2016-01-26 21:16:24 +00:00
mmn
42545c6625
Merge branch 'mention_branch' into 'nightly'
...
correct mentions if parent mentions multiple users with same nickname (don't use first one for all)
See merge request !82
2016-01-26 21:15:25 +00:00
Mikael Nordfeldth
e69715005d
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-26 22:10:23 +01:00
mmn
c01982c917
Merge branch 'oembed_thumbnail_branch' into 'nightly'
...
add a thumbnail to oembed response
just something i added to quitim
See merge request !85
2016-01-26 21:09:07 +00:00
hannes
aa76e5863f
don't mess upp charsets in oembed/og! check for utf-8 in http header and meta tags, and add prolog when loading html with DOMDocument()
2016-01-26 13:37:52 +00:00
hannes
b8d1e1f4a6
silence errors on these xpath queries
2016-01-26 11:28:24 +00:00
hannes
884aeb4d2e
common_purify() doesn't remove wordpress' and facebook's javascript properly, maybe better to keep the data intact, and do strip_tags or something similar when using the data
2016-01-26 01:10:15 +00:00
hannes
473f893d04
detab
2016-01-26 01:07:44 +00:00
hannes
76c8139054
not pretty, but gives us better oembed data for wordpress and facebook
2016-01-26 01:05:53 +00:00
Mikael Nordfeldth
a48055a3cc
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-25 20:22:16 +01:00
mmn
c0b0f8e2f9
Merge branch 'file_redirection_cleanup_branch' into 'nightly'
...
Proper URL redirection fix
This greatly reduces the number of times GNU social looks up the same URL with File_redirection::where().
Someone must have mixed up the exlib's internal setting "follow_redirects" with our own.
This also makes away with the weird backwards recursive handling of protected URLs in File_redirection::lookupWhere(), by saving the chain of redirects the first time HTTPClient:send() looks them up.
See merge request !95
2016-01-25 19:21:52 +00:00
hannes
e447964639
remove my ugly debug info
2016-01-25 19:10:35 +00:00
hannes
b1b6a0a69c
config['follow_redirects'] is the extlib's config! if max_redirs is set we want to do our own redirection following in this function
2016-01-25 19:03:26 +00:00
hannes
a888294135
add our own protected urls
2016-01-25 19:00:46 +00:00
hannes
ca0c792ed3
File and File_redirection records are saved in File_redirection::where() now
2016-01-25 19:00:05 +00:00
hannes
48e1a2431b
save File and File_redirection records in File_redirection::where(), because then we will have to run where() over and over again
2016-01-25 18:55:48 +00:00
Mikael Nordfeldth
b15434375c
Show plain text files on attachment page.
2016-01-25 16:54:40 +01:00
Roland Haeder
9614aba0e1
Removed plugin Google-Analytics as this is free/libre and decentralized
...
software and should not promote centralized proprietary software. Please see
the included Piwik plugin for a more decentralized alternative!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-01-25 13:19:43 +01:00
postblue
fef52d7b51
Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
2016-01-24 21:11:38 +01:00
Mikael Nordfeldth
a9d18a077e
Harmonize, clarify, categorize URL schemes
...
Regular expression + avoid-redirection list now match each other.
2016-01-24 12:47:31 +01:00
Mikael Nordfeldth
1cec627d72
Allow bitcoin scheme to URLs
2016-01-24 12:44:28 +01:00
hannes
4e50717e12
output error if json_encode fails
2016-01-23 15:01:27 +00:00
Mikael Nordfeldth
ef005987a1
Did the OpportunisticQM fixes in the wrong order
2016-01-22 12:26:53 +01:00
Mikael Nordfeldth
1121b38eb1
use connect_timeout value for execution margin
2016-01-22 12:21:06 +01:00
Mikael Nordfeldth
89dd44bf3e
default connect_timeout to 5 instead of extlib 10
2016-01-22 12:20:03 +01:00
Mikael Nordfeldth
81f9a59f25
use connect_timeout value for execution margin
2016-01-22 12:19:17 +01:00
hannes
d0e2f8745d
add a thumbnail to oembed response
2016-01-21 18:48:30 +00:00
Mikael Nordfeldth
3f9c1c142a
Removing unnecessary debug messages etc.
2016-01-21 02:49:34 +01:00
Mikael Nordfeldth
45446f17ad
Only set selectVerbs if it's not set in class var
2016-01-21 02:37:38 +01:00
Mikael Nordfeldth
be1759f112
i18n
2016-01-21 02:37:07 +01:00
Mikael Nordfeldth
d3a4a2225f
We want the profile stream to be as raw as possible!
2016-01-21 02:33:43 +01:00
Mikael Nordfeldth
81bf0fd261
Various last fixes to RSVP I think
2016-01-21 02:20:57 +01:00
