Mark Story
94db8fbed6
Merge pull request #1380 from ceeram/2.4-ext
...
Set extension with multiple accept based on order in parseExtensions.
2013-06-30 19:42:50 -07:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
mark_story
1d18a4f702
Fix issue where redirectURLs were not generated correctly.
...
When the first path segment matches the base path an incorrect URL was
generated. Trimming slashes off makes Router normalize the URL correctly
as the leading / implies that the base is already prepended.
Fixes #3897
2013-06-29 23:26:13 -04:00
mark_story
0d76bfe325
Add an additional test for CakeRequest::referer().
...
Trying to track down the issue for #3897 . This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
mark_story
cd7d18de68
Update build scripts to fetch new changes.
...
Prevent future mistakes when creating tags by always fetching the branch
head before bumping version numbers or creating tags.
2013-06-29 23:26:13 -04:00
ADmad
75e7797a26
Allow escaping only attributes of a link and not it's title
2013-06-29 20:51:52 +05:30
Mark Story
b73f927787
Merge pull request #1381 from ravage84/patch-1
...
Annotated testReconnect
2013-06-27 14:59:29 -07:00
Mark Story
616ca3813b
Merge pull request #1382 from ravage84/dbosource
...
Fixed @return statement in DboSource::disconnect
2013-06-27 14:59:11 -07:00
Marc Würth
aabeaada0f
Fixed @return statement in DboSource::disconnect
2013-06-27 17:38:46 +02:00
Marc Würth
9591f55394
Annotated testReconnect
2013-06-27 17:15:56 +02:00
Mark Story
6fdbdf508f
Merge pull request #1368 from planardothum/url-conformance
...
Url conformance
2013-06-27 06:31:42 -07:00
Ceeram
6a0185d7e6
Set extension with multiple accept based on order in parseExtensions, currently with multiple accepted types, no extension is set at all
2013-06-27 14:34:00 +02:00
Mark Story
4442a2a256
Merge pull request #1379 from ravage84/datasource-api-link
...
Added a related cookbook link to DataSource.php
2013-06-26 13:24:16 -07:00
Marc Würth
070a6f0ad5
Added a related cookbook link to DataSource.php
2013-06-26 22:07:52 +02:00
Mark Story
e1c7b4806b
Merge pull request #1376 from ravage84/https-links
...
Changed http links to lighthouse, groups.google and github to https
2013-06-25 14:55:00 -07: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
ee5e8c95dd
fix issue with FormHelper and undefined variable and extract
2013-06-25 12:11:10 +02:00
euromark
290c343a74
tests to disprove that input date and partial dateFormat does not work
2013-06-25 11:54:29 +02:00
Juan Basso
19c94d0211
Fixed default datestyle for postgres tests
2013-06-25 00:15:03 -04:00
Juan Basso
accc98f55d
Resetting the datestyle to not affect other tests
2013-06-24 23:36:40 -04:00
Jose Lorenzo Rodriguez
489d1db7d1
More edge case handlignfor native_type in mysql for older versions of
...
php
2013-06-24 14:15:15 +02:00
Jose Lorenzo Rodriguez
b8bbf0b4a9
Preventing notice in older versions of php
2013-06-24 14:03:50 +02:00
Jose Lorenzo Rodriguez
f6eac9a175
Fixing boolean type introspection for Mysql in PHP 5.5
2013-06-24 13:42:29 +02:00
Mark
df1e74765b
Merge pull request #1373 from dereuromark/2.4-paginator
...
Add convenience method param() for PaginatorHelper.
2013-06-23 16:43:55 -07:00
euromark
d6c25bd0e3
add convenience method param() for PaginatorHelper
2013-06-24 00:03:08 +02:00
José Lorenzo Rodríguez
fb111d6fd6
Merge pull request #1366 from dereuromark/2.4-unify-engine
...
unify engine to not require the suffix
2013-06-23 14:42:13 -07:00
Mark Story
468eb94e94
Merge pull request #1372 from wernerhp/master
...
Fixed Scaffold view "delete" message translation string
2013-06-23 11:42:49 -07:00
Werner Pieterson
9383236114
Formatted code
...
Formatted code to conform to style guide
2013-06-23 19:49:17 +02:00
Werner Pieterson
b172d6e254
Fixed "delete" translation string bug
2013-06-23 18:10:29 +02:00
ADmad
3e8a7f5e66
Make ScaffoldView extend View instead of deprecated ThemeView
2013-06-22 22:05:31 +05:30
mark_story
dcf7df39d2
Merge branch 'master' into 2.4
2013-06-21 17:47:37 -04:00
mark_story
94815a74f1
Add ordering to prevent occasional pgsql failures.
2013-06-21 17:47:08 -04:00
Harold Putman
7acf162268
HTTP_HOST is not available in CLI
...
use FULL_BASE_URL instead.
2013-06-21 16:37:39 -04:00
Harold Putman
1ff77f2363
Fix subtle error in Regex matching URI scheme.
...
[+-.] will match plus, hyphen, and dot, but also comma. Use [+\-.] since commas not allowed in URI scheme.
2013-06-21 15:17:59 -04:00
Harold Putman
2fd36bdedc
Router::url should passthru //example.com/file.ext
...
The function allows ://example.com/file.ext but was treating //example.com as cake-relative URL. The updated regex matches URI schemes as defined in RFC2396. Will passthru any of these formats:
* Starts with a valid URI scheme (javascript:, https:, itunes:, ftp:)
* Starts with a '#'
* [NEW] Starts with a '?' which may be meaningless, but is as valid as starting with '#' (RFC1808)
* starts with //, or :// (:// is not technically valid, but included for compatibilty)
2013-06-21 15:10:11 -04:00
Harold Putman
cfdac5e32d
Allow plus signs in URL's to pass unscathed in Helper functions.
...
According to RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.
2013-06-21 14:24:39 -04:00
Harold Putman
be63a5d59f
Merge branch '2.4' of https://github.com/cakephp/cakephp into url-conformance
...
Conflicts:
lib/Cake/View/Helper/HtmlHelper.php
lib/Cake/View/Helper/PaginatorHelper.php
2013-06-21 14:07:52 -04:00
José Lorenzo Rodríguez
c7ba2d5f57
Merge pull request #1367 from ravage84/patch-1
...
Fixed typo in AuthComponent::redirectUrl
2013-06-21 07:51:42 -07:00
Marc Würth
2418ea0a57
Fixed typo in AuthComponent::redirectUrl
2013-06-21 16:49:31 +02:00
euromark
8141dd2d5d
unify other log types as well
2013-06-21 16:43:01 +02:00
euromark
24506dcc2c
update test for FileLog config
2013-06-21 16:39:51 +02:00
euromark
b6a2c2a982
update bootstrap config
2013-06-21 16:38:25 +02:00
euromark
cb24dbb084
unify engine to not require the suffix (as Cache and other places do).
2013-06-21 15:04:27 +02:00
mark_story
3867dec513
Merge branch 'luksm-master'
...
Closes #GH-1352
2013-06-19 15:07:27 -04:00
mark_story
68db74d32d
Cleanup from previous commit.
...
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0
Fix to the date input year field
...
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
Mark Story
691288accc
Merge pull request #1362 from dereuromark/master-cake-session
...
cake session clarification
2013-06-18 15:05:00 -07:00
Mark Story
406b8b8ae1
Merge pull request #1361 from dereuromark/master-form-helper-datetime
...
assert proper array access for _dateTimeSelected()
2013-06-18 15:02:20 -07:00
euromark
1b1943954b
CakeSession improvements
2013-06-18 23:49:42 +02:00
euromark
eb13242680
assert proper array access for _dateTimeSelected()
2013-06-18 09:39:43 +02:00