Changeset [b5edea0bdc63b307c15f00a6e1b90e9b5741c3fb] by dogmatic69
Revision b5edea0bdc63b307c15f00a6e1b90e9b5741c3fb,
committed by dogmatic69
· November 17th, 2012 @ 04:00 AM
Merge branch 'php5.4' into dev
https://github.com/infinitas/infinitas/commit/b5edea0bdc63b307c15f0...
138 changed files
-
M
.gitignore -
M
Core/Assets/Lib/AssetsEvents.php -
M
Core/Assets/Test/Case/View/Helper/CompressHelperTest.php -
M
Core/Assets/webroot/js/infinitas.js -
M
Core/Charts/Lib/ChartsEvents.php -
M
Core/Charts/Test/Case/Lib/ChartDataManipulationTest.php -
M
Core/Charts/Test/Case/Lib/ChartsBaseEngineHelperTest.php -
M
Core/Charts/Test/Case/View/Helper/ChartsHelperTest.php -
M
Core/Charts/Test/Case/View/Helper/HtmlChartEngineHelperTest.php -
M
Core/Comments/Lib/CommentsEvents.php -
M
Core/Comments/Model/Behavior/CommentableBehavior.php -
M
Core/Comments/Model/InfinitasComment.php -
M
Core/Comments/Test/Case/Model/InfinitasCommentAttributeTest.php -
M
Core/Comments/Test/Case/Model/InfinitasCommentTest.php -
M
Core/Configs/Lib/ConfigsEvents.php -
M
Core/Configs/Test/Case/Model/ConfigTest.php -
M
Core/Contact/Lib/ContactEvents.php -
M
Core/Contact/Model/TimeZone.php -
M
Core/Contact/Test/Case/Model/BranchTest.php -
M
Core/Contact/Test/Case/Model/ContactAddressTest.php -
M
Core/Contact/Test/Case/Model/ContactTest.php -
M
Core/Contact/Test/Case/View/Helper/ContactsHelperTest.php -
M
Core/Contact/Test/Case/View/Helper/VcfHelperTest.php -
M
Core/Contents/Controller/Component/GlobalContentsComponent.php -
M
Core/Contents/Lib/ContentsEvents.php -
M
Core/Contents/Model/Behavior/ContentableBehavior.php -
M
Core/Contents/Model/Behavior/TaggableBehavior.php -
M
Core/Contents/Model/GlobalLayout.php -
M
Core/Contents/Model/GlobalPage.php -
M
Core/Contents/Test/Case/Model/Behavior/CategorisableBehaviorTest.php -
M
Core/Contents/Test/Case/Model/Behavior/TaggableBehaviorTest.php -
M
Core/Contents/Test/Case/Model/GlobalCategoryTest.php -
M
Core/Contents/Test/Case/Model/GlobalTagTest.php -
M
Core/Contents/Test/Case/Model/PageTest.php -
M
Core/Contents/Test/Case/View/Helper/TagCloudTest.php -
M
Core/Contents/View/Helper/GlobalContentsHelper.php -
M
Core/Crons/Lib/CronsEvents.php -
M
Core/Data/Lib/DataEvents.php -
M
Core/Data/Model/Behavior/BigDataBehavior.php -
M
Core/Emails/Lib/EmailsEvents.php -
M
Core/Emails/Model/Datasource/EmailSource.php -
M
Core/Events/Lib/AppEvents.php -
M
Core/Events/Lib/EventCore.php -
M
Core/Events/Lib/EventsEvents.php -
M
Core/Events/Test/Case/Controller/Component/EventComponentTest.php -
M
Core/Events/Test/Case/Lib/EventCoreTest.php -
M
Core/Events/Test/Case/Model/Behavior/EventBehaviorTest.php -
M
Core/Events/Test/Case/View/Helper/EventHelperTest.php -
M
Core/Events/Test/Lib/InfinitasEventTestCase.php -
M
Core/Feed/Lib/FeedEvents.php -
M
Core/Filemanager/Lib/FilemanagerEvents.php -
M
Core/Filemanager/Model/Behavior/UploadBehavior.php -
M
Core/Filemanager/Test/Case/Model/Behavior/UploadBehaviorTest.php -
M
Core/Filter/Controller/Component/FilterComponent.php -
M
Core/Filter/Lib/FilterEvents.php -
M
Core/GeoLocation/Lib/IpLocation.php -
M
Core/Google/Lib/GoogleEvents.php -
M
Core/Google/Test/Case/View/Helper/GoogleStaticChartEngineHelperTest.php -
M
Core/Google/View/Helper/GoogleStaticChartEngineHelper.php -
M
Core/Installer/Lib/InstallerEvents.php -
M
Core/Installer/Lib/InstallerLib.php -
M
Core/Installer/Model/Install.php -
M
Core/Libs/Console/Command/Task/ProgressBarTask.php -
M
Core/Libs/Controller/Component/InfinitasComponent.php -
M
Core/Libs/Controller/Component/VoucherComponent.php -
M
Core/Libs/Controller/Component/WizardComponent.php -
M
Core/Libs/Lib/LibsEvents.php -
M
Core/Libs/Model/Behavior/CopyableBehavior.php -
M
Core/Libs/Model/Behavior/ExpandableBehavior.php -
M
Core/Libs/Model/Behavior/InfiniTreeBehavior.php -
M
Core/Libs/Model/Behavior/LogableBehavior.php -
M
Core/Libs/Model/Behavior/PublishableBehavior.php -
M
Core/Libs/Model/Behavior/ReviewableBehavior.php -
M
Core/Libs/Model/Behavior/RevisionBehavior.php -
M
Core/Libs/Model/Behavior/SequenceBehavior.php -
M
Core/Libs/Model/Behavior/SluggableBehavior.php -
M
Core/Libs/Model/Behavior/TicketableBehavior.php -
M
Core/Libs/Model/Datasource/ReaderSource.php -
M
Core/Libs/Test/Case/Console/Command/Tasks/ProgressBarTaskTest.php -
M
Core/Libs/Test/Case/Model/Behavior/CopyableBehaviorTest.php -
M
Core/Libs/Test/Case/Model/Behavior/ValidationBehaviorTest.php -
M
Core/Libs/Test/Case/View/Helper/TreeHelperTest.php -
M
Core/Libs/View/Helper/GravatarHelper.php -
M
Core/Locks/Controller/Component/LockerComponent.php -
M
Core/Locks/Lib/LocksEvents.php -
M
Core/Locks/Model/Lock.php -
M
Core/Locks/Test/Case/Model/Behavior/LockableTest.php -
M
Core/Management/Lib/ManagementEvents.php -
M
Core/Management/Test/Case/Model/LogTest.php -
M
Core/Menus/Lib/MenusEvents.php -
M
Core/Menus/View/Helper/MenuHelper.php -
M
Core/Migrations/Test/Case/Libs/MigrationVersionTest.php -
M
Core/Migrations/Test/Case/Vendors/Shells/MigrationShellTest.php -
M
Core/Modules/Lib/ModulesEvents.php -
M
Core/Modules/Test/Case/Model/ModulePositionTest.php -
M
Core/Modules/Test/Case/Model/ModuleTest.php -
M
Core/Newsletter/Controller/Component/EmailerComponent.php -
M
Core/Newsletter/Lib/NewsletterEvents.php -
M
Core/Routes/Lib/RoutesEvents.php -
M
Core/Routes/Routing/InfinitasRouter.php -
M
Core/Routes/Test/Case/Model/RouteTest.php -
M
Core/Security/Controller/Component/InfinitasSecurityComponent.php -
M
Core/Security/Model/Behavior/EncryptableBehavior.php -
M
Core/ServerStatus/Lib/ServerStatusEvents.php -
M
Core/ShortUrls/Lib/ShortUrlsEvents.php -
M
Core/Themes/Lib/ThemesEvents.php -
M
Core/Themes/Model/Theme.php -
M
Core/Themes/Test/Case/Model/ThemeTest.php -
M
Core/Trash/Lib/TrashEvents.php -
M
Core/Trash/Model/Behavior/SoftDeletableBehavior.php -
M
Core/Trash/Model/Behavior/TrashableBehavior.php -
M
Core/Users/Lib/UsersEvents.php -
M
Core/Users/Model/User.php -
M
Core/Users/Test/Case/Model/UserTest.php -
M
Core/ViewCounter/Lib/ViewCounterEvents.php -
M
Core/ViewCounter/Model/Behavior/ViewableBehavior.php -
M
Core/ViewCounter/Model/Behavior/ViewableReportingBehavior.php -
M
Core/Webmaster/Lib/WebmasterEvents.php -
M
Developer/Dev -
M
Developer/Dummy -
M
Developer/InfinitasDocs -
M
Developer/Xhprof -
M
Plugin/Backlinks -
M
Plugin/Blog -
M
Plugin/Cms -
M
Plugin/DebugKit -
M
Plugin/Gallery -
M
Plugin/InfinitasFaq -
M
Plugin/InfinitasJobs -
M
Plugin/InfinitasPiwik -
M
Plugin/Thickbox -
M
Plugin/Twitter -
M
Plugin/WysiwygCkEditor -
M
Plugin/WysiwygTinyMce -
M
Test/Case/AppControllerTest.php -
M
Test/Case/AppHelperHelperTest.php -
M
Test/Case/BootstrapFunctionsTest.php -
M
View/Helper/AppHelper.php