Mambo > Projects > Mambo CMS > SVN

Revision 1024

Jump to revision:
Author:	cauld
Date:	Tue Mar 20 22:24:49 2007 UTC (6 years, 2 months ago)
Log Message:	! Merging revisions 979 thru 1023 from 4.6 to 4.7. Lots of changes and conflicts I had to sort through. Overall it was a successful merge though.

Changed paths:

Path	Details
mambo/branches/4.7/CHANGELOG.php	modified , text changed
mambo/branches/4.7/administrator/components/com_admin/admin.admin.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_admin/toolbar.admin.php	modified , text changed
mambo/branches/4.7/administrator/components/com_config/admin.config.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_installer/admin.installer.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_installer/admin.installer.php	modified , text changed
mambo/branches/4.7/administrator/components/com_languages/actions/extract.action.php	modified , text changed
mambo/branches/4.7/administrator/components/com_languages/actions/save.action.php	modified , text changed
mambo/branches/4.7/administrator/components/com_languages/views/templates/editcatalog.tpl.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mambots/admin.mambots.php	modified , text changed
mambo/branches/4.7/administrator/components/com_menus/admin.menus.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlyce/admin.mostlyce.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlyce/admin.mostlyce.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlyce/info/	deleted
mambo/branches/4.7/administrator/components/com_mostlyce/language/	deleted
mambo/branches/4.7/administrator/components/com_mostlyce/mostlyce.xml	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.html.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlydbadmin/admin.mostlydbadmin.php	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlydbadmin/mostlydbadmin.xml	modified , text changed
mambo/branches/4.7/administrator/components/com_mostlydbadmin/read_me.txt	modified , text changed
mambo/branches/4.7/administrator/images/help-browser.png (Copied from mambo/branches/4.6/administrator/images/help-browser.png, r1023)	added
mambo/branches/4.7/administrator/includes/menubar.html.php	modified , text changed
mambo/branches/4.7/administrator/includes/mosAdminMenus.php	modified , text changed
mambo/branches/4.7/administrator/modules/mod_quickicon.php	modified , text changed
mambo/branches/4.7/components/com_contact/contact.php	modified , text changed
mambo/branches/4.7/components/com_content/content.php	modified , text changed
mambo/branches/4.7/copyright.php	modified , text changed
mambo/branches/4.7/includes/core.classes.php	modified , text changed
mambo/branches/4.7/includes/database.php	modified , text changed
mambo/branches/4.7/includes/phpgettext/phpgettext.class.php	modified , text changed
mambo/branches/4.7/includes/version.php	modified , text changed
mambo/branches/4.7/index.php	modified , text changed
mambo/branches/4.7/installation/sql/sample_data.sql	modified , text changed
mambo/branches/4.7/installation/sql/sample_data_lite.sql	modified , text changed
mambo/branches/4.7/language/locales.xml	modified , text changed
mambo/branches/4.7/language/untranslated/admin.pot	modified , text changed
mambo/branches/4.7/language/untranslated/administrator.pot	modified , text changed
mambo/branches/4.7/language/untranslated/banners.pot	modified , text changed
mambo/branches/4.7/language/untranslated/categories.pot	modified , text changed
mambo/branches/4.7/language/untranslated/checkin.pot	modified , text changed
mambo/branches/4.7/language/untranslated/comment.pot	modified , text changed
mambo/branches/4.7/language/untranslated/config.pot	modified , text changed
mambo/branches/4.7/language/untranslated/contact.pot	modified , text changed
mambo/branches/4.7/language/untranslated/containers.pot	modified , text changed
mambo/branches/4.7/language/untranslated/content.pot	modified , text changed
mambo/branches/4.7/language/untranslated/frontend.pot	modified , text changed
mambo/branches/4.7/language/untranslated/frontpage.pot	modified , text changed
mambo/branches/4.7/language/untranslated/installation.pot	modified , text changed
mambo/branches/4.7/language/untranslated/installer.pot	modified , text changed
mambo/branches/4.7/language/untranslated/languages.pot	modified , text changed
mambo/branches/4.7/language/untranslated/login.pot	modified , text changed
mambo/branches/4.7/language/untranslated/mambots.pot	modified , text changed
mambo/branches/4.7/language/untranslated/massmail.pot	modified , text changed
mambo/branches/4.7/language/untranslated/media.pot	modified , text changed
mambo/branches/4.7/language/untranslated/menumanager.pot	modified , text changed
mambo/branches/4.7/language/untranslated/menus.pot	modified , text changed
mambo/branches/4.7/language/untranslated/messages.pot	modified , text changed
mambo/branches/4.7/language/untranslated/modules.pot	modified , text changed
mambo/branches/4.7/language/untranslated/mostlyce.pot	modified , text changed
mambo/branches/4.7/language/untranslated/mostlydbadmin.pot	modified , text changed
mambo/branches/4.7/language/untranslated/newsfeeds.pot	modified , text changed
mambo/branches/4.7/language/untranslated/poll.pot	modified , text changed
mambo/branches/4.7/language/untranslated/registration.pot	modified , text changed
mambo/branches/4.7/language/untranslated/rss.pot	modified , text changed
mambo/branches/4.7/language/untranslated/search.pot	modified , text changed
mambo/branches/4.7/language/untranslated/sections.pot	modified , text changed
mambo/branches/4.7/language/untranslated/statistics.pot	modified , text changed
mambo/branches/4.7/language/untranslated/syndicate.pot	modified , text changed
mambo/branches/4.7/language/untranslated/templates.pot	modified , text changed
mambo/branches/4.7/language/untranslated/trash.pot	modified , text changed
mambo/branches/4.7/language/untranslated/typedcontent.pot	modified , text changed
mambo/branches/4.7/language/untranslated/user.pot	modified , text changed
mambo/branches/4.7/language/untranslated/users.pot	modified , text changed
mambo/branches/4.7/language/untranslated/weblink_items.pot (Copied from mambo/branches/4.6/language/untranslated/weblink_items.pot, r1023)	added
mambo/branches/4.7/language/untranslated/weblinks.pot	modified , text changed
mambo/branches/4.7/language/untranslated/wrapper.pot	modified , text changed
mambo/branches/4.7/mambots/content/mosimage.php	modified , text changed
mambo/branches/4.7/mambots/editors/mostlyce.xml	modified , text changed
mambo/branches/4.7/modules/mod_latestcontent.php	modified , text changed
mambo/branches/4.7/modules/mod_latestnews.php	modified , text changed
mambo/branches/4.7/modules/mod_wrapper.php	modified , text changed
mambo/branches/4.7/offline.php	modified , text changed
mambo/branches/4.7/templates/waterandstone/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone800/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone800_blue/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone800_green/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone800_greenandblack/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone_blue/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone_green/images/logo.gif	modified , text changed
mambo/branches/4.7/templates/waterandstone_greenandblack/images/logo.gif	modified , text changed

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Revision 1024