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
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
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
euromark
05546aff32
coding standards
2013-02-04 09:26:50 +01: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
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
Ceeram
fa1d22dc5e
added test to disprove #3588
2013-01-31 16:21:01 +01:00
Perry
5ac5e784de
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
2013-01-31 17:01:59 +08:00
euromark
ee08fe5c1f
BC fixes for disabled checkboxes
...
see: d504642
see: #3545
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd
Merge branch '2.2'
2013-01-31 09:42:55 +07:00
euromark
d504642c9b
BC fixes for habtm. Closes #3545 .
...
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31
Fix issue with inputs() and plugin models.
...
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.
Fixes #3571
2013-01-29 22:02:21 -05:00
mark_story
410981296c
Fix ServerShell not being able to handle plugin assets.
...
Fixes #3575
2013-01-28 22:21:58 -05:00
Jose Lorenzo Rodriguez
d3fdd2c911
Update version number to 2.3.0
2013-01-28 23:00:32 +01:00
Jose Lorenzo Rodriguez
57e7871142
Merge branch 'master' into 2.3
2013-01-28 22:57:34 +01:00
Jose Lorenzo Rodriguez
0a96e200a6
Update version number to 2.2.6
2013-01-28 22:55:39 +01:00
Mark Story
7a184708fc
Merge pull request #1086 from burzum/refactor/controller-render
...
Refactoring the Controller::render method
Create Controller::_getViewObject() which is responsible for creating
the view instance. This gives an easier way to override view construction.
2013-01-27 17:49:29 -08:00
ADmad
bb767408d3
Fix cs errors
2013-01-27 23:03:06 +05:30
ADmad
04ec9dd614
Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
...
Closes #3268
2013-01-27 21:22:11 +05:30
ADmad
422ceaff85
Added "tel" and "email" input type guessing.
...
Closes #3557
2013-01-27 08:59:54 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Mark Story
1fc9641af3
Merge pull request #1089 from majna/2.3-sort-natural
...
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 18:49:16 -08:00
mark_story
ce7f85abe8
Fix Token fields being added to GET forms.
...
They are not used so there is not much point in appending them.
Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51
Merge pull request #864 from dereuromark/2.3-radio-multiple-between
...
allow between to be an array of strings
Fixes #2859
2013-01-25 12:06:55 -08:00
Florian Krämer
d269b28ece
Changing the doc block of Controller::_getViewObject()
2013-01-25 12:45:08 +01:00
Florian Krämer
d242081067
Fixing typo in Controller::_getViewObject doc block and changing the view class comparison from != to !==
2013-01-25 11:30:04 +01:00