Commit graph

11224 commits

Author SHA1 Message Date
mark_story
d93c8cb200 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
ef4826eb70 Making Model::find('count') behave nicely when 'group' key is specified in options. Closes #1677 2011-08-14 07:37:23 +05:30
ADmad
5d79299362 For paging links the 'class' attribute is now always applied to the wrapping tag for consistency. Closes #1759 2011-08-14 05:09:57 +05:30
ADmad
b781762903 Fixing regression in Set::extract(). Refs #1895, #1816, #1692. 2011-08-14 03:11:55 +05:30
ADmad
7983b4109b Data returned by Model::save() not contains primary key too when new record is created. Closes #1869 2011-08-14 02:56:08 +05:30
ADmad
2a2a4ab3cc Merge pull request #176 from martin-ueding/1.3
Added commented "encoding" => "utf8" to default db config
2011-08-13 09:26:57 -07:00
Martin Ueding
00a77b41f5 prepared utf8 database connection option 2011-08-13 17:13:27 +02:00
mark_story
fdacc9de16 Fixing issues with request stack not being used correctly
when there are requestAction requests being performed.
Adding Router::popRequest() to allow manipulation of request stack
so nested requestAction or serial requestAction calls work correctly.
Fixes #1906
2011-08-12 21:21:05 -04:00
mark_story
3014d3fb84 Fixing issues with CSRF token failure and requestAction.
Fixes #1900
2011-08-12 20:38:24 -04:00
mark_story
1df8de683d Fixing notice error when all csrf tokens are expired at once.
Fixes #1901
2011-08-11 23:06:18 -04:00
Jose Lorenzo Rodriguez
1726bad396 Adding ability to Set class to iterate on ArrayObjects, or any object implementing ArrayAccess and Traversable 2011-08-11 13:26:06 -04:30
Jose Lorenzo Rodriguez
9b6ea7dc45 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-08-11 13:17:19 -04:30
Jose Lorenzo Rodriguez
3d461724cf Re-adding primaryKey detection support to FormHelper, it was removed mistakenly in last refactor 2011-08-11 12:13:01 -04:30
Mark Story
6026aa4019 Adding tests for FormHelper::postButton() and SecurityComponent. 2011-08-10 22:00:02 -04:00
Mark Story
2ce2d06de2 Fixing issue where postLink() would fail when used with SecurityComponent. 2011-08-10 21:53:33 -04:00
Mark Story
e9382d0897 Fixing failing tests. 2011-08-10 21:40:53 -04:00
ADmad
8d8d64ac80 Merge pull request #169 from kamui545/patch-1
Adding support for url input
2011-08-10 08:10:25 -07:00
Renan Gonçalves aka renan.saddam
9e2db27b57 Merge pull request #171 from majna/2.0-cache-config
Added doc blocks for WincacheEngine. Fixed Memcache doc block.
2011-08-10 08:00:27 -07:00
Majna
826001adc7 Added doc blocks for WincacheEngine. Fixed Memcache doc block. 2011-08-10 16:55:05 +02:00
ADmad
392102b71f Fixing regression in Set::extract(). Closes #1895 #1816 #1692 2011-08-10 03:56:45 +05:30
Maggion Emmanuel
27734507e4 Adding test case 2011-08-09 20:47:25 +03:00
Maggion Emmanuel
6cd89b0992 Edited lib/Cake/View/Helper/FormHelper.php via GitHub 2011-08-09 17:59:55 +03:00
Renan Gonçalves aka renan.saddam
ed8daf852b Merge pull request #170 from majna/2.0-i18n-domain
Fixed wrong i18n domain param: 'cake_developer'
2011-08-09 07:32:52 -07:00
Majna
48e681424f Fix for wrong 'cake_dev' i18n domain param. 2011-08-09 16:24:41 +02:00
Maggion Emmanuel
cb5f57f0ed Adding support for url input 2011-08-09 17:02:00 +03:00
Renan Gonçalves aka renan.saddam
eb7567d33e Merge pull request #168 from kamui545/patch-1
Adding `cake_dev` domain
2011-08-09 03:06:48 -07:00
Maggion Emmanuel
7ab1805bd9 Adding cake_dev domain 2011-08-09 13:03:32 +03:00
mark_story
95f3eb48f9 Fixing plugin option + locations subcommand. 2011-08-07 18:17:14 -04:00
mark_story
a268eea24f Expanding docs on HtmlHelper. 2011-08-07 18:17:14 -04:00
Mark Story
4ab9dedd58 Updating doc blocks in Debugger and CakeLog. 2011-08-07 14:31:14 -04:00
mark_story
5330096019 Fixing parameter name in RssHelper docs.
Fixes #1888
2011-08-07 09:14:16 -04:00
mark_story
e4a7c8f3d7 Cleanup of minor issues found with phpmd. 2011-08-06 21:15:31 -04:00
mark_story
be262f30f0 Fixing notice errors caused by undefined property. 2011-08-06 21:12:48 -04:00
Mark Story
2f079b33dd Fixing issues output xml help. 2011-08-06 16:26:58 -04:00
Mark Story
5d3c470871 Fixing issues where option values started with '-'. 2011-08-06 15:43:41 -04:00
Mark Story
b7391274fb Adding an exception when a short option is longer than one
character. Having long short options breaks parsing, and
doesn't make sense with how short options are used.
2011-08-06 15:21:42 -04:00
Mark Story
10c78c5420 Fixing bad include on text reporter.
Fixing bad includes and updating usage in text coverage reports.
2011-08-06 13:54:02 -04:00
Mark Story
fb756c5aee Fixing incorrectly inflected shell names in help. 2011-08-06 09:52:07 -04:00
Mark Story
5f84b4846c Making long options & arguments replaced with short forms.
Fixes #1882
2011-08-06 09:50:41 -04:00
Mark Story
6ef4ce4c31 Adding a line to the generated cache files,
that re-assigns view params after component callbacks.
Fixes issues with SecurityComponent and cache files.
Fixes #1863
2011-08-05 22:59:46 -04:00
0x20h
ea7c8c4710 Adding better file locking in write(). This should reduce issues
with file locking and unserialize().
Fixes #1660
2011-08-05 22:31:19 -04:00
mark_story
c1b0eb8f21 Updating output of project task to better reflect what
happened.
2011-08-03 21:56:24 -04:00
Mark Story
b45e8eb0cd Adding comments about CAKE_CORE_INCLUDE_PATH.
Removing ini_set() blocks that don't need to exist.
2011-08-03 20:06:47 -04:00
Mark Story
b362afee06 Changing assertPattern to assertRegExp. 2011-08-03 20:06:47 -04:00
Mark Story
cdcabc79b6 Doing some refactoring in the project task.
Adding tests for constants staying commented out when CakePHP is on the include_path.
2011-08-03 20:06:47 -04:00
Mark Story
6e2870c706 Removing APP_PATH it is always the same as APP.
Fixing a typo in index.php.
2011-08-03 20:06:47 -04:00
Mark Story
20e9015f80 Making skel files generate hard coded paths, when CakePHP
is not on the include_path, and exclude hard coded paths when it is.
2011-08-03 20:06:47 -04:00
Mark Story
721c438817 Re-adding support for PHP's include_path.
Moving constants that are made of other constants into bootstrap.php
2011-08-03 20:06:47 -04:00
Ceeram
e083b21dfe Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-08-02 14:56:47 +02:00
Ceeram
dbdc0a1e37 moving test icons one dir up, and remove subdir img in img 2011-08-02 14:56:03 +02:00