Commit graph

14800 commits

Author SHA1 Message Date
Marc Würth
33fbace4c7 Added 'ym'- & 'y'-date validation
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
2013-02-15 14:35:20 +01: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
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
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
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
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
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
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
Marc Würth
02e2fbe800 Fixed wrong statement in Sqlserver class header
http://www.php.net/manual/en/ref.pdo-sqlsrv.php

--> PDO_SQLSRV is a driver that implements the PHP Data Objects (PDO) interface to enable access from PHP to MS SQL Server (starting with SQL Server 2005) and SQL Azure databases.
2013-02-05 18:32:40 +01:00
mark_story
0d1ee40f8f Merge branch 'cakeshell-indexes-fix'
Fix schema generation in SQLserver by returning the correct
empty type.

Fixes #3559
2013-02-04 21:24:10 -05:00
Marc Würth
fa118a73a9 Fix for CakeShell schema generate for Sqlsrv
Do not generate invalid schema.php when using SQLServer

Refs #3559
2013-02-04 21:19:56 -05:00
ADmad
afb62959ef Added JSONP support for JsonView 2013-02-04 23:20:49 +05:30
euromark
05546aff32 coding standards 2013-02-04 09:26:50 +01:00
José Lorenzo Rodríguez
64cf42bf42 Merge pull request #1116 from markstory/request-param
Add CakeRequest::param()
2013-02-04 00:13:29 -08:00
mark_story
103bbbc375 Add CakeRequest::param()
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
2013-02-03 22:09:52 -05:00
José Lorenzo Rodríguez
00c8c654fb Merge pull request #1114 from ravage84/config-sync
Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync
2013-02-03 11:18:47 -08:00
Marc Würth
72765a2afc Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync 2013-02-03 20:00:32 +01:00
ravage84
af8b1e22ef Added a note about plugin assets not working witout url rewrite
http://cakephp.lighthouseapp.com/projects/42880/tickets/25-i-installed-but-dont-see-the-images-and-css-of-debugkit

> Plugin assets do not work without url rewriting, this is in the
documentation for CakePHP itself. I guess it could be repeated for this
and every other plugin.

> I could have sworn it was with the Plugin Assets section, but
apparently its not there. Perhaps its just something I know from
experience.

See also:

* http://cakephp.lighthouseapp.com/projects/42648/tickets/1755-plugin-webroot-without-mod_rewrite-problem
* http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/500-plugin-css-directories-bug#ticket-500-8

Signed-off-by: mark_story <mark@mark-story.com>

Refs #GH-1113
2013-02-03 13:12:29 -05:00
mark_story
77a5adac6a Fix help & default properties file.
Having a totally useless default property makes doing releases hard.
Change it to a sane default.
2013-02-03 13:05:55 -05:00
Mark Story
80b8e7d98b Merge pull request #1112 from djbobke/2.4-dataavailable-squash
Backported dataAvailable to 2.4 from 3.0
2013-02-02 08:04:03 -08:00
Rik van der Heijden
67a2276763 Backported dataAvailable to 2.4 2013-02-02 14:39:16 +01:00
mark_story
ad3bfd7a5f CakePHP 2.2.7
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (Darwin)
 
 iQEcBAABAgAGBQJRDHxxAAoJEDwHD15Vs66gQbMIAK2hk9RX8iV26mpHhSAc6+BU
 w1WaCO1TMQShqHy8EzS4rCORbj+d8qIbYkVvmUKiMCRQf3GCXj4lsla8oUkW3W4T
 v6OR9txz3kIbEmWuPuAiddbzEmE9IK2YiAFrl1bS8UTMEPzAB/xOf0aqdVlp1t5B
 UHjSaF38RTsYFTItespw9uUOA5l3OtYzsTzTchkIeLxM5aftY4igc2OrUaKLFruR
 Iii7AY6kUM4CghNKt4e1aUkSZ7lYmHEGE7TF8bT2mE/WuL+1ZkR91nvWZoANreaf
 ZFPrWKe6Tl8XZ9T/OctcZEVuinaqELIfotaEKRdAEt8xUb63FW8r0eLLTNcHgy8=
 =+hp4
 -----END PGP SIGNATURE-----

Merge tag '2.2.7'

CakePHP 2.2.7

Conflicts:
	lib/Cake/VERSION.txt
2013-02-01 21:45:25 -05:00
mark_story
6a4160f2ae Update version number to 2.2.7 2013-02-01 21:39:45 -05:00
mark_story
cc361135e0 Add cacert.pem file to pear package.
Fixes #3591
2013-02-01 21:19:50 -05:00
Mark Story
73449cde4c Merge pull request #1108 from calinseciu/patch-1
Update lib/Cake/Utility/Sanitize.php
2013-02-01 11:22:48 -08:00
calinseciu
d2b97f12e8 Update lib/Cake/Utility/Sanitize.php
Correctly use the $start variable in Sanitize::escape().
2013-02-01 18:10:24 +02:00
mark_story
00078e007c Import ClassRegistry before using.
Fixes #3594
2013-02-01 10:46:25 -05:00
Mark Story
e0ce0ac8e3 Merge pull request #1103 from perrywky/master
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery

Fixes #3579
2013-02-01 06:36:06 -08:00
Perry
af71d5528f apply code convention 2013-02-01 09:30:45 +08:00