Changeset [4bfab32f399ee0f90ddec5c1e08cbb3be5efd905] by dogmatic69
Revision 4bfab32f399ee0f90ddec5c1e08cbb3be5efd905,
committed by dogmatic69
· June 26th, 2013 @ 10:37 AM
Merge branch 'dev' of github.com:infinitas/infinitas into dev
Conflicts:
CakePHP
https://github.com/infinitas/infinitas/commit/4bfab32f399ee0f90ddec...
75 changed files
-
A
Core/Charts/webroot/js/d3-crossfilter.js -
A
Core/Charts/webroot/js/d3-gantt.js -
A
Core/Charts/webroot/js/d3.js -
A
Core/Charts/webroot/js/jquery-isotope.js -
A
Core/Data/Model/DataAppModel.php -
A
Core/Data/Model/InfinitasDataDate.php -
A
Core/Data/Model/InfinitasDataNumber.php -
A
Core/GeoLocation/Config/releases/000091_GeoLocation.php -
A
Core/GeoLocation/Model/GeoLocationAppModel.php -
A
Core/GeoLocation/Model/GeoLocationCountry.php -
A
Core/GeoLocation/Model/GeoLocationRegion.php -
A
Core/GeoLocation/Test/Case/Model/GeoLocationRegionTest.php -
A
Core/GeoLocation/Test/Fixture/GeoLocationCountryFixture.php -
A
Core/GeoLocation/Test/Fixture/GeoLocationRegionFixture.php -
A
Core/GeoLocation/View/Elements/region_select.ctp -
A
Core/InfinitasPayments/Lib/Providers/Offline/OfflineBankTransfer.php -
A
Core/InfinitasPayments/Lib/Providers/Offline/OfflineCashPayments.php -
A
Core/InfinitasPayments/Lib/Providers/Offline/OfflineSocket.php -
A
Core/InfinitasPayments/Test/Case/AllInfinitasPaymentsTestsTest.php -
A
Core/InfinitasPayments/Test/Case/Lib/InfinitasPaymentsEventsTest.php -
A
Core/InfinitasPayments/Test/Case/Model/InfinitasPaymentLogTest.php -
A
Core/Webmaster/Config/releases/000091_Webmaster.php -
A
Core/Webmaster/Controller/WebmasterRedirectsController.php -
A
Core/Webmaster/Doc/broken-urls.md -
A
Core/Webmaster/Model/WebmasterRedirect.php -
A
Core/Webmaster/Test/Case/Controller/WebmasterRedirectsControllerTest.php -
A
Core/Webmaster/Test/Case/Model/WebmasterRedirectTest.php -
A
Core/Webmaster/Test/Fixture/WebmasterRedirectFixture.php -
A
Core/Webmaster/View/WebmasterRedirects/admin_form.ctp -
A
Core/Webmaster/View/WebmasterRedirects/admin_index.ctp -
M
CakePHP -
M
Config/bootstrap.php -
M
Core/Charts/Lib/ChartsEvents.php -
M
Core/Comments/Config/config.php -
M
Core/Comments/View/Elements/modules/comment/module.ctp -
M
Core/Contents/View/GlobalCategories/view.ctp -
M
Core/Emails/Model/EmailAccount.php -
M
Core/Filter/Controller/Component/FilterComponent.php -
M
Core/Filter/Lib/FilterEvents.php -
M
Core/GeoLocation/Config/Schema/schema.php -
M
Core/GeoLocation/Config/config.json -
M
Core/GeoLocation/Config/releases/map.php -
M
Core/GeoLocation/Controller/Component/GeoLocationComponent.php -
M
Core/InfinitasPayments/Config/config.php -
M
Core/InfinitasPayments/Controller/Component/InfinitasPaymentsComponent.php -
M
Core/InfinitasPayments/Model/InfinitasPaymentLog.php -
M
Core/InfinitasPayments/Model/InfinitasPaymentMethod.php -
M
Core/InfinitasPayments/Test/Case/Lib/InfinitasGatewayTest.php -
M
Core/InfinitasPayments/Test/Case/Model/InfinitasPaymentMethodTest.php -
M
Core/InfinitasPayments/Test/Fixture/InfinitasPaymentLogFixture.php -
M
Core/InfinitasPayments/Test/Fixture/InfinitasPaymentMethodFixture.php -
M
Core/InfinitasPayments/View/InfinitasPaymentMethods/admin_form.ctp -
M
Core/InfinitasPayments/View/InfinitasPaymentMethods/admin_index.ctp -
M
Core/Installer/Controller/InstallController.php -
M
Core/Installer/Lib/InstallerEvents.php -
M
Core/Installer/Lib/InstallerLib.php -
M
Core/Installer/Lib/ReleaseVersion.php -
M
Core/Libs/Model/Datasource/XmlSource.php -
M
Core/Modules/View/Helper/ModuleLoaderHelper.php -
M
Core/Newsletter/Config/releases/000092_Newsletter.php -
M
Core/Newsletter/Model/Newsletter.php -
M
Core/Newsletter/Model/NewsletterCampaign.php -
M
Core/Webmaster/Config/Schema/schema.php -
M
Core/Webmaster/Config/config.json -
M
Core/Webmaster/Config/config.php -
M
Core/Webmaster/Config/releases/map.php -
M
Core/Webmaster/Lib/WebmasterEvents.php -
M
Lib/Error/InfinitasExceptionRenderer.php -
M
Plugin/Backlinks -
M
Plugin/Blog -
M
Plugin/Cms -
M
Plugin/InfinitasFaq -
M
Plugin/Shop -
M
Plugin/Twitter -
M
webroot/.htaccess