aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nightly' into 'nightly'nightlymmn2017-12-1713-3/+1259
|\
| * fixed hard coded twitter char limitvinz2017-11-081-3/+3
| * Merge remote-tracking branch 'upstream/nightly' into nightlyvinz2017-11-08280-32368/+4143
| |\
| * | Added chimo's pluginsvinzv2016-09-024-0/+0
| * | Add Qvitter and QvitterPlusvinzv2016-09-022-0/+0
| * | Adding SensitiveContent Plugin for nsfw filteringvinzv2016-09-026-0/+1256
| * | Merge branch 'nightly' of https://git.gnu.io/gnu/gnu-social into nightlyvinzv2016-09-0237-210/+139
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into nightlyvinzv2016-09-028-37/+64
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into nightlywww-data2016-09-011-5/+5
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-08-132-0/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-07-276-23/+68
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-07-1510-38/+132
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-07-0417-120/+189
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-06-2421-143/+274
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-06-231-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-06-21189-8615/+28480
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-05-178-12/+38
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/nightly' into nightlywww-data2016-05-0118-93/+187
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into nightlywww-data2016-04-271-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cas-user-whitelist' into 'nightly'mmn2017-12-173-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Test if $casSettings['user_whitelist'] is an array - and then perform in_arra...mmn2017-12-171-1/+1
| * | | | | | | | | | | | | | | | Added CAS user whitelist featureAndrew Engelbrecht2017-04-173-0/+12
* | | | | | | | | | | | | | | | | Merge branch 'backupaccount-xml' into 'nightly'mmn2017-12-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | backupaccount: Don't print page HTML in XML exportChimo2017-04-231-0/+3
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'gnuio/master' into nightlyMikael Nordfeldth2017-12-175-21/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | 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 'nightly' of git.gnu.io:gnu/gnu-social into nightlyMikael Nordfeldth2017-09-102-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nightly' into 'nightly'mmn2017-08-232-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Added base64 encoding to get RMQ to workabjectio2017-07-282-4/+6
* | | | | | | | | | | | | | | | | | | | | Trying to debug some stuff regarding oEmbedMikael Nordfeldth2017-09-101-2/+6
* | | | | | | | | | | | | | | | | | | | | If $_REQUEST is empty, array_merge == null.Mikael Nordfeldth2017-09-101-1/+1
* | | | | | | | | | | | | | | | | | | | | disabling auto-backlog-importer on subscribeMikael Nordfeldth2017-08-231-3/+3
* | | | | | | | | | | | | | | | | | | | | missing argument for sprintfMikael Nordfeldth2017-08-221-1/+1
* | | | | | | | | | | | | | | | | | | | | Added bullet point to READMEMikael Nordfeldth2017-08-121-0/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Group autocompletion now fills in hostname partMikael Nordfeldth2017-08-101-2/+4
* | | | | | | | | | | | | | | | | | | | Groups can now be server-specific with !osm@gnusocial.de vs. !osm@sn.jonkman.caMikael Nordfeldth2017-08-101-7/+68
* | | | | | | | | | | | | | | | | | | | Make use of variable preMention signal methodMikael Nordfeldth2017-08-101-3/+2
* | | | | | | | | | | | | | | | | | | | Harmonize webfinger formatting and enable variable pre-mention characterMikael Nordfeldth2017-08-103-9/+17
* | | | | | | | | | | | | | | | | | | | Logging term used HubSub instead of WebSub.Mikael Nordfeldth2017-08-071-3/+3
* | | | | | | | | | | | | | | | | | | | Mastodon replies 201 Created for salmon slaps.Mikael Nordfeldth2017-08-051-3/+5