Commit graph

15427 commits

Author SHA1 Message Date
mark_story
afbc6d84b0 Merge branch 'nojimage-db-postgres-rename-field'
Fixes #3622
2013-02-13 22:48:56 -05:00
mark_story
f104bd3504 Use simpler asserts.
Refs #3622
2013-02-13 22:43:18 -05:00
nojimage
fbb1a812dd Create rename field statements in postgres
Refs #3622
2013-02-13 22:24:21 -05:00
Mark Story
854f331094 Merge pull request #1134 from andrei-neacsu/2.4
Inflector transliteration for S, s, T, t with comma bellow
2013-02-13 14:00:33 -08:00
Andrei Neacsu
abe57cecd4 Inflector transliteration for S, s, T, t with comma bellow 2013-02-13 20:47:30 +02:00
ADmad
1b22d48a35 trivial optimization 2013-02-13 00:54:03 +05:30
ADmad
213e81bdbd Removing redudant code.
Filelog with scopes needs the file name to be specified so the first `if` covers scopes too.
2013-02-13 00:42:21 +05:30
ADmad
f6215129f6 Fix type casting of string scopes to array in log engines 2013-02-13 00:10:32 +05:30
Mark Story
4879d45115 Merge pull request #1125 from dogmatic69/find-all-overload
Adding the _findAll method
2013-02-12 06:57:02 -08:00
mark_story
0d9ef854ff Fix FULLTEXT column generation
Fixes #3618
2013-02-12 09:00:57 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Mark Story
82567ed709 Merge pull request #1126 from dereuromark/2.4-i18n
Add Kazakh locale and correcting some locales

Fixes #3613
2013-02-11 16:35:58 -08:00
Mark
e0a9dd81f8 Merge pull request #1128 from ravage84/patch-1
Fixed small typo
2013-02-11 14:46:52 -08:00
Marc Würth
019c3aa721 Fixed small typo 2013-02-11 22:21:50 +01:00
dogmatic69
e9a385e790 Adding the _findAll method
Now there are no special checks for find('all') and the find can be overloaded like you would
with any other find(*) methods.
2013-02-10 21:06:29 +00:00
euromark
23ef13f9c7 adding Kazakh and correcting some locales 2013-02-10 20:07:09 +01:00
dogmatic69
83a11b7189 adjusting the changes and adding some docs 2013-02-10 11:13:22 +00:00
José Lorenzo Rodríguez
95ea475297 Merge pull request #1124 from ADmad/2.4-auth-methods
Breaking down AuthComponent::startup() into multiple methods for easier ...
2013-02-10 01:17:34 -08:00
ADmad
49157d83ae Breaking down AuthComponent::startup() into multiple methods for easier management and extension. 2013-02-10 13:49:07 +05:30
ADmad
ee4a116936 Fix coding standards 2013-02-10 12:51:22 +05:30
ADmad
a7c751922d Replace loose comparison with casting to boolean.
In any case AuthComponent::user() returns null not empty array when user isn't logged in.
2013-02-10 12:16:20 +05:30
mark_story
974ac44fb4 Use random iv values in rijndael.
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
2013-02-09 20:48:27 -05:00
mark_story
613aa19d94 Use constants instead of strings.
Using built-in constants where possible is generally a good idea,
making code less error prone.
2013-02-09 14:14:27 -05:00
mark_story
fee6172958 Update docs for SecurityComponent::requireAuth() 2013-02-09 14:06:24 -05:00
mark_story
e4110b1e01 Deprecate features in SecurityComponent
These features are available in CakeRequest now. The CakeRequest
version is improved as it raises more appropriate exceptions.
2013-02-09 13:57:55 -05:00
dogmatic69
00abe27ef8 Breaking out the find so that it can be easily overloaded for caching
Before this commit you have to do some hacks to cache model finds easily. When using
custom find methods like `find('foo')` => `_findFoo(...)` it is common for the
method to adjust the query params.

Trying to cache a query using a hash of the query params :

	function find($type, $query) {
		$query = $this->_beforeFind($query);
		$cacheKey = $type . '_' . md5(selialize($query));

		$cache = Cache::read($cachKey, 'my_cache');
		if ($cacheKey !== false) {
			return $cache;
		}

		$results = $this->_afterFind($type, $query);
		Cache::write($cacheKey, $results, 'my_cache');

		return $results;
	}

Before this commit you either have to completely overload find and rewrite it in the AppModel or call
the before to get the modified `$query` and let cake run the before again.
2013-02-09 16:20:46 +00:00
ADmad
74b9cdb36f Fix failing tests caused by previous commit 2013-02-09 18:24:27 +05:30
ADmad
a9bbfd80c7 Added type hinting 2013-02-09 18:09:11 +05:30
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
Mark Story
0e0f521a10 Merge pull request #1122 from ravage84/skel-sync+gitignore
Updated .gitignore, synced app & skel
2013-02-08 07:02:52 -08:00
Marc Würth
514d9675d8 Updated .gitignore, synced app & skel
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)

Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
a3702fcf2b More copyright updates 2013-02-08 21:29:18 +09:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
Graham Weldon
97a60c28c7 Updated copyright and added references to license file for non-standard copyright references 2013-02-08 21:26:18 +09:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
ea4545e914 Formatted CSF address 2013-02-08 21:08:15 +09:00
Graham Weldon
3a0e0181b8 Updated copyright date, added CSF address (Thanks Larry) 2013-02-08 21:06:59 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
fb8c2a5e46 Make paths platform dependent.
This fixes issues with the built-in PHP webserver on windows.

Fixes #3608
2013-02-07 20:41:04 -05:00
mark_story
95bc8be4d5 Make path to router script absolute in server shell.
Relative paths fail when you run the server from inside app/Console
or any other path.
2013-02-07 20:32:26 -05:00
Mark
abf1bd8d12 Merge pull request #1105 from dereuromark/master-fix-disabled
Resolve incomplete regression fix for FormHelper selection and disabled.
2013-02-07 07:09:16 -08:00
euromark
d522f412db Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105 2013-02-07 15:36:00 +01:00
mark_story
1ceb17589a Merge branch 'master' into 2.4 2013-02-06 21:05:03 -05:00
mark_story
7d72a6f249 Fix issue where bake was missing habtm associations
If the current model is not the first table, habtm associations would be
missed. This was caused by eff4004261

Refs #3532
Fixes #3605
2013-02-06 20:31:15 -05:00
Marc Würth
94ca499dec Brought home.ctp in skel folder in sync 2013-02-06 03:16:48 +01:00
Marc Würth
5ce6542b98 Adjusted link for my docs-patch
https://github.com/cakephp/docs/pull/484

Moved url rewriting section
2013-02-06 03:14:33 +01:00
ADmad
758d717096 Remove banner from default homepage 2013-02-06 01:39:41 +05:30
ADmad
0b46b042b9 Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
Closes #3593
2013-02-05 23:22:24 +05:30
José Lorenzo Rodríguez
1024a373da Merge pull request #1118 from ravage84/patch-1
Fixed wrong statement in Sqlserver class header
2013-02-05 09:40:40 -08:00