gitweb.fluxo.info Git - lorea/elgg.git/commit

]> gitweb.fluxo.info Git - lorea/elgg.git/commit

author	cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
	Sun, 22 Aug 2010 21:53:48 +0000 (21:53 +0000)
committer	cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
	Sun, 22 Aug 2010 21:53:48 +0000 (21:53 +0000)
commit	be37104ac63cd25f2eac831ca03d6d2b19976e1c
tree	5b168134f2b07933831daedd8cf2641ffb6c5c7d	tree \| snapshot
parent	d45a24be28b2eb2d0c2731708b589788a5b87215	commit \| diff

Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged due to standardization of code in trunk but not branch)

git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544

14 files changed:

engine/lib/entities.php		diff \| blob \| history
engine/lib/relationships.php		diff \| blob \| history
engine/lib/upgrades/2010071001.php	[new file with mode: 0644]	blob
engine/lib/upgrades/2010071002.php	[new file with mode: 0644]	blob
mod/notifications/start.php		diff \| blob \| history
mod/pages/actions/pages/edit.php		diff \| blob \| history
mod/pages/start.php		diff \| blob \| history
mod/pages/views/default/forms/pages/edit.php		diff \| blob \| history
mod/profile/actions/cropicon.php		diff \| blob \| history
mod/profile/actions/iconupload.php		diff \| blob \| history
mod/profile/icon.php		diff \| blob \| history
mod/profile/icondirect.php		diff \| blob \| history
mod/profile/start.php		diff \| blob \| history
version.php		diff \| blob \| history

Social Networking Engine

RSS Atom