 Diogo Cordeiro
|
ddc3cecfc0
Add default values for avatar and attachment directories in web installer
|
6 years ago |
|
Diogo Cordeiro
|
b3c3af1ef6
Merge branch 'issue-333' into 'nightly'
|
6 years ago |
 Chimo
|
2b43d484eb
UserFlag: Pass proper profile to FlaggedProfileListItem
|
6 years ago |
|
Diogo Cordeiro
|
9688a55d56
Merge branch 'nightly' into 'nightly'
|
6 years ago |
|
Chimo
|
e8e487187e
Group Members page: Fix typo in groupmembers.php
|
6 years ago |
 mmn
|
ffe14fe5f3
Merge branch 'nightly' into 'nightly'
|
7 years ago |
|
mmn
|
c285f80b18
Merge branch 'cas-user-whitelist' into 'nightly'
|
7 years ago |
|
mmn
|
1e1543dd72
Test if $casSettings['user_whitelist'] is an array - and then perform in_array(...) instead of just checking if it's != null.
|
7 years ago |
|
mmn
|
9c0c8a19dd
Merge branch 'backupaccount-xml' into 'nightly'
|
7 years ago |
|
Mikael Nordfeldth
|
ec98fd0c43
Merge remote-tracking branch 'gnuio/master' into nightly
|
7 years ago |
|
mmn
|
67a9c0415c
Merge branch 'cache-html-sanitizer' into 'master'
|
7 years ago |
|
mmn
|
a1ea335140
Merge branch 'cli-install' into 'master'
|
7 years ago |
|
mmn
|
69bb81556f
Merge branch 'master' into 'master'
|
7 years ago |
 nee
|
0b9a2fdf3a
allow the cmd installer to load the config file from '/etc/gnusocial/config.d/'.$_server.'.php'
|
7 years ago |
|
nee
|
3b5fabbe97
set the html sanitizer cache directory to ['cache']['dir'] from the config file;
|
7 years ago |
|
nee
|
fdd3d63098
Don't write the config file when --skip-config flag is given to the installer.
|
7 years ago |
 vinz
|
5af96d3ec7
fixed hard coded twitter char limit
|
7 years ago |
|
vinz
|
250221ff7f
Merge remote-tracking branch 'upstream/nightly' into nightly
|
7 years ago |
|
Mikael Nordfeldth
|
ec504ec4df
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
|
7 years ago |
|
Mikael Nordfeldth
|
96ce758c05
Trying to debug some stuff regarding oEmbed
|
7 years ago |
|
Mikael Nordfeldth
|
a45d9471ed
If $_REQUEST is empty, array_merge == null.
|
7 years ago |
 Sebastian
|
a6e33bdd6a
Fixed code so that GNU social can receive Mastodon boosts (from GNU social nightly commit: https://git.gnu.io/gnu/gnu-social/commit/c741d1a52a8256336632d090fa5ffd7d2cf549a9)
|
7 years ago |
|
Mikael Nordfeldth
|
10f17efc4f
disabling auto-backlog-importer on subscribe
|
7 years ago |
|
mmn
|
d9fbc17f77
Merge branch 'nightly' into 'nightly'
|
7 years ago |
|
mmn
|
50f9f23ff1
Merge branch 'xmpphp-fix' into 'master'
|
7 years ago |
|
mmn
|
34bd4e6441
Merge branch 'patch-1' into 'master'
|
7 years ago |
|
Mikael Nordfeldth
|
0b75eaed92
missing argument for sprintf
|
7 years ago |
 Florian Schmaus
|
e615032331
Fix PHP incompatibilities in XMPPHP
|
7 years ago |
|
Mikael Nordfeldth
|
de8aed6a28
Added bullet point to README
|
7 years ago |
|
Mikael Nordfeldth
|
d61375cb7f
Group autocompletion now fills in hostname part
|
7 years ago |
