Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Fixes #6309: Fixes notify_user() broken by 63db31c
|
|
|
|
Disable loading external entities during XML parsing
|
|
Added function for escaping query strings and fixed several XSRF vulnerabilities.
|
|
|
|
Conflicts:
.gitmodules
mod/admins
mod/assemblies
mod/audio_html5
mod/beechat
mod/crud
mod/elgg-activitystreams
mod/elggman
mod/elggpg
mod/favorites
mod/federated-objects
mod/friendly_time
mod/group_alias
mod/group_operators
mod/languages
mod/lightpics
mod/openid_client
mod/spotlight
mod/suicide
mod/tasks
mod/videolist
|
|
|
|
fixes #3143 login part
|
|
|
|
|
|
Makes sure all group pages respect the limited_groups setting
|
|
|
|
|
|
|
|
|
|
Makes sure plugin settings functions return 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.
|
|
|
|
|
|
|
|
Fixes #6162 - Remove file thumbnails if no longer needed
|
|
|
|
|
|
|
|
|
|
|
|
|
|
git-subtree-dir: mod/html5
git-subtree-mainline: dee4ff21a5a5e8b8c5dbeae0a2f89a36a3f1c6cc
git-subtree-split: b623f64507956f7beee0d8352fd044bdb70f5d23
|
|
'a81819e6399907420e67aabe93f5ac5eee8bac5f'
git-subtree-dir: mod/profile_widgets
git-subtree-mainline: 536ad685d02d6721671237bc6e6f5a04334419ac
git-subtree-split: a81819e6399907420e67aabe93f5ac5eee8bac5f
|
|
git-subtree-dir: mod/simplepie
git-subtree-mainline: 77f0367d454711f1d00e1fcfc5d31147055cc66a
git-subtree-split: 97c0db5dd349f8c777bc813f5f3a00a858412828
|
|
git-subtree-dir: mod/beechat
git-subtree-mainline: 911d0021c374602c31e5bfd71b1cd8074f2c2293
git-subtree-split: 29be010b5837f36237216b187ad1d5988f98e8bc
|
|
git-subtree-dir: mod/openid_api
git-subtree-mainline: 5cc7f96262509b2a5d43fa6fbb6cd083064385be
git-subtree-split: 33c206552a0cfd1166b2d5e4fcceb26f5ff1d224
|
|
git-subtree-dir: mod/openid_server
git-subtree-mainline: 2161e2335c9c650b8e44a56f6c9b0bd37546ae1f
git-subtree-split: b6c722ac63d250972fea066b30e58026d00ab3e2
|
|
git-subtree-dir: mod/openid_client
git-subtree-mainline: a9ac4c861335e60373c1e99b61372e6e0d6ac9f4
git-subtree-split: 11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc
|
|
git-subtree-dir: mod/event_calendar
git-subtree-mainline: 1f40407cb2d2f0edfc4cc5346f332f5c6adab022
git-subtree-split: b011a80767e1062a394b7bbbc3be3d2959a5f773
|
|
git-subtree-dir: mod/colorbox
git-subtree-mainline: f448cd91f9ecebea37daf40aada2fa1a20200817
git-subtree-split: fb61398a422ef6bd25028f6f47c008738e8fea8c
|
|
git-subtree-dir: mod/lightpics
git-subtree-mainline: 52335325e5ea8c89c711e1ba40d9ac1657004e61
git-subtree-split: 324f39c3a9aa41e9e23bafba38882a2b72f62441
|
|
'0f9c1c4669fa730024c4c35c0655e0c38365d96d'
git-subtree-dir: mod/habitorio_theme
git-subtree-mainline: ea0462952ecf6f8aab30a26bd889a30691f15c98
git-subtree-split: 0f9c1c4669fa730024c4c35c0655e0c38365d96d
|
|
git-subtree-dir: mod/river_privacy
git-subtree-mainline: d44f0965e80edd003dca4c85f5bdbc462affbe8a
git-subtree-split: 76a4e971f2d7286041aaba7b6ee7f7383bfc3272
|
|
'c76018e381332ccb4aed03fbebd80a6b151cd5e5'
git-subtree-dir: mod/custom_index_widgets
git-subtree-mainline: ed6d980dcb06a66e1746fe4959aa138c39fb4e9e
git-subtree-split: c76018e381332ccb4aed03fbebd80a6b151cd5e5
|
|
'e586807b4e6ace77d53b3195ca4fa13ab62d4a09'
git-subtree-dir: mod/registrationterms
git-subtree-mainline: 6834f913fe7ce7d4274a9757661589e9a222b71c
git-subtree-split: e586807b4e6ace77d53b3195ca4fa13ab62d4a09
|
|
git-subtree-dir: mod/languages
git-subtree-mainline: e58937426578eac71d1447c38ae3f93cbc331bf1
git-subtree-split: 0f226cf5c4a8d02dbd0bb64cff36a6bb92d72d68
|
|
git-subtree-dir: mod/identica
git-subtree-mainline: 293fe873dcbedf45571807b722ce859e00a5a3a5
git-subtree-split: d2494d74da2f015465bb340292c049d9c63756cd
|
|
git-subtree-dir: mod/opensearch
git-subtree-mainline: ba0d506ade08ae46ba665474a8b9c81e838f2eee
git-subtree-split: 853cb44b625cbe0e1cae3dff197d54645a1291a1
|