Commit graph

11504 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
6196e74339 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-28 22:59:00 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29 Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite 2011-09-28 22:57:50 -04:30
mark_story
dff45740ea Add 'trace' to the data provided to Debugger formats.
Allows custom debugger output formats to display
a stack trace.
2011-09-28 23:26:38 -04:00
mark_story
9e080951b1 Adding additional documentation for CrudAuthorize.
Fixes #2034
2011-09-28 23:25:14 -04:00
mark_story
864cb70645 Moving basic templates to the 'base' key. 2011-09-28 23:25:14 -04:00
Jose Lorenzo Rodriguez
6b7c752478 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-28 21:23:43 -04:30
Jose Lorenzo Rodriguez
df2ef0e4f1 Bringing the SQlserver datasource up to date, fixing a doc block 2011-09-28 21:23:06 -04:30
José Lorenzo Rodríguez
aa6d6a9918 Merge pull request #221 from majna/2.0-doc-comments
Fixed doc block comments.
2011-09-28 14:07:46 -07:00
Majna
681207e327 Fixed doc block comments. 2011-09-28 22:33:46 +02:00
mark_story
08b974d64b Adding the _x and _y fields to the unlocked fields
for image submits.
Fixes #2032
2011-09-27 21:14:36 -04:00
mark_story
6e22f1d0a8 Excluding hidden files from test directory adding.
Fixes #2031
2011-09-27 20:43:47 -04:00
mark_story
421a2116be Adding error code checking around CakeException handling
SocketExceptions can have error codes outside of the HTTP values.
2011-09-27 20:39:32 -04:00
Renan Gonçalves aka renan.saddam
2bce6149e9 Merge pull request #217 from majna/2.0-test-suite
Fixing failing test.
2011-09-27 14:54:56 -07:00
Majna
8d6fc84135 Fixing failing test for Router. Debugger test fails on windows due to different directory separator. 2011-09-27 23:47:44 +02:00
ADmad
33030a4502 Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677, #573 2011-09-28 02:58:48 +05:30
mark_story
7e44836837 Fixing failing test. 2011-09-26 21:46:25 -04:00
mark_story
6008e0e8a0 Adding quoting around SET NAMES.
Fixes #2028
2011-09-26 21:46:16 -04:00
mark_story
a5fe702624 Updating CrudAuthorize to work like ActionsAuthorize.
Updating tests.
Fixes #1749
2011-09-26 20:38:38 -04:00
ADmad
2a554237f4 Improving error view. Closes #2027 2011-09-26 11:49:49 +05:30
mark_story
79687a2dcf Making locking file caching the default.
Locking files prevents many issues with unserialize() warnings
caused by partially written files.
Fix a locking issue where files would be left locked.
Fixes #1988
2011-09-25 09:26:32 -04:00
mark_story
b1dad6e5bd Adding session renewal upon login/logout.
This helps improve session security, as it reduces the opportunity
of replaying a session id successfully.
Fixes #836
2011-09-24 22:35:21 -04:00
mark_story
50a0a51f53 Renaming method to better match what it does. 2011-09-24 21:56:37 -04:00
mark_story
dffcf048d9 Fix incorrect documentation. 2011-09-24 12:06:44 -04:00
mark_story
8272758eb9 Adding block to home page for PHP version.
Fixes #2010
2011-09-24 10:41:22 -04:00
ADmad
1d56afca11 Merge pull request #211 from basuke/2.0
Added tests for saveAll() to ensure it did not set foreignkey fields to null for associated models during validation (bug existed in 1.3)
2011-09-23 06:37:45 -07:00
Yosuke Basuke Suzuki
5612d411f3 Added unittest for saveAll() validation with the data no id assigned. 2011-09-23 22:23:26 +09:00
mark_story
36928d35f9 Redoing fix done in 155968349f
Adding more test cleanup to try and solve build issues.
2011-09-22 22:05:36 -04:00
mark_story
eccc05d8b1 Revert previous commit. Trying to fix jenkins build. 2011-09-22 21:39:00 -04:00
mark_story
155968349f Skip . and .. when generating trees.
Fixes #2012
2011-09-22 21:14:27 -04:00
Renan Gonçalves
0bcb8d0dfa Improving the regex and moving more files around.
- Making the regex case insensitive so it can also matches capital C in class (ie. Class).
- Adding a new protected method to move view files, the directory will be camelized.
2011-09-22 15:03:42 +02:00
mark_story
ceed424770 Updating doc blocks. 2011-09-21 22:30:02 -04:00
Jose Lorenzo Rodriguez
90d86678fa Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-21 13:32:03 -04:30
Jose Lorenzo Rodriguez
c45538ab08 Making CakePlugin::loadAll() static as its fellow class methods 2011-09-21 13:31:11 -04:30
José Lorenzo Rodríguez
b1f8d21434 Fixing doc block in core AppController file 2011-09-21 07:52:17 -05:30
mark_story
7cabb4e4d5 Extracting password hashing into as separate method.
This makes is much easier for a subclass to only change how passwords
are hashed.
2011-09-21 07:38:22 -04:00
Jelle Henkens
957a75c45e Removing PHP4 compatibility code
Signed-off-by: mark_story <mark@mark-story.com>
2011-09-20 21:10:32 -04:00
mark_story
bfcfeeb3ab Updating package names in bootstrap file. 2011-09-20 20:16:06 -04:00
Renan Gonçalves
1b2b191212 Updating cake.generic.css to its newest version from app directory. 2011-09-20 20:29:55 +02:00
José Lorenzo Rodríguez
69934a09f3 Merge pull request #204 from petteyg/2.0-postgres_inet
2.0 - Add validation guess for Postgress inet field
2011-09-20 10:53:20 -07:00
Gordon Pettey (petteyg)
744558de90 Add validation guess for Postgress inet field 2011-09-20 17:45:35 +00:00
Jose Lorenzo Rodriguez
b3157cdd71 Releasing 2.0.0-RC2 2011-09-18 16:54:14 -04:30
Jose Lorenzo Rodriguez
8ccf90437a Typo in last commit. Making flexible the range for memory usage in theme view after changing internal templates 2011-09-18 16:43:00 -04:30
Jose Lorenzo Rodriguez
a2daa39a98 Making theme test more flexible so it passes after recent changes in templates 2011-09-18 16:37:17 -04:30
mark_story
8d43764801 Fix issue with duplicate associations when using string form.
Fixes #2002
2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.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/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
ADmad
670fea6e37 Fixing doc block 2011-09-18 19:58:47 +05:30
mark_story
26d80debcd Adding test case for functions in condition keys.
Closes #1718
2011-09-17 16:46:32 -04:00
ADmad
08026e5828 The 'default' config for Configure class is now auto created on first use if not already created. 2011-09-18 00:06:37 +05:30
mark_story
0e5797d69d Make full page caching + Themes work.
Dispatcher now uses ThemeView for rendering cache files.
This enables nocache blocks to reference theme elements.
Fixes #1858
2011-09-17 13:19:43 -04:00
mark_story
85b86cb282 Fix entity names for associated model date fields.
Fixes #1993
2011-09-17 12:29:21 -04:00