Changeset [71f491f92eba2f254126fcbe875126f9fc707a12] by Ceeram
June 21st, 2012 @ 11:47 AM
Merge branch 'dev' of git://github.com/infinitas/infinitas into dev
Conflicts:
.travis.yml
https://github.com/infinitas/infinitas/commit/71f491f92eba2f254126f...
Committed by Ceeram
- R Core/Libs/Lib/test/AppBehaviorTestCase.php
- R Core/Libs/Lib/test/AppControllerTestCase.php
- R Core/Libs/Lib/test/AppHelperTestCase.php
- R Core/Libs/Lib/test/AppModelTestCase.php
- R Core/Libs/Lib/test/AppTest.php
- M Config/bootstrap.php
- M Config/core.php
- M Console/Command/AppShell.php
- M Controller/AppController.php
- M Core/Assets/Lib/AssetsEvents.php
- M Core/Assets/Lib/JSMin.php
- M Core/Assets/Test/Case/Lib/AssetsEventsTest.php
- M Core/Assets/Test/Case/View/Helper/CompressHelperTest.php
- M Core/Assets/View/Elements/messages/error.ctp
- M Core/Assets/View/Elements/messages/success.ctp
- M Core/Assets/View/Elements/messages/warning.ctp
- M Core/Assets/View/Helper/CompressHelper.php
- M Core/Charts/Lib/ChartDataManipulation.php
- M Core/Charts/Lib/ChartsBaseEngineHelper.php
- M Core/Charts/Test/Case/Lib/ChartDataManipulationTest.php
- M Core/Charts/Test/Case/Lib/ChartsEventsTest.php
- M Core/Charts/View/Helper/ChartsHelper.php
- M Core/Charts/View/Helper/HtmlChartEngineHelper.php
- M Core/Comments/Controller/InfinitasCommentsController.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/Lib/CommentsEventsTest.php
- M Core/Comments/Test/Case/Model/InfinitasCommentAttributeTest.php
- M Core/Comments/Test/Case/Model/InfinitasCommentTest.php
- M Core/Comments/View/Elements/admin/comments/latest.ctp
- M Core/Comments/View/Elements/modules/comment.ctp
- M Core/Comments/View/Elements/profile.ctp
- M Core/Comments/View/Elements/single_comment.ctp
- M Core/Comments/View/InfinitasComments/add.ctp
- M Core/Comments/View/InfinitasComments/admin_index.ctp
- M Core/Comments/View/InfinitasComments/index.ctp
- M Core/Configs/Controller/ConfigsController.php
- M Core/Configs/Lib/ConfigsEvents.php
- M Core/Configs/Model/Config.php
- M Core/Configs/Test/Case/Lib/ConfigsEventsTest.php
- M Core/Configs/Test/Case/Model/ConfigTest.php
- M Core/Configs/View/Configs/admin_available.ctp
- M Core/Configs/View/Configs/admin_edit.ctp
- M Core/Configs/View/Configs/admin_index.ctp
- M Core/Contact/Controller/AddressesController.php
- M Core/Contact/Controller/BranchesController.php
- M Core/Contact/Controller/ContactAppController.php
- M Core/Contact/Controller/ContactsController.php
- M Core/Contact/Lib/ContactEvents.php
- M Core/Contact/Model/Branch.php
- M Core/Contact/Model/ContactAddress.php
- M Core/Contact/Model/TimeZone.php
- M Core/Contact/Test/Case/Controller/BranchesControllerTest.php
- M Core/Contact/Test/Case/Model/ContactAddressTest.php
- M Core/Contact/Test/Case/Model/ContactTest.php
- M Core/Contact/View/Addresses/admin_index.ctp
- M Core/Contact/View/Branches/view.ctp
- M Core/Contact/View/Elements/address_form.ctp
- M Core/Contact/View/Helper/ContactsHelper.php
- M Core/Contents/Controller/ContentsAppController.php
- M Core/Contents/Controller/GlobalCategoriesController.php
- M Core/Contents/Controller/GlobalContentsController.php
- M Core/Contents/Controller/GlobalLayoutsController.php
- M Core/Contents/Controller/GlobalPagesController.php
- M Core/Contents/Lib/ContentsEvents.php
- M Core/Contents/Model/Behavior/ContentableBehavior.php
- M Core/Contents/Model/GlobalCategory.php
- M Core/Contents/Model/GlobalContent.php
- M Core/Contents/Model/GlobalLayout.php
- M Core/Contents/Model/GlobalPage.php
- M Core/Contents/Test/Case/Lib/ContentsEventsTest.php
- M Core/Contents/Test/Case/Model/Behavior/TaggableBehaviorTest.php
- M Core/Contents/Test/Case/Model/GlobalCategoryTest.php
- M Core/Contents/Test/Case/Model/GlobalTaggedTest.php
- M Core/Contents/Test/Case/Model/PageTest.php
- M Core/Contents/Test/Case/View/Helper/TagCloudTest.php
- M Core/Contents/View/Elements/modules/tag_cloud.ctp
- M Core/Contents/View/GlobalCategories/admin_index.ctp
- M Core/Contents/View/GlobalCategories/view.ctp
- M Core/Contents/View/GlobalLayouts/admin_index.ctp
- M Core/Contents/View/GlobalPages/admin_index.ctp
- M Core/Contents/View/GlobalTags/admin_index.ctp
- M Core/Contents/View/Helper/GlobalContentsHelper.php
- M Core/Crons/Console/Command/CronShell.php
- M Core/Crons/Console/Command/Task/CronLockTask.php
- M Core/Crons/Console/Command/Task/CronResourceTask.php
- M Core/Crons/Lib/CronsEvents.php
- M Core/Crons/Model/Cron.php
- M Core/Crons/Test/Case/Lib/CronsEventsTest.php
- M Core/Crons/Test/Case/Model/CronTest.php
- M Core/Data/Lib/ClearCache.php
- M Core/Data/Lib/DataEvents.php
- M Core/Data/View/Helper/CsvHelper.php
- M Core/Emails/Controller/EmailAccountsController.php
- M Core/Emails/Controller/MailSystemsController.php
- M Core/Emails/Lib/AttachmentDownloader.php
- M Core/Emails/Lib/EmailSocket.php
- M Core/Emails/Lib/EmailsEvents.php
- M Core/Emails/Lib/ParseMail.php
- M Core/Emails/Lib/drivers/Pop3Socket.php
- M Core/Emails/Model/Datasource/EmailSource.php
- M Core/Emails/Model/Datasource/ImapSource.php
- M Core/Emails/Model/EmailAccount.php
- M Core/Emails/Model/MailSystem.php
- M Core/Emails/View/EmailAccounts/admin_index.ctp
- M Core/Emails/View/Helper/EmailAttachmentsHelper.php
- M Core/Emails/View/MailSystems/admin_dashboard.ctp
- M Core/Emails/View/MailSystems/admin_get_mail.ctp
- M Core/Emails/View/MailSystems/admin_index.ctp
- M Core/Events/Console/Command/Task/EventTask.php
- M Core/Events/Lib/AppEvents.php
- M Core/Events/Lib/EventCore.php
- M Core/Events/Lib/EventsEvents.php
- M Core/Events/Model/Behavior/EventBehavior.php
- M Core/Events/Test/Case/Controller/Component/EventComponentTest.php
- M Core/Events/Test/Case/Libs/EventCoreTest.php
- M Core/Events/Test/Case/Model/Behavior/EventBehaviorTest.php
- M Core/Events/Test/Case/View/Helper/EventHelperTest.php
- M Core/Events/View/Helper/EventHelper.php
- M Core/Feed/Controller/FeedsController.php
- M Core/Feed/Lib/FeedEvents.php
- M Core/Feed/Model/Behavior/FeedableBehavior.php
- M Core/Feed/Model/Feed.php
- M Core/Feed/View/Elements/modules/latest_news.ctp
- M Core/Feed/View/Feeds/admin_index.ctp
- M Core/Feed/View/Feeds/index.ctp
- M Core/Feed/View/Feeds/rss/get_feed.ctp
- M Core/Filemanager/Controller/FilemanagerController.php
- M Core/Filemanager/Lib/FilemanagerEvents.php
- M Core/Filemanager/Model/Files.php
- M Core/Filemanager/Model/Folders.php
- M Core/Filemanager/Test/Case/Model/Behavior/UploadBehaviorTest.php
- M Core/Filemanager/View/Filemanager/admin_index.ctp
- M Core/Filemanager/View/Filemanager/admin_view.ctp
- M Core/Filter/Controller/Component/FilterComponent.php
- M Core/Filter/Lib/FilterEvents.php
- M Core/Filter/Model/Behavior/FilterBehavior.php
- M Core/Filter/View/Helper/FilterHelper.php
- M Core/GeoLocation/Controller/Component/GeoLocationComponent.php
- M Core/GeoLocation/Lib/GeoLocationEvents.php
- M Core/GeoLocation/Lib/IpLocation.php
- M Core/Google/Lib/GoogleApiBase.php
- M Core/Google/Lib/GoogleEvents.php
- M Core/Google/Model/Datasource/GoogleContactsSource.php
- M Core/Google/Test/Case/View/Helper/GoogleStaticChartEngineHelperTest.php
- M Core/Google/View/Helper/AnalyticsHelper.php
- M Core/Google/View/Helper/ChartHelper.php
- M Core/Google/View/Helper/GoogleAppHelper.php
- M Core/Google/View/Helper/GoogleStaticChartEngineHelper.php
- M Core/Google/View/Helper/StaticMapHelper.php
- M Core/Installer/Console/Command/InstallShell.php
- M Core/Installer/Console/Command/ReleaseShell.php
- M Core/Installer/Console/Command/Task/InfinitasPluginTask.php
- M Core/Installer/Console/Command/Task/InfinitasReleaseStatusTask.php
- M Core/Installer/Console/Command/Task/InstallerTask.php
- M Core/Installer/Console/Command/Task/MigrationTask.php
- M Core/Installer/Controller/InstallController.php
- M Core/Installer/Controller/PluginsController.php
- M Core/Installer/Lib/InstallerEvents.php
- M Core/Installer/Lib/InstallerLib.php
- M Core/Installer/Model/Plugin.php
- M Core/Installer/Test/Case/Libs/InstallerTest.php
- M Core/Installer/View/Plugins/admin_index.ctp
- M Core/Libs/Console/Command/InfinitasFixturesShell.php
- M Core/Libs/Console/Command/Task/InfinitasFixtureBakeTask.php
- M Core/Libs/Console/Templates/infinitas/actions/controller_actions.ctp
- M Core/Libs/Console/Templates/infinitas/classes/controller.ctp
- M Core/Libs/Console/Templates/infinitas/classes/model.ctp
- M Core/Libs/Console/Templates/infinitas/views/form.ctp
- M Core/Libs/Console/Templates/infinitas/views/index.ctp
- M Core/Libs/Controller/Component/InfinitasActionsComponent.php
- M Core/Libs/Controller/Component/InfinitasComponent.php
- M Core/Libs/Controller/Component/MassActionComponent.php
- M Core/Libs/Controller/Component/VoucherComponent.php
- M Core/Libs/Lib/LibsEvents.php
- M Core/Libs/Model/Behavior/AutomaticAssociationBehavior.php
- M Core/Libs/Model/Behavior/CopyableBehavior.php
- M Core/Libs/Model/Behavior/InfiniTreeBehavior.php
- M Core/Libs/Model/Behavior/InfinitasBehavior.php
- M Core/Libs/Model/Behavior/PublishableBehavior.php
- M Core/Libs/Model/Behavior/RateableBehavior.php
- M Core/Libs/Model/Behavior/SequenceBehavior.php
- M Core/Libs/Model/Behavior/TicketableBehavior.php
- M Core/Libs/Model/Behavior/ValidationBehavior.php
- M Core/Libs/Model/Datasource/JsonSource.php
- M Core/Libs/Model/Datasource/ReaderSource.php
- M Core/Libs/Test/Case/Model/Behavior/CopyableTest.php
- M Core/Libs/Test/Case/Model/Behavior/InfinitasTest.php
- M Core/Libs/Test/Case/Model/Behavior/LockableTest.php
- M Core/Libs/Test/Case/Model/Behavior/ValidationTest.php
- M Core/Libs/View/Global/delete.ctp
- M Core/Libs/View/Global/move.ctp
- M Core/Libs/View/Helper/DesignHelper.php
- M Core/Libs/View/Helper/InfinitasHelper.php
- M Core/Libs/View/Helper/WysiwygHelper.php
- M Core/Libs/View/InfinitasView.php
- M Core/Libs/View/JsonView.php
- M Core/Locks/Controller/Component/LockerComponent.php
- M Core/Locks/Controller/LocksController.php
- M Core/Locks/Lib/LocksEvents.php
- M Core/Locks/Model/Behavior/LockableBehavior.php
- M Core/Locks/View/Helper/LockedHelper.php
- M Core/Management/Controller/ManagementController.php
- M Core/Management/Lib/ManagementEvents.php
- M Core/Management/Model/Relation.php
- M Core/Management/View/Acos/admin_index.ctp
- M Core/Management/View/Elements/modules/rate.ctp
- M Core/Menus/Controller/MenuItemsController.php
- M Core/Menus/Controller/MenusController.php
- M Core/Menus/Lib/MenusEvents.php
- M Core/Menus/Model/MenuItem.php
- M Core/Menus/View/Elements/modules/admin/dashboard_icons.ctp
- M Core/Menus/View/Elements/modules/admin/dock.ctp
- M Core/Menus/View/Elements/modules/admin/menu.ctp
- M Core/Menus/View/Elements/modules/admin/todo.ctp
- M Core/Menus/View/Elements/modules/main_menu.ctp
- M Core/Menus/View/Helper/MenuHelper.php
- M Core/Menus/View/MenuItems/admin_index.ctp
- M Core/Modules/Controller/ModulePositionsController.php
- M Core/Modules/Controller/ModulesController.php
- M Core/Modules/Lib/ModulesEvents.php
- M Core/Modules/Model/Module.php
- M Core/Modules/Model/ModulePosition.php
- M Core/Modules/Test/Case/Models/ModuleTest.php
- M Core/Modules/View/Helper/ModuleLoaderHelper.php
- M Core/Modules/View/Modules/admin_index.ctp
- M Core/Newsletter/Controller/CampaignsController.php
- M Core/Newsletter/Controller/Component/EmailerComponent.php
- M Core/Newsletter/Controller/NewslettersController.php
- M Core/Newsletter/Controller/TemplatesController.php
- M Core/Newsletter/Lib/NewsletterEvents.php
- M Core/Newsletter/Model/Template.php
- M Core/Newsletter/View/Campaigns/admin_index.ctp
- M Core/Newsletter/View/Newsletters/admin_index.ctp
- M Core/Newsletter/View/Templates/admin_index.ctp
- M Core/Newsletter/View/Templates/admin_view.ctp
- M Core/Routes/Lib/RoutesEvents.php
- M Core/Routes/Model/Route.php
- M Core/Routes/Routing/InfinitasRouter.php
- M Core/Routes/Test/Case/Model/RouteTest.php
- M Core/Routes/View/Routes/admin_index.ctp
- M Core/Security/Controller/Component/InfinitasSecurityComponent.php
- M Core/Security/Model/Behavior/EncryptableBehavior.php
- M Core/Security/Model/IpAddress.php
- M Core/Security/Test/Case/Model/Behavior/EncryptableBehaviorTest.php
- M Core/ServerStatus/Controller/DatabasesController.php
- M Core/ServerStatus/Controller/ServerStatusController.php
- M Core/ServerStatus/Lib/ServerStatusEvents.php
- M Core/ServerStatus/Model/ServerStatus.php
- M Core/ServerStatus/View/Databases/admin_mysql.ctp
- M Core/ServerStatus/View/Elements/modules/admin/by_day.ctp
- M Core/ServerStatus/View/Elements/modules/admin/by_hour.ctp
- M Core/ServerStatus/View/Elements/modules/admin/last_six_months.ctp
- M Core/ServerStatus/View/Elements/modules/admin/last_two_weeks.ctp
- M Core/ServerStatus/View/Php/admin_apc.ctp
- M Core/ShortUrls/Controller/ShortUrlsController.php
- M Core/ShortUrls/Lib/ShortUrlsEvents.php
- M Core/ShortUrls/Model/ShortUrl.php
- M Core/ShortUrls/View/ShortUrls/admin_index.ctp
- M Core/Themes/Controller/Component/ThemesComponent.php
- M Core/Themes/Controller/ThemesController.php
- M Core/Themes/Lib/ThemesEvents.php
- M Core/Themes/Model/Theme.php
- M Core/Themes/Test/Case/Model/ThemeTest.php
- M Core/Trash/Controller/TrashController.php
- M Core/Trash/Lib/TrashEvents.php
- M Core/Users/Controller/Component/VisitorComponent.php
- M Core/Users/Controller/GroupsController.php
- M Core/Users/Controller/UsersController.php
- M Core/Users/Lib/UsersEvents.php
- M Core/Users/Model/User.php
- M Core/Users/Test/Case/Controller/GroupsControllerTest.php
- M Core/Users/Test/Case/Model/UserTest.php
- M Core/Users/View/Elements/login.ctp
- M Core/Users/View/Groups/admin_index.ctp
- M Core/Users/View/Users/admin_login.ctp
- M Core/Users/View/Users/register.ctp
- M Core/Users/View/Users/reset_password.ctp
- M Core/Users/View/Users/view.ctp
- M Core/ViewCounter/Controller/Component/ViewCounterComponent.php
- M Core/ViewCounter/Controller/ViewCounterViewsController.php
- M Core/ViewCounter/Lib/ViewCounterEvents.php
- M Core/ViewCounter/Model/Behavior/ViewableBehavior.php
- M Core/ViewCounter/Model/Behavior/ViewableReportingBehavior.php
- M Core/ViewCounter/Model/ViewCounterView.php
- M Core/ViewCounter/View/Elements/modules/admin/overall.ctp
- M Core/ViewCounter/View/Elements/modules/admin/popular_items.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/day_of_month.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/day_of_week.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/hour_on_hour.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/month_on_month.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/overview.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/week_on_week.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/world_map.ctp
- M Core/ViewCounter/View/Elements/modules/admin/reports/year_on_year.ctp
- M Core/ViewCounter/View/Helper/ViewCounterHelper.php
- M Core/ViewCounter/View/ViewCounterViews/admin_reports.ctp
- M Core/Webmaster/Controller/RobotsController.php
- M Core/Webmaster/Controller/SiteMapsController.php
- M Core/Webmaster/Controller/WebmasterController.php
- M Core/Webmaster/Lib/WebmasterEvents.php
- M Developer
- M Lib/InfinitasPlugin.php
- M Model/AppModel.php
- M Plugin/Backlinks
- M Plugin/Blog
- M Plugin/Cms
- M Plugin/DebugKit
- M Plugin/Gallery
- M Plugin/InfinitasFaq
- M Plugin/Twitter
- M Plugin/WysiwygCkEditor
- M Plugin/WysiwygTinyMce
- M Test/Case/AppControllerTest.php
- M Test/Case/AppModelTest.php
- M View/Helper/AppHelper.php
- M View/Layouts/admin_login.ctp
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Please use this for the current version of Infinitas only, if you are using a older version of the Infinitas report bugs in that project.
Please submit bugs only as pending, and if its a feature request submit the ticket with the milestone "Feature Requests".