aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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