aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-15Merge commit 'cb346ff43a63f93ff5275502638c51a4653fac7d' as 'mod/captcha'Silvio Rhatto
2014-03-15Squashed 'mod/captcha/' content from commit c7ac34eSilvio Rhatto
git-subtree-dir: mod/captcha git-subtree-split: c7ac34e65fed6e9fc08f85dc4734b29c4fd51147
2014-03-15Merge commit 'ad3bb7b13a75b7a2e23a6be637737ecd11567ed0' as 'mod/magic_topbar'Silvio Rhatto
2014-03-15Squashed 'mod/magic_topbar/' content from commit 0fdca8aSilvio Rhatto
git-subtree-dir: mod/magic_topbar git-subtree-split: 0fdca8adb73fe9e2b5be69c00c15760c8fba3366
2014-03-15Merge commit 'ef47af966edaf727834758f1a4fc7b1c19a0f230' as 'mod/simple_faq'Silvio Rhatto
2014-03-15Squashed 'mod/simple_faq/' content from commit 1852794Silvio Rhatto
git-subtree-dir: mod/simple_faq git-subtree-split: 1852794b849fcbab29c2b37ca6c106dc0cb9903d
2014-03-15Merge commit '279e74d06be7e2fc98c3df3cd867d1ecfd3e6de4' as 'mod/landing'Silvio Rhatto
2014-03-15Squashed 'mod/landing/' content from commit d1ea0d2Silvio Rhatto
git-subtree-dir: mod/landing git-subtree-split: d1ea0d2593cbf55a3804224fd587dbde00672a8c
2014-03-15Merge commit '238eb4e25087be44e834614a01ccbdec250cea45' as 'mod/basic_theme'Silvio Rhatto
2014-03-15Squashed 'mod/basic_theme/' content from commit b0e908fSilvio Rhatto
git-subtree-dir: mod/basic_theme git-subtree-split: b0e908f45134d8730954f4cc0d88ebf9b5c3eb4c
2014-03-15Merge commit 'bd1864363fada1c3122b053b83c4d8b9526bbfa3' as 'mod/bulk_user_admin'Silvio Rhatto
2014-03-15Squashed 'mod/bulk_user_admin/' content from commit 17664c9Silvio Rhatto
git-subtree-dir: mod/bulk_user_admin git-subtree-split: 17664c9c5af5ee2d74b7c378ccc52ee65074ad6c
2014-03-15Merge commit '5041c6c48153453ed597206d08eeff37cf20e676' as 'mod/cool_theme'Silvio Rhatto
2014-03-15Squashed 'mod/cool_theme/' content from commit a26f7dfSilvio Rhatto
git-subtree-dir: mod/cool_theme git-subtree-split: a26f7df43a266f7d1ff04847da330d15f6041e9b
2014-03-15Merge commit '2e227be9e9cf772d71acafdc3a1b335630777acd' as 'mod/vegan'Silvio Rhatto
2014-03-15Squashed 'mod/vegan/' content from commit e48966eSilvio Rhatto
git-subtree-dir: mod/vegan git-subtree-split: e48966e8a43f5da5309a796c5a749f9fcd317a69
2014-03-15Merge commit '33de97cc48cc2f7d79db38568ee74cb93f7b0041' as 'mod/curatedgroups'Silvio Rhatto
2014-03-15Squashed 'mod/curatedgroups/' content from commit fb2fc6fSilvio Rhatto
git-subtree-dir: mod/curatedgroups git-subtree-split: fb2fc6f267b9c3c7e6c5055412b716ce22b34a32
2014-03-15Merge commit '36102a094de700ee339f6eaeffb8ab16ba4f2f3b' as 'mod/graphstats'Silvio Rhatto
2014-03-15Squashed 'mod/graphstats/' content from commit b5d0461Silvio Rhatto
git-subtree-dir: mod/graphstats git-subtree-split: b5d046138c5841d55b4497618d5678cb8027c245
2014-03-15Merge commit '551497ef94f6239b109316d8fab32f0909b13f73' as 'mod/less'Silvio Rhatto
2014-03-15Squashed 'mod/less/' content from commit 380edadSilvio Rhatto
git-subtree-dir: mod/less git-subtree-split: 380edadb3a5e524a8e6ef6df063b678f2f00516f
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-14Squashed 'mod/saravea_theme/' content from commit daab1e0Silvio Rhatto
git-subtree-dir: mod/saravea_theme git-subtree-split: daab1e0a1d564efeb637ecb2ce27ade44f45ac64
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-22Merge branch 'hotfix/1.8.1.1'HEADmasterSem
2014-01-22Unmegred changes was breaking elgg.Sem
2014-01-22Merge branch 'release/1.8.1'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-13Merge branch 'hotfix/1.8.1.1' into developSem
2014-01-13Fixed save action.Sem
2014-01-13Bumped version 1.8.1.1Sem
2014-01-13Deleted automatically generated file.Sem
2014-01-13Merge branch 'release/1.8.1' into developSem
2014-01-13Merge branch 'release/1.8.1'Sem
2014-01-13Bumped version 1.8.1Sem
2014-01-13Delete gedit automatically generated filesSem
2014-01-12little refactoringcapo
2014-01-12edit link only show when you can editcapo
2014-01-12fix identationcapo
2014-01-12review code from hellekin commentscapo
2014-01-11Prepare for 1.8.18 releaseSteve Clay
2014-01-07Merge pull request #6311 from mrclay/6309_fixJuho Jaakkola
Fixes #6309: Fixes notify_user() broken by 63db31c
2014-01-06Fixes #6309: Fixes notify_user() broken by 63db31cSteve Clay
2014-01-01Merged in libxml18 (pull request #8) Paweł Sroka
Disable loading external entities during XML parsing
2014-01-01Merged in csrf_fix (pull request #7) Paweł Sroka
Added function for escaping query strings and fixed several XSRF vulnerabilities.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 11:03:54 +0000