Commit graph

265 commits

Author SHA1 Message Date
Marc Würth
da8414e13b Use HTTPS for the opensource.org MIT license URL 2017-06-11 00:23:22 +02:00
Marc Würth
04efc7ba50 Use HTTPS for the book.cakephp.org URL 2017-06-11 00:15:36 +02:00
Marc Würth
10b89b51a9 Use HTTPS for the cakefoundation.org URL 2017-06-11 00:10:59 +02:00
Marc Würth
17314baa15 Use HTTPS for the cakephp.org URL 2017-06-10 23:40:28 +02:00
mark_story
5e35064a0b Read basic auth credentials from Authorization header
Merge branch 'issue-9365' into 2.x

Refs #9365
2017-04-28 21:49:47 -04:00
Bernat Arlandis
6a3c4887f9 Fix base path with query params in builtin server 2017-01-20 10:14:14 +01:00
Nicola Beghin
41851d60b4 fix HTTP Basic Auth on FastCGI PHP 2016-08-28 19:16:59 +02:00
Marc Würth
46e8fd1eb7 Add fix for the httpoxy vulnerability
Refs https://github.com/cakephp/cakephp/issues/9137#issuecomment-233637635
2016-07-19 16:23:27 +02:00
Marc Würth
86da57d2be Minor improvements to the front controller 2015-10-04 15:38:48 +02:00
Marc Würth
dbfd2c44e9 App & skel folder sync + some improvements
Mostly CS, doc blocks and some CSS
2015-09-25 17:25:35 +02:00
Marc Würth
27c88a872b Use tabs and single spaces in all .htaccess files 2015-08-01 00:39:10 +02:00
mark_story
734bb9223b Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
rochamarcelo
6a13a1af47 Changed error message 2014-09-05 22:27:02 -03:00
euromark
e714341ce3 Auto-detect composer installed CakePHP folder. 2014-08-05 03:53:40 +02:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
ADmad
d9ca148499 Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
mark_story
328fcdc376 Sync skel and app directories.
Closes #1698
2013-10-22 22:18:59 -04:00
Marc Würth
ae00916753 Added display of CakePHP version to the default layout
Refs https://github.com/cakephp/cakephp/issues/2077#issuecomment-26377120
2013-10-16 02:07:59 +02:00
Marc Würth
fcb7f86b76 include calls without parentheses
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
2013-10-16 01:40:45 +02:00
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
euromark
5ed9e5d691 sync and correct generic css 2013-08-19 21:51:04 +02:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
mark_story
c28cde4e56 Update webroot files to fix an issue in ServerShell.
The previous fixes done in 2918ae9c7a
caused other issues preventing actions from being dispatched properly.

Fixes #3934
2013-07-27 17:01:35 -04:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
AD7six
6b66aee138 use a simpler rewrite rule
The capture group isn't used - so don't captuer it
There are no get args in the rewrite rule so there's no need to
request appending the existing get args - they are unmodified.
2013-07-13 16:18:48 +00:00
mark_story
2918ae9c7a Update index.php to serve static files with query strings.
Trim off the query string before attempting to locate the file on the
filesystem. Thanks to Marko Marković for the initial patch.

Fixes #3910
2013-07-09 21:07:12 -04:00
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
euromark
eb49c4b666 proper response and response code (404 instead of 200) 2013-02-22 10:36:05 +01:00
ADmad
ee4a116936 Fix coding standards 2013-02-10 12:51:22 +05:30
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
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +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
410981296c Fix ServerShell not being able to handle plugin assets.
Fixes #3575
2013-01-28 22:21:58 -05:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
mark_story
f963e378b5 Fix coding standards errors. 2012-07-26 21:22:50 -04:00
shin1x1
dd524c96e1 Added ServerShell for PHP Built-in Server. 2012-07-13 02:29:42 +09:00
Graham Weldon
7f04fbd7dc Minor spacing changes to fix coding standards in webroot/test.php in app/ 2012-05-01 09:40:16 +10:00
Graham Weldon
1253529c44 Removed indentation to satisfy coding standards in webroot/index.php in app/ 2012-05-01 09:38:16 +10:00
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Jonathan Robson
a10093d2af PATH_INFO never gets used.
See <http://github.com/cakephp/cakephp/pull/606> for discussion.
2012-04-12 23:13:57 -05:00
mark_story
1254a1068f Fixing issues with unwanted querystring parameters.
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params.  This is
yet another case where named parameters are fail.  Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.

Fixes #2678
2012-03-14 20:20:55 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a Set encoding in CSS file.
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -05:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +01:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
mark_story
183ffb29d7 Improving the exception stack traces.
Adding Debugger::getType()
2011-10-19 22:27:55 -04:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00