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 |
|
euromark
|
4518624187
|
more whitespace coding standard corrections
|
2013-06-09 17:39:48 +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 |
|
Jose Lorenzo Rodriguez
|
7b746ccb57
|
Overwriting App.fullBaseURL if changed using Router::baseURL()
|
2013-06-05 23:57:16 +02: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 |
|
Jose Lorenzo Rodriguez
|
4bc92b822e
|
Adding App.fullbaseURL as a recognized Configure value
|
2013-05-30 16:07:26 +02:00 |
|
euromark
|
09d9efe235
|
spelling corrections (a url to an URL, unify URL)
|
2013-04-29 11:05:17 +02:00 |
|
Saleh Souzanchi
|
4aabf72e1f
|
fix currentRoute() when $_currentRoute is empty, return false
|
2013-04-26 13:36:35 +04:30 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01: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 |
|
Ceeram
|
16be9d4990
|
remove unused local vars
|
2013-01-23 17:22:06 +01:00 |
|
euromark
|
11a88042bd
|
fix doc block endings
|
2013-01-11 15:06:54 +01:00 |
|
Majna
|
6d75d90c25
|
Code cleanup
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
|
2012-12-28 23:37:58 +01:00 |
|
Schlaefer
|
94a17d40da
|
fix ticket 3400: url string with # in it is not routed
See: http://cakephp.lighthouseapp.com/projects/42648/tickets/3400-url-string-with-in-it-is-not-routed
|
2012-11-26 16:43:47 +01:00 |
|
Ceeram
|
eadc3a75e5
|
fix coding standards
|
2012-11-21 15:39:03 +01:00 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
mark_story
|
c24bec679b
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/View/Helper/FormHelper.php
|
2012-10-27 21:13:53 -04:00 |
|
Ber Clausen
|
a7d9422c09
|
Test all empty array with assertSame() because assertEquals() does not check the type.
|
2012-10-26 19:21:51 -03:00 |
|
AD7six
|
fa6defea37
|
url encode nested named parameters in unmatched routes
reference: #2988
and 31033239bd
|
2012-10-05 11:40:58 +02:00 |
|
AD7six
|
5140baf83d
|
Load routes as late as possible.
As a concequence - routes will also work by default in the cli
|
2012-10-04 21:41:12 +02:00 |
|
Jose Lorenzo Rodriguez
|
d5c9d97dc1
|
Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
|
2012-09-25 16:36:03 +02:00 |
|
Rachman Chavik
|
0cae19a14e
|
enable PluginDot for routeClass parameter
|
2012-09-12 21:24:56 +07:00 |
|
mark_story
|
a934f700f1
|
Fix parsing '0' as a url.
Fixes #3198
|
2012-09-09 20:56:40 -04:00 |
|
euromark
|
b6fe8af701
|
adding sms as protocol
|
2012-08-01 12:38:06 +02:00 |
|
euromark
|
b73be3139f
|
allowing tel protocol for mobile devices
|
2012-08-01 12:02:50 +02:00 |
|
Ceeram
|
acbb2bebc9
|
adding setExtensions() to allow adding more extensions as parseExtensions would override existing valid extensions
|
2012-05-30 21:29:05 +02:00 |
|
Jelle Henkens
|
c2920aa3bf
|
Fixing small variable typo
|
2012-05-12 18:43:39 +01:00 |
|
Jelle Henkens
|
484c3ec688
|
Adding support for a trailing & or & in the existing queryString
|
2012-05-10 20:55:46 -04:30 |
|
Jelle Henkens
|
e53074dab9
|
Fixing order inconsistency in queryString and bug with string based existing querystring
|
2012-05-10 20:55:46 -04:30 |
|
Jose Lorenzo Rodriguez
|
bf0f5ab118
|
Merge remote-tracking branch 'origin/2.1' into 2.2
|
2012-04-29 20:05:39 -04:30 |
|
Kyle Robinson Young
|
b8488b8dfe
|
Update 1.x @link in docblocks
|
2012-04-26 19:49:18 -07:00 |
|
mark_story
|
46bce1a00f
|
Merge branch '2.1' into 2.2
|
2012-04-26 22:27:44 -04:00 |
|
mark_story
|
eefb2e81fa
|
Fix issue where prefixes mid action would be truncated.
If a prefix occured mid action name it would be removed,
corrupting the action name.
Fixes #2831
|
2012-04-24 20:48:23 -04:00 |
|
euromark
|
bc2cd00123
|
cake 2.2 test case fixes (assert corrections, correct class names)
|
2012-04-21 15:02:35 +02:00 |
|
Renan Gonçalves
|
b0b36e8fba
|
Defining default values for CakeRequest, those params are present anywhere except when there isn't a Route match.
|
2012-04-13 15:58:45 +02:00 |
|
mark_story
|
fe1a6d7d7e
|
Fragments should not be urlencoded()
encoding them breaks fragments for client side
applications like backbone.js
Fixes #2755
|
2012-04-06 21:32:37 -04:00 |
|
Kyle Robinson Young
|
90e7afbdc7
|
Correct parameter order of assertEquals and assertNotEquals
|
2012-03-22 23:37:12 -07:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
907596b2f5
|
Fix coding standards in Case/Routing
|
2012-03-12 21:36:27 -04:00 |
|
Kyle Robinson Young
|
4176e59e52
|
Typo fixes in tests
|
2012-02-23 15:29:53 -08:00 |
|
Kyle Robinson Young
|
22582aee63
|
Upgrade legacy uses of App::build() types
|
2012-02-18 04:31:29 -08:00 |
|
Kyle Robinson Young
|
c4829dc3b8
|
Use App::RESET instead of true with App::build()
|
2012-02-18 04:04:54 -08:00 |
|
Kyle Robinson Young
|
4141a3ab5b
|
Load specific test plugins rather than all to avoid conflicts
|
2012-02-16 20:03:44 -08:00 |
|
Majna
|
d41e5621b7
|
Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
|
2012-02-16 19:28:21 +01:00 |
|
mark_story
|
76711c9f71
|
Add missing rawurlencode()
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.
Fixes #2572
|
2012-02-13 21:16:57 -05:00 |
|
Jose Lorenzo Rodriguez
|
a1daaf5960
|
Merge branch '2.1-http' into 2.1
|
2012-01-21 15:51:34 -04:30 |
|
mark_story
|
df5d9ac3d1
|
Merge branch '2.0' into 2.1
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
|
2012-01-20 20:28:15 -05:00 |
|
Jose Lorenzo Rodriguez
|
769a5c24e6
|
Fixing some failing test cases
|
2012-01-19 01:08:45 -04:30 |
|