Changeset [90f6193032766243ad6bd5c33be387bafed4c33c] by dogmatic69
Revision 90f6193032766243ad6bd5c33be387bafed4c33c,
committed by dogmatic69
· February 17th, 2012 @ 06:24 PM
Merge branch 'beta' of github.com:infinitas/infinitas into beta
Conflicts:
Controller/AppController.php
https://github.com/infinitas/infinitas/commit/90f6193032766243ad6bd...
46 changed files
-
A
Core/Comments/Test/Case/AllCommentsTestsTest.php -
A
Core/Comments/Test/Case/Controller/InfinitasCommentsControllerTest.php -
A
Core/Comments/Test/Case/Lib/CommentsEventsTest.php -
A
Core/Comments/Test/Case/Model/Behavior/CommentableBehaviorTest.php -
A
Core/Comments/Test/Case/Model/InfinitasCommentAttributeTest.php -
A
Core/Comments/Test/Case/Model/InfinitasCommentTest.php -
A
Core/Comments/Test/Fixture/InfinitasCommentAttributeFixture.php -
A
Core/Comments/Test/Fixture/InfinitasCommentFixture.php -
A
Core/Configs/Test/Case/AllConfigsTestsTest.php -
A
Core/Configs/Test/Case/Controller/ConfigsControllerTest.php -
A
Core/Configs/Test/Case/Lib/ConfigsEventsTest.php -
A
Core/Configs/Test/Case/Model/ConfigTest.php -
A
Core/Contact/Test/Case/AllContactTestsTest.php -
A
Core/Contact/Test/Case/Controller/BranchesControllerTest.php -
A
Core/Contact/Test/Case/Controller/ContactsControllerTest.php -
A
Core/Contact/Test/Case/Model/AddressTest.php -
A
Core/Contact/Test/Case/Model/BranchTest.php -
A
Core/Contact/Test/Case/Model/ContactTest.php -
A
Core/Contact/Test/Case/View/Helper/ContactsHelperTest.php -
A
Core/Contact/Test/Case/View/Helper/VcfHelperTest.php -
R
Core/Comments/Test/Case/Controllers/CommentsControllerTest.php -
R
Core/Comments/Test/Case/CommentsEventsTest.php -
R
Core/Comments/Test/Case/Behaviors/CommentableTest.php -
R
Core/Comments/Test/Case/Models/CommentTest.php -
R
Core/Comments/Test/Case/Models/CommentAttributeTest.php -
R
Core/Comments/Test/Fixture/CommentAttributeFixture.php -
R
Core/Comments/Test/Fixture/CommentFixture.php -
R
Core/Configs/Test/Case/Controllers/ConfigsControllerTest.php -
R
Core/Configs/Test/Case/ConfigsEventsTest.php -
R
Core/Configs/Test/Case/Models/ConfigTest.php -
R
Core/Contact/Test/Case/Controllers/BranchesControllerTest.php -
R
Core/Contact/Test/Case/Controllers/ContactsControllerTest.php -
R
Core/Contact/Test/Case/Helpers/ContactsTest.php -
R
Core/Contact/Test/Case/Helpers/VcfTest.php -
R
Core/Contact/Test/Case/Models/ContactTest.php -
R
Core/Contact/Test/Case/Models/AddressTest.php -
R
Core/Contact/Test/Case/Models/BranchTest.php -
M
Controller/AppController.php -
M
Core/Comments/Controller/CommentsAppController.php -
M
Core/Comments/Controller/InfinitasCommentsController.php -
M
Core/Comments/Model/Behavior/CommentableBehavior.php -
M
Core/Comments/Model/InfinitasComment.php -
M
Core/Configs/Controller/ConfigsAppController.php -
M
Core/Contact/Controller/ContactAppController.php -
M
Core/Contact/View/Helper/ContactsHelper.php -
M
Core/Contact/View/Helper/VcfHelper.php