Merge branch 'hotfix/1.8.1.1'

Unmegred changes was breaking elgg.

Merge branch 'release/1.8.1'

Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into develop

Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

1.8.18

Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

Merge branch 'hotfix/1.8.1.1' into develop

Fixed save action.

Bumped version 1.8.1.1

Deleted automatically generated file.

Merge branch 'release/1.8.1' into develop

Merge branch 'release/1.8.1'

Bumped version 1.8.1

Delete gedit automatically generated files

little refactoring

edit link only show when you can edit

fix identation

review code from hellekin comments

Prepare for 1.8.18 release

Merge pull request #6311 from mrclay/6309_fix

Fixes #6309: Fixes notify_user() broken by 63db31c

Fixes #6309: Fixes notify_user() broken by 63db31c

Merged in libxml18 (pull request #8)

Disable loading external entities during XML parsing

Merged in csrf_fix (pull request #7)

Added function for escaping query strings and fixed several XSRF vulnerabilities.

Preparing 1.8.17 release

Added missing @deprecated tags

Merge pull request #6251 from jeabakker/3143-memcache-entity-cache-on-login

fixes #3143 login part

Added feature to be able to use simplepie rss module in the groups

Fixed directions for going to the site secret generation page.

Merge pull request #6274 from juho-jaakkola/limited_groups

Makes sure all group pages respect the limited_groups setting

Makes sure all group pages respect the limited_groups setting

Code style fixes for recent PR

Checks X-Real-Ip header as well when determining client IP

Fixes #6012: Gets correct client IP behind proxy (1.8)

Merge pull request #6250 from edfactor/patch-1

Makes sure plugin settings functions return arrays

Handle case if get_user_notification_settings() returns false

fixes #3143 login part

Fix #6238 Return blank arrays

I committed this simple change to return the empty array rather than false for empty settings result for ElggPlugin::getAllSettings and getAllUsersSettings. Put this into 1.8 branch.

Code style fixes in ElggCrypto

Make sure new lang key available during upgrade

Allow regenerating site secret

Merge pull request #6164 from jdalsem/file-remove-thumbs

Fixes #6162 - Remove file thumbnails if no longer needed

Removes border-radius from radios/checkboxes

Fixing permissions changes from #6201

Merge branch 'release/1.8.0'

Merge commit 'abc688bc15' into develop

Replaced README.

Added subtree script.

Add 'mod/html5/' from commit 'b623f64507956f7beee0d8352fd044bdb70f5d23'

git-subtree-dir: mod/html5
git-subtree-mainline: dee4ff21a5a5e8b8c5dbeae0a2f89a36a3f1c6cc
git-subtree-split: b623f64507956f7beee0d8352fd044bdb70f5d23

Add 'mod/profile_widgets/' from commit 'a81819e6399907420e67aabe93f5ac5eee8bac5f'

git-subtree-dir: mod/profile_widgets
git-subtree-mainline: 536ad685d02d6721671237bc6e6f5a04334419ac
git-subtree-split: a81819e6399907420e67aabe93f5ac5eee8bac5f

Add 'mod/simplepie/' from commit '97c0db5dd349f8c777bc813f5f3a00a858412828'

git-subtree-dir: mod/simplepie
git-subtree-mainline: 77f0367d454711f1d00e1fcfc5d31147055cc66a
git-subtree-split: 97c0db5dd349f8c777bc813f5f3a00a858412828

Add 'mod/beechat/' from commit '29be010b5837f36237216b187ad1d5988f98e8bc'

git-subtree-dir: mod/beechat
git-subtree-mainline: 911d0021c374602c31e5bfd71b1cd8074f2c2293
git-subtree-split: 29be010b5837f36237216b187ad1d5988f98e8bc

Add 'mod/openid_api/' from commit '33c206552a0cfd1166b2d5e4fcceb26f5ff1d224'

git-subtree-dir: mod/openid_api
git-subtree-mainline: 5cc7f96262509b2a5d43fa6fbb6cd083064385be
git-subtree-split: 33c206552a0cfd1166b2d5e4fcceb26f5ff1d224

Add 'mod/openid_server/' from commit 'b6c722ac63d250972fea066b30e58026d00ab3e2'

git-subtree-dir: mod/openid_server
git-subtree-mainline: 2161e2335c9c650b8e44a56f6c9b0bd37546ae1f
git-subtree-split: b6c722ac63d250972fea066b30e58026d00ab3e2

Add 'mod/openid_client/' from commit '11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc'

git-subtree-dir: mod/openid_client
git-subtree-mainline: a9ac4c861335e60373c1e99b61372e6e0d6ac9f4
git-subtree-split: 11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc

Add 'mod/event_calendar/' from commit 'b011a80767e1062a394b7bbbc3be3d2959a5f773'

git-subtree-dir: mod/event_calendar
git-subtree-mainline: 1f40407cb2d2f0edfc4cc5346f332f5c6adab022
git-subtree-split: b011a80767e1062a394b7bbbc3be3d2959a5f773

Add 'mod/colorbox/' from commit 'fb61398a422ef6bd25028f6f47c008738e8fea8c'

git-subtree-dir: mod/colorbox
git-subtree-mainline: f448cd91f9ecebea37daf40aada2fa1a20200817
git-subtree-split: fb61398a422ef6bd25028f6f47c008738e8fea8c

Add 'mod/lightpics/' from commit '324f39c3a9aa41e9e23bafba38882a2b72f62441'

git-subtree-dir: mod/lightpics
git-subtree-mainline: 52335325e5ea8c89c711e1ba40d9ac1657004e61
git-subtree-split: 324f39c3a9aa41e9e23bafba38882a2b72f62441

Add 'mod/habitorio_theme/' from commit '0f9c1c4669fa730024c4c35c0655e0c38365d96d'

git-subtree-dir: mod/habitorio_theme
git-subtree-mainline: ea0462952ecf6f8aab30a26bd889a30691f15c98
git-subtree-split: 0f9c1c4669fa730024c4c35c0655e0c38365d96d

Add 'mod/river_privacy/' from commit '76a4e971f2d7286041aaba7b6ee7f7383bfc3272'

git-subtree-dir: mod/river_privacy
git-subtree-mainline: d44f0965e80edd003dca4c85f5bdbc462affbe8a
git-subtree-split: 76a4e971f2d7286041aaba7b6ee7f7383bfc3272

Add 'mod/custom_index_widgets/' from commit 'c76018e381332ccb4aed03fbebd80a6b151cd5e5'

git-subtree-dir: mod/custom_index_widgets
git-subtree-mainline: ed6d980dcb06a66e1746fe4959aa138c39fb4e9e
git-subtree-split: c76018e381332ccb4aed03fbebd80a6b151cd5e5

Add 'mod/registrationterms/' from commit 'e586807b4e6ace77d53b3195ca4fa13ab62d4a09'

git-subtree-dir: mod/registrationterms
git-subtree-mainline: 6834f913fe7ce7d4274a9757661589e9a222b71c
git-subtree-split: e586807b4e6ace77d53b3195ca4fa13ab62d4a09

Add 'mod/languages/' from commit '0f226cf5c4a8d02dbd0bb64cff36a6bb92d72d68'

git-subtree-dir: mod/languages
git-subtree-mainline: e58937426578eac71d1447c38ae3f93cbc331bf1
git-subtree-split: 0f226cf5c4a8d02dbd0bb64cff36a6bb92d72d68

Add 'mod/identica/' from commit 'd2494d74da2f015465bb340292c049d9c63756cd'

git-subtree-dir: mod/identica
git-subtree-mainline: 293fe873dcbedf45571807b722ce859e00a5a3a5
git-subtree-split: d2494d74da2f015465bb340292c049d9c63756cd

Add 'mod/opensearch/' from commit '853cb44b625cbe0e1cae3dff197d54645a1291a1'

git-subtree-dir: mod/opensearch
git-subtree-mainline: ba0d506ade08ae46ba665474a8b9c81e838f2eee
git-subtree-split: 853cb44b625cbe0e1cae3dff197d54645a1291a1

Add 'mod/friendrequest/' from commit 'bdd9179742dbd9101b61a5138e1a81b084747dd8'

git-subtree-dir: mod/friendrequest
git-subtree-mainline: e2a2fbdccaf0f48878903f448428cab5852d0870
git-subtree-split: bdd9179742dbd9101b61a5138e1a81b084747dd8

Add 'mod/dokuwiki/' from commit 'b603da53e13005c67d05efac67b70023dfffc450'

git-subtree-dir: mod/dokuwiki
git-subtree-mainline: 59448d8a9864573c05477a63a6dda404c455fdb6
git-subtree-split: b603da53e13005c67d05efac67b70023dfffc450

Add 'mod/videolist/' from commit '17d7adcb317d25e37d3091e94b66e3f16de54196'

git-subtree-dir: mod/videolist
git-subtree-mainline: 4cf4e4d3969ab43978c95f88238547530b01422d
git-subtree-split: 17d7adcb317d25e37d3091e94b66e3f16de54196

Deleted submodules.

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch '1.8'

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0' into develop

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'

Bumped version 1.8.0

Merge branch 'release/1.8.0'