aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-17Merge commit 'afeec6ff165bc78b713e2fc6305b45bc03374bea' into saraveadevsaraveadevsaraveaSilvio Rhatto
2014-03-17Squashed 'mod/tasks/' changes from c9b1097..e47dda1Silvio Rhatto
e47dda1 Incorporate rhatto's fixes. Bumps version to 1.8.2 7f816a2 Merge commit '4f09d79bd7e4c6d5adf202f34d628a2408bc66f5' into develop 235e89d Merge commit '4d7dd80b2710c63ea8d976113471013ffa77721e' into develop 16cd0e2 Added license files. 4f09d79 Removing another debug message 4d7dd80 Removing code used during debug git-subtree-dir: mod/tasks git-subtree-split: e47dda1db7c5908a59c0e7a3ccdf57779968ed50
2014-03-17Merge commit '228d3697bcd0218605be2e28131574cc85293a2e' as 'mod/tasks'Silvio Rhatto
2014-03-17Squashed 'mod/tasks/' content from commit c9b1097Silvio Rhatto
git-subtree-dir: mod/tasks git-subtree-split: c9b1097ce081d6893f9c939146208559c089dc15
2014-03-16Merge commit '5f6dc365a8445a48156b45912827eac39fd64fc5' as 'mod/subgroups'Silvio Rhatto
2014-03-16Squashed 'mod/subgroups/' content from commit 835015bSilvio Rhatto
git-subtree-dir: mod/subgroups git-subtree-split: 835015b66b9de6dc6de91ab39f95e1f09b2dbf84
2014-03-16Merge commit '046c84212fcb91df1fc6c2d66a4e893b890845b1' as 'mod/group_alias'Silvio Rhatto
2014-03-16Squashed 'mod/group_alias/' content from commit 1a3c9daSilvio Rhatto
git-subtree-dir: mod/group_alias git-subtree-split: 1a3c9da3d7b9b002d28311fe75307ace8502463c
2014-03-15Merge commit 'd42607998482e36865c1d8a443f92a457f6b2f3b' as 'mod/minify'Silvio Rhatto
2014-03-15Squashed 'mod/minify/' content from commit 5949018Silvio Rhatto
git-subtree-dir: mod/minify git-subtree-split: 594901859d5afc1fa364322428bd7a6d5c6a3f96
2014-03-15Merge commit '4fb376687dc1546f51e637cae1478582309f85f0' as 'mod/foafssl'Silvio Rhatto
2014-03-15Squashed 'mod/foafssl/' content from commit 3c1da1eSilvio Rhatto
git-subtree-dir: mod/foafssl git-subtree-split: 3c1da1eaff8f61049b45ad99528f8f4e09ac7e62
2014-03-15Merge commit '9ca1ec52d98470c67d9ce756159935fe684347b0' as 'mod/event_connect'Silvio Rhatto
2014-03-15Squashed 'mod/event_connect/' content from commit 3688c10Silvio Rhatto
git-subtree-dir: mod/event_connect git-subtree-split: 3688c10f1bfdaecdb0bb515b2ce3d8490d0487c8
2014-03-15Merge commit 'eef8dc3c35a4d6339fae7d942388009afe1f78c1' as 'mod/faq'Silvio Rhatto
2014-03-15Squashed 'mod/faq/' content from commit b3a038cSilvio Rhatto
git-subtree-dir: mod/faq git-subtree-split: b3a038c8ac7db28d5cd47a7ae870f722c24e5921
2014-03-15Merge commit 'fe7bc5b2fa63f4b8562a961cf3910db1f3b8f7a1' as 'mod/infinite_scroll'Silvio Rhatto
2014-03-15Squashed 'mod/infinite_scroll/' content from commit 68db72aSilvio Rhatto
git-subtree-dir: mod/infinite_scroll git-subtree-split: 68db72a726e9ccd3603acbf59914c2017276b0ed
2014-03-15Merge commit '20f9884f9a52e810d7e3cdbdd92eabc64812e097' as 'mod/ckeditor'Silvio Rhatto
2014-03-15Squashed 'mod/ckeditor/' content from commit 9f4ede0Silvio Rhatto
git-subtree-dir: mod/ckeditor git-subtree-split: 9f4ede06562e229a26d7ae8d32ebb23453c293e7
2014-03-15Merge commit '354eae084587d9a9bddb74cb8aff41c2af9e58ad' as ↵Silvio Rhatto
'mod/editablecomments'
2014-03-15Squashed 'mod/editablecomments/' content from commit b97df96Silvio Rhatto
git-subtree-dir: mod/editablecomments git-subtree-split: b97df962cca29bf292d72c1f174fc6322e59e126
2014-03-15Merge commit '66dd3f3f5f14bb0ba6d2c7ef83b5b612d5ee2e30' as 'mod/lightbox'Silvio Rhatto
2014-03-15Squashed 'mod/lightbox/' content from commit a83b8d8Silvio Rhatto
git-subtree-dir: mod/lightbox git-subtree-split: a83b8d89691c31b4568f47790fb40d0bc962aca5
2014-03-15Merge commit '19ee0c89c76417f45a88c695025ecc513c37d54e' as 'mod/linkup'Silvio Rhatto
2014-03-15Squashed 'mod/linkup/' content from commit 31be7a5Silvio Rhatto
git-subtree-dir: mod/linkup git-subtree-split: 31be7a50f246601e1ff93f0a5822806bff30b1b3
2014-03-15Merge commit '4bd60b4f3f541c7af734ed40043e70c888450691' as 'mod/lorea-status'Silvio Rhatto
2014-03-15Squashed 'mod/lorea-status/' content from commit 6189193Silvio Rhatto
git-subtree-dir: mod/lorea-status git-subtree-split: 6189193ac4771080871f6dab74853051f747490c
2014-03-15Merge commit '8fb95110c43e70f66eb5c14bb1446a3f1b5443a9' as ↵Silvio Rhatto
'mod/profile_friendlyurl'
2014-03-15Squashed 'mod/profile_friendlyurl/' content from commit 1720c0cSilvio Rhatto
git-subtree-dir: mod/profile_friendlyurl git-subtree-split: 1720c0ccf8fb93760b75e5ea25b766ad539c3a57
2014-03-15Merge commit '31354451ce2c236c9c963064652c39fe54be4afd' as 'mod/elgg-favorites'Silvio Rhatto
2014-03-15Squashed 'mod/elgg-favorites/' content from commit d96e69bSilvio Rhatto
git-subtree-dir: mod/elgg-favorites git-subtree-split: d96e69bd1365c3e3c4d998e72d9941ea1ea2278b
2014-03-15Merge commit '2d9b20157957a55bd83875775085ed31c9062577' as ↵Silvio Rhatto
'mod/translation_editor'
2014-03-15Squashed 'mod/translation_editor/' content from commit 9d86955Silvio Rhatto
git-subtree-dir: mod/translation_editor git-subtree-split: 9d86955e6d8b6807578f5a9da0346ac1a146881c
2014-03-15Merge commit '0be0b2d3a472b7b3a8c4a5d2ee22389acf126c3c' as ↵Silvio Rhatto
'mod/autosubscribegroup'
2014-03-15Squashed 'mod/autosubscribegroup/' content from commit 5e933d6Silvio Rhatto
git-subtree-dir: mod/autosubscribegroup git-subtree-split: 5e933d6ede62fe62d2e6425e7b1e5fdc7d93d472
2014-03-15Merge commit '059badecbc0be895c6165430e5096a9ab653027e' as 'mod/livestream'Silvio Rhatto
2014-03-15Squashed 'mod/livestream/' content from commit 89d1f38Silvio Rhatto
git-subtree-dir: mod/livestream git-subtree-split: 89d1f3877f241f34e3ed3baad3c9ee9a4fee79e7
2014-03-15Merge commit '912fa61a7f5bbeb68c575089333df9b208627aa4' as 'mod/upgrade-tools'Silvio Rhatto
2014-03-15Squashed 'mod/upgrade-tools/' content from commit 862658aSilvio Rhatto
git-subtree-dir: mod/upgrade-tools git-subtree-split: 862658a7512afda1910f600169cc7cd970bd593f
2014-03-15Merge commit '7f5de67cb46e028792e179a4f6314e13771086da' as 'mod/purity_theme'Silvio Rhatto
2014-03-15Squashed 'mod/purity_theme/' content from commit 60df8b3Silvio Rhatto
git-subtree-dir: mod/purity_theme git-subtree-split: 60df8b304bd70b5ddc79927abec1b1dc2eb706ee
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