aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cache-html-sanitizer' into 'master'HEADmastermmn2017-12-172-0/+10
|\
| * set the html sanitizer cache directory to ['cache']['dir'] from the config file;nee2017-12-062-0/+10
* | Merge branch 'cli-install' into 'master'mmn2017-12-172-7/+12
|\ \
| * | allow the cmd installer to load the config file from '/etc/gnusocial/config.d...nee2017-12-171-0/+3
| * | Don't write the config file when --skip-config flag is given to the installer.nee2017-11-262-7/+9
| |/
* | Merge branch 'master' into 'master'mmn2017-12-171-1/+1
|\ \ | |/ |/|
| * Fixed code so that GNU social can receive Mastodon boosts (from GNU social ni...Sebastian2017-08-251-1/+1
|/
* Merge branch 'xmpphp-fix' into 'master'mmn2017-08-232-6/+6
|\
| * Fix PHP incompatibilities in XMPPHPFlorian Schmaus2017-08-192-6/+6
* | Merge branch 'patch-1' into 'master'mmn2017-08-231-14/+4
|\ \ | |/ |/|
| * Update INSTALLDanial Behzadi2017-06-181-14/+4
* | Merge branch 'fix-doc-twitterapi' into 'master'mmn2017-07-111-1/+1
|\ \
| * | fix a link of doc/twitterapiMIYAGI Hikaru2017-05-301-1/+1
| |/
* | Merge branch 'case-sensitive-openid' into 'master'mmn2017-07-111-13/+3
|\ \
| * | Fix OpenID discovery in pages using uppercase <HEAD> tagSandro Santilli2017-04-081-13/+3
* | | Merge branch 'safe-gitignore' into 'master'mmn2017-07-111-8/+8
|\ \ \ | |_|/ |/| |
| * | Ignore whole directory, not only inner contentsTakuma YOSHIOKA2017-04-291-8/+8
* | | ...and make sure we checkschema on Notice_prefs on upgrade...Mikael Nordfeldth2017-05-061-0/+1
* | | Revert some of 8a4bec811b07a0ed9d76d0aceb03855c91a67242Mikael Nordfeldth2017-05-061-11/+36
* | | Notice_prefs now available (I just copied Profile_prefs)Mikael Nordfeldth2017-05-061-0/+172
* | | Output proper HTML and XML headers for single Atom entryMikael Nordfeldth2017-05-061-1/+2
* | | Output selfLink from notice asActivity[Object]Mikael Nordfeldth2017-05-061-2/+23
* | | Return false immediately if $url is empty for common_valid_http_urlMikael Nordfeldth2017-05-061-0/+4
* | | Notices start saving selfLink from activities/objectsMikael Nordfeldth2017-05-064-3/+28
* | | Handle selfLink in ActivityObjectMikael Nordfeldth2017-05-061-0/+14
|/ /
* | LRDD blacklisted URL testMikael Nordfeldth2017-04-262-0/+10
* | Test URLs against blacklist also on PuSH subscriptions.Mikael Nordfeldth2017-04-262-4/+14
* | allowed_schemes was misspelledMikael Nordfeldth2017-04-261-1/+1
* | Fix URL mention regular expression FOR REALZMikael Nordfeldth2017-04-221-1/+3
* | Fix URL mention regular expression in OStatusPluginMikael Nordfeldth2017-04-221-1/+1
* | Domain name regular expression into lib/framework.phpMikael Nordfeldth2017-04-222-2/+13
* | Split up OStatusPlugin preg functions so they can be reusedMikael Nordfeldth2017-04-221-62/+89
* | A bit more instructive debuggingMikael Nordfeldth2017-04-222-1/+5
* | New domain regexp for WebFinger matching.Mikael Nordfeldth2017-04-221-1/+1
* | Less frightening interface on remote subscriptionMikael Nordfeldth2017-04-191-2/+3
* | Empty resource would throw exceptionMikael Nordfeldth2017-04-191-1/+5
* | Merge branch 'master' of git.gnu.io:gnu/gnu-socialMikael Nordfeldth2017-04-162-1/+2
|\ \ | |/
| * Merge branch 'fix-openid-removal' into 'master' mmn2017-04-061-1/+1
| |\
| | * Fix OpenID URI removalSandro Santilli2017-03-181-1/+1
| * | Merge branch 'normalized_openid' into 'master' mmn2017-04-061-0/+1
| |\ \
| | * | Normalize OpenID URI before checking it for validitySandro Santilli2017-03-181-0/+1
| |/ /
* | | Handle normalized acct: URIs in ostatussubMikael Nordfeldth2017-04-162-4/+6
|/ /
* | Merge branch 'master' of git.gnu.io:gnu/gnu-socialMikael Nordfeldth2017-03-181-4/+9
|\ \
| * \ Merge branch 'improve-status-length-calculation' into 'master' mmn2017-01-151-4/+9
| |\ \ | | |/ | |/|
| | * improve status length calculation, each link is exactly 23 characters long at...Bjoern Schiessle2016-12-141-4/+9
| |/
* | StoreRemoteMedia now checks remote filesize before downloadingMikael Nordfeldth2017-03-181-14/+69
|/
* wrong variable was referencedMikael Nordfeldth2016-09-131-1/+1
* Merge branch 'master' of git.gnu.io:gnu/gnu-socialMikael Nordfeldth2016-09-021-5/+5
|\
| * Merge branch 'check-connection-on-install' into 'master' mmn2016-06-171-5/+5
| |\
| | * Check DB connection before any possible useSandro Santilli2016-05-241-5/+5
| |/