Jose Lorenzo Rodriguez
|
d83555cc52
|
Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
|
2011-05-04 01:10:23 -04:30 |
|
Jose Lorenzo Rodriguez
|
433e9e7177
|
Fixing typos in time helper translations
|
2011-03-21 00:57:37 -04:30 |
|
AD7six
|
d2badbeb22
|
update language domains
no domain - the thing being translated comes from the app - so let the
user handle that
cake - end user
cake_error - error messages
|
2011-03-19 18:29:31 +01:00 |
|
AD7six
|
28eae99ecb
|
translation changes in the view folder
|
2011-03-12 20:02:56 +01:00 |
|
Jose Lorenzo Rodriguez
|
42b3f993b9
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
|
2011-03-01 23:04:52 -04:30 |
|
José Lorenzo Rodríguez
|
4cebe55a9b
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
app/webroot/index.php
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Network/CakeRequest.php
lib/Cake/tests/cases/libs/controller/components/auth.test.php
|
2011-02-21 22:28:30 -04:30 |
|
José Lorenzo Rodríguez
|
1332561164
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/helpers/js.php
lib/Cake/Console/Command/Task/FixtureTask.php
|
2011-01-09 23:32:05 -04:30 |
|
José Lorenzo Rodríguez
|
599a110d6b
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
|
2011-01-08 22:59:02 -04:30 |
|
José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
3f64844de9
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
|
2010-12-05 23:43:58 -04:30 |
|
José Lorenzo Rodríguez
|
f3eb2159eb
|
Making helpers load
|
2010-12-04 13:40:24 -04:30 |
|
José Lorenzo Rodríguez
|
be9bcb3627
|
Moving view clasess to their new home
|
2010-12-04 13:31:04 -04:30 |
|