wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,444 Commits 8 Branches 0 Tags 330 MiB
a6e33bdd6a
Commit Graph

17444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian
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
mmn
50f9f23ff1 Merge branch 'xmpphp-fix' into 'master' 
Fix PHP incompatibilities in XMPPHP

See merge request !152
 2017-08-23 15:27:34 +00:00
mmn
34bd4e6441 Merge branch 'patch-1' into 'master' 
Update INSTALL

See merge request !150
 2017-08-23 15:27:22 +00:00
Florian Schmaus
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
mmn
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
mmn
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
mmn
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
Danial Behzadi
16e7b5af12 Update INSTALL 
Step 4 of `Getting it up and running` is not applicable in newer versions.
 2017-06-18 12:42:14 +00:00
MIYAGI Hikaru
b9a4053eec fix a link of doc/twitterapi 2017-05-30 07:23:36 +09:00
Mikael Nordfeldth
5ad2f2873e ...and make sure we checkschema on Notice_prefs on upgrade... 2017-05-06 14:38:50 +02:00
Mikael Nordfeldth
966971bd12 Revert some of 8a4bec811b 
use Notice_prefs instead of adding a new field. The rationale here
is simply that the Notice table was _huge_ and I rant into issues
with /tmp filling up when altering the tables. So let's just create
a new table instead.
 2017-05-06 14:38:48 +02:00
Mikael Nordfeldth
7767c57087 Notice_prefs now available (I just copied Profile_prefs) 2017-05-06 14:38:47 +02:00
Mikael Nordfeldth
ba4a84602a Output proper HTML and XML headers for single Atom entry 
RFC5023 <https://tools.ietf.org/html/rfc5023> specifies that the
content type parameter 'type=entry' should be used to clarify data.
 2017-05-06 14:38:46 +02:00
Mikael Nordfeldth
d115f9dd1b Output selfLink from notice asActivity[Object] 2017-05-06 14:38:45 +02:00
Mikael Nordfeldth
1ccb934541 Return false immediately if $url is empty for common_valid_http_url 2017-05-06 14:38:43 +02:00
Mikael Nordfeldth
434956fc75 Notices start saving selfLink from activities/objects 2017-05-06 14:38:42 +02:00
Mikael Nordfeldth
7da925ca70 Handle selfLink in ActivityObject 2017-05-06 14:38:41 +02:00
Takuma YOSHIOKA
2ebdac70da
Ignore whole directory, not only inner contents 
`dir/*` style let git ignore files and directories in `dir/`, but not
`dir/` itself.
This cause `git clean -df` to remove `dir/` **with its contents**!

To prevent `git clean -df` to remove data directories (`avatar/`, `file/`,
etc), use `dir/` (or `dir`) style in gitignore.
 2017-04-29 14:22:36 +09:00
Mikael Nordfeldth
985f3b44b7 LRDD blacklisted URL test 2017-04-26 23:24:42 +02:00
Mikael Nordfeldth
e1df763940 Test URLs against blacklist also on PuSH subscriptions. 2017-04-26 22:43:16 +02:00
Mikael Nordfeldth
839b3e7392 allowed_schemes was misspelled 2017-04-26 22:12:06 +02:00
Mikael Nordfeldth
ee29b23bd4 Fix URL mention regular expression FOR REALZ 2017-04-22 11:46:43 +02:00
Mikael Nordfeldth
4827655632 Fix URL mention regular expression in OStatusPlugin 2017-04-22 11:26:23 +02:00
Mikael Nordfeldth
5e7a7701b9 Domain name regular expression into lib/framework.php 
cherry-pick-merge
 2017-04-22 11:26:13 +02:00
Mikael Nordfeldth
eefbfe746f Split up OStatusPlugin preg functions so they can be reused 
cherry-pick-merge
 2017-04-22 11:24:55 +02:00
Mikael Nordfeldth
45dfa9f215 A bit more instructive debugging 2017-04-22 11:23:43 +02:00
Mikael Nordfeldth
64b72a3c9b New domain regexp for WebFinger matching. 2017-04-22 11:23:41 +02:00
Mikael Nordfeldth
3453521c9c Less frightening interface on remote subscription 
Instead of an error message in a red box about being unable to find the
profile, you get the title "Remote subscription" and no error message.
 2017-04-19 11:44:07 +02:00
Mikael Nordfeldth
2744bdcdb7 Empty resource would throw exception 
The "+ Remote" link on your profile page broke because of exception.
 2017-04-19 11:43:58 +02:00
Mikael Nordfeldth
57f78dc61c Merge branch 'master' of git.gnu.io:gnu/gnu-social 2017-04-16 11:04:17 +02:00
Mikael Nordfeldth
388655d19b Handle normalized acct: URIs in ostatussub 
Mastodon sent the proper acct: URI and not just 'user@domain' when
using the remote subscribe functionality.
 2017-04-16 11:03:14 +02:00
Sandro Santilli
aac6a21c4e Fix OpenID discovery in pages using uppercase <HEAD> tag 
Closes #60

Equivalent change was proposed upstream:
https://github.com/openid/php-openid/pull/134
 2017-04-08 09:13:59 +02:00
mmn
6679ecb9d7 Merge branch 'fix-openid-removal' into 'master' 
Fix OpenID URI removal

See merge request !138
 2017-04-06 09:12:35 +00:00
mmn
f85aa41adc Merge branch 'normalized_openid' into 'master' 
Normalize OpenID URI before checking it for validity

Closes #251

See merge request !139
 2017-04-06 09:12:17 +00:00
Sandro Santilli
1ef206467f Fix OpenID URI removal 
See #252
 2017-03-18 13:33:07 +01:00
Sandro Santilli
85a407e7b0 Normalize OpenID URI before checking it for validity 
Fixes #251
 2017-03-18 10:56:01 +01:00
Mikael Nordfeldth
9fead39f36 Merge branch 'master' of git.gnu.io:gnu/gnu-social 2017-03-18 01:36:35 +01:00
Mikael Nordfeldth
948744538c StoreRemoteMedia now checks remote filesize before downloading 2017-03-18 01:35:45 +01:00
mmn
7dcb229ab3 Merge branch 'improve-status-length-calculation' into 'master' 
improve status length calculation for messages forwarded to Twitter

See merge request !133
 2017-01-15 20:23:41 +00:00
Bjoern Schiessle
f198d5d110
improve status length calculation, each link is exactly 23 characters long at Twitter 2016-12-14 15:54:02 +01:00
Mikael Nordfeldth
7d67eefdf5 wrong variable was referenced 2016-09-13 11:24:57 +02:00
Mikael Nordfeldth
18670c69b2 Merge branch 'master' of git.gnu.io:gnu/gnu-social 2016-09-02 01:01:57 +02:00
Mikael Nordfeldth
a7043bf7cc Split up source and source_link. Never trust HTML! 
https://community.highlandarrow.com/notice/269667
or alternatively: https://social.umeahackerspace.se/conversation/495655
 2016-09-02 01:00:52 +02:00
Mikael Nordfeldth
15ab9ff9e3 common_to_alphanumeric added, filtering Notice->source in classic layout 2016-09-02 01:00:08 +02:00
mmn
48efdc3593 Merge branch 'check-connection-on-install' into 'master' 
Check DB connection before any possible use

This is to avoid an exception when enabling 'pgsql' backend

See merge request !121
 2016-06-17 16:30:25 -04:00
Sandro Santilli
3138fa0b40 Check DB connection before any possible use 2016-05-24 16:49:50 +02:00
Mikael Nordfeldth
844fe3924e put local id, href and such in ostatus:conversation element 2016-04-18 16:09:36 +02:00
Mikael Nordfeldth
afdd6d39ec Some Google stuff that need to be there (or comments) 
Note that these won't be shown to the enduser and will never be accessed automatically.

We should put the salmon-protocol stuff on ostatus.org
 2016-03-21 12:25:04 +01:00
Mikael Nordfeldth
b4cbf620ab woops, accidentally deleted updates-from rel on mass Google-deletion 2016-03-21 12:13:01 +01:00
Mikael Nordfeldth
1e89369ef8 geometa.js doesn't exist anymore 2016-03-21 03:23:39 +01:00