aboutsummaryrefslogtreecommitdiff
path: root/mod
AgeCommit message (Collapse)Author
2014-03-15Merge commit 'eef8dc3c35a4d6339fae7d942388009afe1f78c1' as 'mod/faq'Silvio Rhatto
2014-03-15Merge commit 'fe7bc5b2fa63f4b8562a961cf3910db1f3b8f7a1' as 'mod/infinite_scroll'Silvio Rhatto
2014-03-15Merge commit '20f9884f9a52e810d7e3cdbdd92eabc64812e097' as 'mod/ckeditor'Silvio Rhatto
2014-03-15Merge commit '354eae084587d9a9bddb74cb8aff41c2af9e58ad' as ↵Silvio Rhatto
'mod/editablecomments'
2014-03-15Merge commit '66dd3f3f5f14bb0ba6d2c7ef83b5b612d5ee2e30' as 'mod/lightbox'Silvio Rhatto
2014-03-15Merge commit '19ee0c89c76417f45a88c695025ecc513c37d54e' as 'mod/linkup'Silvio Rhatto
2014-03-15Merge commit '4bd60b4f3f541c7af734ed40043e70c888450691' as 'mod/lorea-status'Silvio Rhatto
2014-03-15Merge commit '8fb95110c43e70f66eb5c14bb1446a3f1b5443a9' as ↵Silvio Rhatto
'mod/profile_friendlyurl'
2014-03-15Merge commit '31354451ce2c236c9c963064652c39fe54be4afd' as 'mod/elgg-favorites'Silvio Rhatto
2014-03-15Merge commit '2d9b20157957a55bd83875775085ed31c9062577' as ↵Silvio Rhatto
'mod/translation_editor'
2014-03-15Merge commit '0be0b2d3a472b7b3a8c4a5d2ee22389acf126c3c' as ↵Silvio Rhatto
'mod/autosubscribegroup'
2014-03-15Merge commit '059badecbc0be895c6165430e5096a9ab653027e' as 'mod/livestream'Silvio Rhatto
2014-03-15Merge commit '912fa61a7f5bbeb68c575089333df9b208627aa4' as 'mod/upgrade-tools'Silvio Rhatto
2014-03-15Merge commit '7f5de67cb46e028792e179a4f6314e13771086da' as 'mod/purity_theme'Silvio Rhatto
2014-03-15Merge commit 'cb346ff43a63f93ff5275502638c51a4653fac7d' as 'mod/captcha'Silvio Rhatto
2014-03-15Merge commit 'ad3bb7b13a75b7a2e23a6be637737ecd11567ed0' as 'mod/magic_topbar'Silvio Rhatto
2014-03-15Merge commit 'ef47af966edaf727834758f1a4fc7b1c19a0f230' as 'mod/simple_faq'Silvio Rhatto
2014-03-15Merge commit '279e74d06be7e2fc98c3df3cd867d1ecfd3e6de4' as 'mod/landing'Silvio Rhatto
2014-03-15Merge commit '238eb4e25087be44e834614a01ccbdec250cea45' as 'mod/basic_theme'Silvio Rhatto
2014-03-15Merge commit 'bd1864363fada1c3122b053b83c4d8b9526bbfa3' as 'mod/bulk_user_admin'Silvio Rhatto
2014-03-15Merge commit '5041c6c48153453ed597206d08eeff37cf20e676' as 'mod/cool_theme'Silvio Rhatto
2014-03-15Merge commit '2e227be9e9cf772d71acafdc3a1b335630777acd' as 'mod/vegan'Silvio Rhatto
2014-03-15Merge commit '33de97cc48cc2f7d79db38568ee74cb93f7b0041' as 'mod/curatedgroups'Silvio Rhatto
2014-03-15Merge commit '36102a094de700ee339f6eaeffb8ab16ba4f2f3b' as 'mod/graphstats'Silvio Rhatto
2014-03-15Merge commit '551497ef94f6239b109316d8fab32f0909b13f73' as 'mod/less'Silvio Rhatto
2014-03-15Removing empty module foldersSilvio Rhatto
2014-03-14Updating landing theme styleSilvio Rhatto
2014-03-14Merge commit 'beaab428eb8b6e19ca6d413249f6307100d9b853' as 'mod/saravea_theme'Silvio Rhatto
2014-03-14Removing old saravea_theme folderSilvio Rhatto
2014-03-14Merge branch 'master' into saraveaSilvio Rhatto
Conflicts: mod/blog/views/default/blog/sidebar/archives.php
2014-01-22Unmegred changes was breaking elgg.Sem
2014-01-22Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into developSem
2014-01-22Merge tag '1.8.18' of git://github.com/Elgg/Elgg into developSem
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
2014-01-01Merged in csrf_fix (pull request #7) Paweł Sroka
Added function for escaping query strings and fixed several XSRF vulnerabilities.
2013-12-29Merge branch 'master' into saraveaSilvio Rhatto
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
2013-12-11Makes sure all group pages respect the limited_groups settingJuho Jaakkola
2013-11-29Merge pull request #6164 from jdalsem/file-remove-thumbsJuho Jaakkola
Fixes #6162 - Remove file thumbnails if no longer needed
2013-11-20Fixing permissions changes from #6201Steve Clay
2013-11-09Add 'mod/html5/' from commit 'b623f64507956f7beee0d8352fd044bdb70f5d23'Sem
git-subtree-dir: mod/html5 git-subtree-mainline: dee4ff21a5a5e8b8c5dbeae0a2f89a36a3f1c6cc git-subtree-split: b623f64507956f7beee0d8352fd044bdb70f5d23
2013-11-09Add 'mod/profile_widgets/' from commit ↵Sem
'a81819e6399907420e67aabe93f5ac5eee8bac5f' git-subtree-dir: mod/profile_widgets git-subtree-mainline: 536ad685d02d6721671237bc6e6f5a04334419ac git-subtree-split: a81819e6399907420e67aabe93f5ac5eee8bac5f
2013-11-09Add 'mod/simplepie/' from commit '97c0db5dd349f8c777bc813f5f3a00a858412828'Sem
git-subtree-dir: mod/simplepie git-subtree-mainline: 77f0367d454711f1d00e1fcfc5d31147055cc66a git-subtree-split: 97c0db5dd349f8c777bc813f5f3a00a858412828
2013-11-09Add 'mod/beechat/' from commit '29be010b5837f36237216b187ad1d5988f98e8bc'Sem
git-subtree-dir: mod/beechat git-subtree-mainline: 911d0021c374602c31e5bfd71b1cd8074f2c2293 git-subtree-split: 29be010b5837f36237216b187ad1d5988f98e8bc
2013-11-09Add 'mod/openid_api/' from commit '33c206552a0cfd1166b2d5e4fcceb26f5ff1d224'Sem
git-subtree-dir: mod/openid_api git-subtree-mainline: 5cc7f96262509b2a5d43fa6fbb6cd083064385be git-subtree-split: 33c206552a0cfd1166b2d5e4fcceb26f5ff1d224
2013-11-09Add 'mod/openid_server/' from commit 'b6c722ac63d250972fea066b30e58026d00ab3e2'Sem
git-subtree-dir: mod/openid_server git-subtree-mainline: 2161e2335c9c650b8e44a56f6c9b0bd37546ae1f git-subtree-split: b6c722ac63d250972fea066b30e58026d00ab3e2
2013-11-09Add 'mod/openid_client/' from commit '11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc'Sem
git-subtree-dir: mod/openid_client git-subtree-mainline: a9ac4c861335e60373c1e99b61372e6e0d6ac9f4 git-subtree-split: 11ea6ae4734a0e722c6ecaaee90e9ab772e8d2cc
2013-11-09Add 'mod/event_calendar/' from commit 'b011a80767e1062a394b7bbbc3be3d2959a5f773'Sem
git-subtree-dir: mod/event_calendar git-subtree-mainline: 1f40407cb2d2f0edfc4cc5346f332f5c6adab022 git-subtree-split: b011a80767e1062a394b7bbbc3be3d2959a5f773
2013-11-09Add 'mod/colorbox/' from commit 'fb61398a422ef6bd25028f6f47c008738e8fea8c'Sem
git-subtree-dir: mod/colorbox git-subtree-mainline: f448cd91f9ecebea37daf40aada2fa1a20200817 git-subtree-split: fb61398a422ef6bd25028f6f47c008738e8fea8c
2013-11-09Add 'mod/lightpics/' from commit '324f39c3a9aa41e9e23bafba38882a2b72f62441'Sem
git-subtree-dir: mod/lightpics git-subtree-mainline: 52335325e5ea8c89c711e1ba40d9ac1657004e61 git-subtree-split: 324f39c3a9aa41e9e23bafba38882a2b72f62441
2013-11-09Add 'mod/habitorio_theme/' from commit ↵Sem
'0f9c1c4669fa730024c4c35c0655e0c38365d96d' git-subtree-dir: mod/habitorio_theme git-subtree-mainline: ea0462952ecf6f8aab30a26bd889a30691f15c98 git-subtree-split: 0f9c1c4669fa730024c4c35c0655e0c38365d96d
2013-11-09Add 'mod/river_privacy/' from commit '76a4e971f2d7286041aaba7b6ee7f7383bfc3272'Sem
git-subtree-dir: mod/river_privacy git-subtree-mainline: d44f0965e80edd003dca4c85f5bdbc462affbe8a git-subtree-split: 76a4e971f2d7286041aaba7b6ee7f7383bfc3272
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 18:00:46 +0000