Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Merge branch '1.12' into merge_1x_to_master

Conflicts:
	CHANGELOG.md
	composer.json
	docs/conf.py
	docs/locale/pot/about.pot
	docs/locale/pot/admin.pot
	docs/locale/pot/appendix.pot
	docs/locale/pot/contribute.pot
	docs/locale/pot/design.pot
	docs/locale/pot/guides.pot
	docs/locale/pot/index.pot
	docs/locale/pot/intro.pot
	docs/locale/pot/plugins.pot
	docs/locale/pot/tutorials.pot
latest commit 2570d2892a
@juho-jaakkola juho-jaakkola authored
..
Failed to load latest commit information.
aalborg_theme Merge branch '1.x' into 1.x-to-master
blog feature(core): Makes several commonly-used functions public
bookmarks Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
ckeditor Merge branch '1.12' into merge_1x_to_master
custom_index Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
dashboard Merge branch '1.x' into 1.x-to-master
developers Merge branch '1.12' into merge_1x_to_master
diagnostics Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
discussions chore(discussions): List of discussions by owner now works with any e…
embed Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
externalpages Merge branch '1.12' into merge_1x_to_master
file feature(views): added html5 audio support to the file plugin
garbagecollector
groups Merge branch '1.12' into merge_1x_to_master
htmlawed chore(htmlawed): Upgrade htmlawed via composer
invitefriends Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
legacy_urls chore(i18n): update translations
likes Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
logbrowser chore(i18n): update translations
logrotate chore(i18n): update translations
members Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
messageboard chore(plugins): Convert plugin resource views to use $vars instead of…
messages chore(messages): unread count again updates when you view new messages
notifications Merge branch '1.12' into merge_1x_to_master
pages chore(plugins): Convert plugin resource views to use $vars instead of…
profile Merge branch '1.12' into merge_1x_to_master
reportedcontent Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
search Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
site_notifications Merge branch '1.12' into merge_1x_to_master
tagcloud Merge branch '1.12' into merge_1x_to_master
thewire chore(plugins): Convert plugin resource views to use $vars instead of…
twitter_api Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
uservalidationbyemail Merge branch '1.x' of http://github.com/elgg/elgg into 1.x-to-master
web_services Merge branch '1.12' into merge_1x_to_master
Something went wrong with that request. Please try again.