Commit graph

217 commits

Author SHA1 Message Date
mark_story
8f5acb0932 Fix CS errors in skel/ 2014-05-27 23:21:32 -04:00
Mark Story
f287bc76c0 Force .bat files to have CRLF endings.
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.

Hopefully this fixes the issue.

Fixes #3585
2014-05-27 19:06:08 -04:00
ADmad
d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
Matthew Ouyang
7b27b0d1ab add whitespace to end-of-file 2014-01-15 09:53:21 -05:00
Matthew Ouyang
0661d7832b add AllTestsTest for skeleton app 2014-01-14 17:51:50 -05:00
euromark
29e15386b2 Follow the deprecation note of 2.1 migration guide and switch to fetch(title)
correct assert order for test
2014-01-09 16:45:49 +01:00
euromark
85337a5d15 correct templates 2014-01-03 13:28:45 +01:00
Rob Spencer
cda9320e96 Added support for passing additional flags to mysql connection 2013-11-24 00:47:06 -05:00
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
Bryan Crowe
8eb6652fd7 Change Cake to CakePHP 2013-10-28 22:14:50 -04:00
Marc Würth
0e348dfbbd Improved wording of link to GH repo in home.ctp 2013-10-24 15:51:59 +02:00
James Watts
12f0cc0559 Updated links to CakePHP resources 2013-10-24 14:39:32 +02:00
mark_story
328fcdc376 Sync skel and app directories.
Closes #1698
2013-10-22 22:18:59 -04: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
Bryan Crowe
4242bd4f3d Additional Cake references to CakePHP and docblock typo 2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
euromark
1c6a379346 Fix issue 4116 and also merge both versions of home.ctp 2013-09-30 20:45:26 +02:00
Bryan Crowe
915b51b239 Updated JavaScript casing and JsHelper references in doc blocks 2013-09-25 22:46:38 -04:00
euromark
12f2f729c8 more cs 2013-09-17 14:53:07 +02:00
ADmad
29d0e26710 Dropping 'Log' suffix from log configs as per change in cb24dbb084.
Reverts regressive change done in 7e28636a72.
2013-09-05 19:37:41 +05:30
Hadrien Collongues
7e28636a72 Fix log classname in skeleton
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
2013-09-05 11:20:39 +02:00
mark_story
f18d354f55 Merge branch 'master' into 2.4 2013-08-28 12:35:07 -04:00
Andras Kende
17f9661961 Added mask to File cache docblock 2013-08-27 10:02:48 -04:00
euromark
1aba204ec7 remove $name where not necessary to unify this in 2.x 2013-08-25 21:19:55 +02:00
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
euromark
361980fade remove code, class names and paths from translation strings. 2013-08-21 00:05:53 +02:00
euromark
5ed9e5d691 sync and correct generic css 2013-08-19 21:51:04 +02:00
mark_story
26769edd04 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Utility/CakeTime.php
	lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
Mark Story
2f5963e2d3 Merge pull request #1496 from ravage84/else-clause-after-redirect
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
Marc Würth
4c13a39f3e Removed else clauses after redirects and added return before redirect() and flash() calls 2013-08-08 21:10:41 +02:00
D. Romanov
4d3c049f25 Do not translate "CakePHP" 2013-08-07 22:54:19 +04:00
ADmad
38b050a711 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
ADmad
61bf8df454 Renaming base url config keys and methods for better uniformity. 2013-08-01 00:44:36 +05:30
ADmad
b22b39f158 Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead. 2013-07-31 18:31:26 +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
Phally
6b41eaa950 Merge branch 'master' into 2.4 2013-07-26 19:44:11 +02:00
Phally
881e757a1e Paths for App::build() require trailing /. 2013-07-22 13:51:09 +02:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
Mark Story
4774d62e7f Merge pull request #1416 from majna/2.4-pages
Pages controller should render 404 on missing view file
2013-07-13 17:05:14 -07:00
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
Majna
1ce9fc537f Pages controller should render 404 on missing view file 2013-07-13 17:41:16 +02: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
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
b6a2c2a982 update bootstrap config 2013-06-21 16:38:25 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
José Lorenzo Rodríguez
3b4a4fde31 Merge pull request #1317 from lorenzo/feature/full-base-url
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00