ec98fd0c43
Merge remote-tracking branch 'gnuio/master' into nightly
2017-12-17 18:32:23 +01:00
67a9c0415c
Merge branch 'cache-html-sanitizer' into 'master'
...
set the html sanitizer cache directory to ['cache']['dir'] from the config file;
See merge request gnu/gnu-social!156
2017-12-17 17:25:46 +00:00
a1ea335140
Merge branch 'cli-install' into 'master'
...
Don't write the config file when --skip-config flag is given to the installer.
See merge request gnu/gnu-social!155
2017-12-17 17:25:21 +00:00
69bb81556f
Merge branch 'master' into 'master'
...
Allow GNU social master code to receive Mastodon boosts
See merge request gnu/gnu-social!153
2017-12-17 17:24:53 +00:00
0b9a2fdf3a
allow the cmd installer to load the config file from '/etc/gnusocial/config.d/'.$_server.'.php'
...
using the commandline argument as $_server (passed through lib/common.php to lib/gnusocial.php)
2017-12-17 17:59:46 +01:00
3b5fabbe97
set the html sanitizer cache directory to ['cache']['dir'] from the config file;
2017-12-06 01:55:54 +01:00
fdd3d63098
Don't write the config file when --skip-config flag is given to the installer.
...
* scripts/installer_cli.php: Read the arguments list before checking
if the config file is writeable.
2017-11-26 22:14:30 +01:00
ec504ec4df
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
2017-09-10 14:06:03 +02:00
96ce758c05
Trying to debug some stuff regarding oEmbed
2017-09-10 14:04:12 +02:00
a45d9471ed
If $_REQUEST is empty, array_merge == null.
2017-09-10 14:02:16 +02:00
a6e33bdd6a
Fixed code so that GNU social can receive Mastodon boosts (from GNU social nightly commit: c741d1a52a)
2017-08-25 11:35:02 +00:00
10f17efc4f
disabling auto-backlog-importer on subscribe
2017-08-23 18:09:49 +02:00
d9fbc17f77
Merge branch 'nightly' into 'nightly'
...
Added base64 encoding to get RMQ to work
See merge request !151
2017-08-23 15:28:08 +00:00
50f9f23ff1
Merge branch 'xmpphp-fix' into 'master'
...
Fix PHP incompatibilities in XMPPHP
See merge request !152
2017-08-23 15:27:34 +00:00
34bd4e6441
Merge branch 'patch-1' into 'master'
...
Update INSTALL
See merge request !150
2017-08-23 15:27:22 +00:00
0b75eaed92
missing argument for sprintf
2017-08-22 19:19:17 +02:00
e615032331
Fix PHP incompatibilities in XMPPHP
...
This fixes the following to errors in XMPPHP:
Stack trace:
0 [internal function]: XMPPHP_XMLStream->endXML(Resource id 150, 'STREAM:FEATURES')
1 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php(420): xml_parse(Resource id 150, '<?xml version='...', false)
2 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php(471): XMPPHP_XMLStream->__process()
3 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(165): XMPPHP_XMLStream->processUntil(Array)
4 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(49): XmppManager->connect()
5 /var/vhosts/example.org/lib/iomaster.php(248): XmppManager->start(Object(ImMaster))
6 /var/vhosts/example.org/lib/iomaster.php(111): IoMaster->start()
7 /var/vhosts/example.org/scripts/imdaemon.php(58): IoMaster->service()
8 /var/vhosts/example.org/lib/spawningdaemon.php(189): ImDaemon->runThread()
in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php on line 567
PHP Fatal error: Uncaught Error: Function name must be a string in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php:567
PHP Fatal error: Uncaught Error: Call to undefined function split() in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php:266
Stack trace:
0 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMPP.php(129): XMPPHP_XMLStream->addXPathHandler('{http://etherx ....', 'features_handle...')
1 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(145): XMPPHP_XMPP->__construct('geekplace.eu', 5222, 'gnusocial', 'U^k&l5fV53duGy', 'gnusocial', 'geekplace.eu', false, NULL)
2 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(49): XmppManager->connect()
3 /var/vhosts/example.org/lib/iomaster.php(248): XmppManager->start(Object(ImMaster))
4 /var/vhosts/example.org/lib/iomaster.php(111): IoMaster->start()
5 /var/vhosts/example.org/scripts/imdaemon.php(58): IoMaster->service()
6 /var/vhosts/example.org/lib/spawningdaemon.php(189): ImDaemon->runThread()
7 /var/vhosts/example.org/lib/spawningdaemon.php(118): SpawningDaemon->initAndRunChild(1 in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php on line 266
2017-08-19 17:55:47 +02:00
de8aed6a28
Added bullet point to README
2017-08-12 09:50:39 +02:00
d61375cb7f
Group autocompletion now fills in hostname part
2017-08-10 12:41:47 +02:00
4c8a8848ed
Groups can now be server-specific with !osm@gnusocial.de vs. !osm@sn.jonkman.ca
2017-08-10 12:30:11 +02:00
00cbc852b0
Make use of variable preMention signal method
2017-08-10 11:33:18 +02:00
8dd06cd8d8
Harmonize webfinger formatting and enable variable pre-mention character
2017-08-10 11:25:04 +02:00
20801a32f7
Logging term used HubSub instead of WebSub.
2017-08-07 00:19:12 +02:00
090f4a9474
Mastodon replies 201 Created for salmon slaps.
2017-08-05 16:21:34 +02:00
0ef483fb4a
preamble with newline for AtomPub output etc.
2017-08-05 10:42:38 +02:00
945920f24d
Mimetype was not recognized if longer than bare mime
2017-08-05 09:50:42 +02:00
6938d26524
List the thread config value in lib/default.php
2017-08-03 09:53:00 +02:00
dea9f43d85
Updated some PHP-related info in INSTALL
2017-08-03 09:52:04 +02:00
90e93b9656
Added base64 encoding to get RMQ to work
2017-07-28 12:42:21 +02:00
586aaa596e
Quote URL on dupe search and better logging on upgrade
2017-07-27 19:39:55 +02:00
457d32e273
Merge branch 'takeshitakenji/gnu-social-twitter-repeat-config' into mmn_fixes
2017-07-11 22:09:12 +02:00
dd8e17a387
Merge branch 'profile' into 'nightly'
...
Change Profile->getUser() to match the current user
See merge request !129
2017-07-11 20:05:47 +00:00
93524c4be3
Merge branch 'doc-backup-restore-def-vals' into 'nightly'
...
doc: Update 'backup', 'restore' default values
See merge request !143
2017-07-11 20:01:28 +00:00
924bcd93e5
Merge branch 'notice_id-xml' into 'nightly'
...
Use the statusnet namespace for notice_id in atom feed
See merge request !136
2017-07-11 20:01:01 +00:00
aa004d03aa
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
2017-07-11 21:59:49 +02:00
7785219234
Merge branch 'fix-doc-twitterapi' into 'master'
...
Fix a link of doc/twitterapi
See merge request !149
2017-07-11 19:58:48 +00:00
56e2b0007c
Issue #279 raises the point of missing newlines
2017-07-11 21:58:24 +02:00
a75b1df627
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
2017-07-11 21:44:50 +02:00
e3cafc011e
Merge branch 'case-sensitive-openid' into 'master'
...
Fix OpenID discovery in pages using uppercase <HEAD> tag
Closes #60
See merge request !140
2017-07-11 19:41:33 +00:00
3b363d626d
Merge branch 'safe-gitignore' into 'master'
...
Ignore whole directory, not only inner contents
See merge request !145
2017-07-11 19:31:26 +00:00
d564e28f8e
Merge branch 'xmpp-fix-1' into 'nightly'
...
Fix 'from' address in the XMPP ping command
See merge request !141
2017-07-11 19:18:51 +00:00
9b19688d65
Another solution to merge request !146
2017-07-11 21:16:30 +02:00
e4d77cb9b2
Noone uses Facebook anymore.
2017-07-11 12:44:24 +02:00
05a9c11c47
Fixing HTTP_Request2_SocketWrapper so it times out
...
HTTP_Request2_SocketWrapper would never time out on an fgets() call as
discussed in issue #281 https://git.gnu.io/gnu/gnu-social/issues/281
I'm patching it here by setting the socket to non-blocking mode and
using stream_select to wait until the timeout. This patch or some
similar variant must be implemented in HTTP_Request2_SocketWrapper
to avoid the same issue for other users.
2017-07-11 12:04:09 +02:00
9919ccb8b5
HubSub now remembers recent failures and counts them
2017-07-10 20:28:45 +02:00
661930cbe6
oEmbed had bad variable reference in error message
2017-07-10 20:28:35 +02:00
6a2a54dcb5
Making upgrade.php somewhat more efficient by remember one-time-inits.
2017-07-10 20:27:37 +02:00
c9cfda5ef2
Bad constant (LOG_WARNING, not LOG_WARN)
2017-07-10 14:50:25 +02:00
4ba7c4a021
AuthCrypt README brought out of the stone age
2017-07-10 14:49:01 +02:00
74a60ab963
Rework the push mechanism a bit to a less DB dependant queue
2017-07-10 14:43:28 +02:00
Mikael Nordfeldth
nee
Sebastian
Florian Schmaus
abjectio