Changeset [11ada9d353ac4668f50f1e0a965e48e5f9749057] by dogmatic69
July 16th, 2011 @ 11:13 AM
Merge branch 'beta' of github.com:infinitas/infinitas into beta
Conflicts:
core/contact/views/addresses/admin_index.ctp
core/contact/views/branches/admin_index.ctp
core/contact/views/contacts/admin_index.ctp
core/emails/views/email_accounts/admin_index.ctp
core/emails/views/mail_systems/admin_index.ctp
core/libs/vendors/shells/tasks/infinitas.php
core/libs/views/helpers/infinitas.php
core/management/management_events.php
core/management/views/ip_addresses/admin_index.ctp
core/modules/views/module_positions/admin_index.ctp
core/modules/views/modules/admin_index.ctp
core/routes/views/routes/admin_index.ctp
core/tags/views/tags/admin_index.ctp
developer
https://github.com/infinitas/infinitas/commit/11ada9d353ac4668f50f1...
Committed by dogmatic69
- A core/libs/libs/test/app_controller_test.php
- A core/libs/libs/test/app_model_test.php
- A core/libs/libs/test/app_test.php
- A webroot/css/cake.generic.css
- M app_model.php
- M config/core.php
- M core/categories/views/categories/admin_index.ctp
- M core/comments/views/comments/admin_index.ctp
- M core/configs/configs_events.php
- M core/configs/views/configs/admin_index.ctp
- M core/contact/tests/fixtures/address_fixture.php
- M core/contact/views/addresses/admin_index.ctp
- M core/contact/views/branches/admin_index.ctp
- M core/contact/views/contacts/admin_index.ctp
- M core/contact/views/elements/address_form.ctp
- M core/contents/views/global_contents/admin_index.ctp
- M core/contents/views/global_layouts/admin_index.ctp
- M core/emails/views/email_accounts/admin_index.ctp
- M core/emails/views/mail_systems/admin_index.ctp
- M core/events/libs/app_events.php
- M core/feed/views/feeds/admin_index.ctp
- M core/geo_location/libs/ip_location.php
- M core/installer/vendors/shells/release.php
- M core/libs/controllers/components/infinitas.php
- M core/libs/controllers/components/mass_action.php
- M core/libs/models/behaviors/infinitas.php
- M core/libs/models/behaviors/validation.php
- M core/libs/tests/cases/behaviors/validation.test.php
- M core/libs/vendors/shells/tasks/infinitas.php
- M core/libs/vendors/shells/templates/infinitas/actions/controller_actions.ctp
- M core/libs/views/global/delete.ctp
- M core/libs/views/helpers/infinitas.php
- M core/locks/views/locks/admin_index.ctp
- M core/management/management_events.php
- M core/management/views/ip_addresses/admin_index.ctp
- M core/menus/views/menu_items/admin_index.ctp
- M core/modules/modules_events.php
- M core/modules/views/module_positions/admin_index.ctp
- M core/modules/views/modules/admin_index.ctp
- M core/newsletter/views/campaigns/admin_index.ctp
- M core/newsletter/views/newsletters/admin_index.ctp
- M core/newsletter/views/templates/admin_index.ctp
- M core/routes/routes_events.php
- M core/routes/views/routes/admin_index.ctp
- M core/short_urls/views/short_urls/admin_index.ctp
- M core/tags/views/tags/admin_index.ctp
- M core/themes/themes_events.php
- M core/themes/views/themes/admin_index.ctp
- M core/users/models/user.php
- M core/users/users_events.php
- M core/users/views/elements/add_user.ctp
- M developer
- M plugins/cms
- M plugins/gallery
- M plugins/shop
- M plugins/view_counter
- M tmp/cache/models/empty
- M tmp/cache/persistent/empty
- M tmp/cache/views/empty
- M tmp/logs/empty
- M tmp/sessions/empty
- M tmp/tests/empty
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".