Jose Lorenzo Rodriguez
|
047ffd1530
|
Removing variable from dump test as it does not exist anymore
|
2012-09-25 17:01:06 +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 |
|
Jose Lorenzo Rodriguez
|
6818d69fc3
|
Fixed issue in CakeTime that it would apply userOffset twice when using
the format() function
|
2012-09-25 15:23:46 +02:00 |
|
Jose Lorenzo Rodriguez
|
b0822d2246
|
Introducing failing test case to prove issue in CakeTime
|
2012-09-25 15:23:19 +02:00 |
|
Ceeram
|
e4542827c8
|
avoid pass by reference error on 5.4
|
2012-09-24 18:26:25 +02:00 |
|
Renan Gonçalves
|
fe5b49e6eb
|
Fixing variable name used to set error handlers.
|
2012-09-24 13:41:56 +02:00 |
|
José Lorenzo Rodríguez
|
a355a8413c
|
Merge pull request #867 from ceeram/2.3-assetfilter
refactoring asset dispatcher filter
|
2012-09-24 01:26:29 -07:00 |
|
Ceeram
|
3665a95996
|
refactoring asset dispatcher filter
|
2012-09-24 10:06:45 +02:00 |
|
dogmatic69
|
1b36853355
|
undo the change to avoid change in behavior
|
2012-09-21 23:49:24 +01:00 |
|
dogmatic69
|
cd99b7d6ff
|
fixing error pointed out by dereuromark with recursive https://github.com/cakephp/cakephp/pull/846#commitcomment-1884073
|
2012-09-21 23:40:21 +01:00 |
|
dogmatic69
|
36314e6d37
|
converting if ($foo != "") to if ($foo)
|
2012-09-21 23:34:37 +01:00 |
|
dogmatic69
|
8dc4de5de8
|
converting if ($foo != false) to if ($foo)
|
2012-09-21 23:32:52 +01:00 |
|
dogmatic69
|
b1f26b59a3
|
converting if ($foo != null) to if ($foo)
|
2012-09-21 23:30:43 +01:00 |
|
José Lorenzo Rodríguez
|
2818ec6eb4
|
Merge pull request #859 from dereuromark/2.3-format-delta
adding CakeNumber::formatDelta() and fixing issue with format()
|
2012-09-21 00:18:35 -07:00 |
|
dogmatic69
|
6d4f4b57d7
|
adding a plugin propery to models wwith tests for ticket #85
Merge pull request #696
|
2012-09-20 21:31:31 -04:00 |
|
mark_story
|
268e58956d
|
Attempt to make tests pass when OpenSSL is not enabled.
|
2012-09-20 21:28:29 -04:00 |
|
mark_story
|
d3ba9703a5
|
Try to make some time related test failures go away.
|
2012-09-20 21:07:14 -04:00 |
|
euromark
|
7aa78c40f3
|
test case to proof that less between strings also work and do not error
|
2012-09-21 02:57:10 +02:00 |
|
Ber Clausen
|
aaefbf1c2f
|
Add MySQL FULLTEXT support.
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext
Fixes #262
|
2012-09-20 20:42:30 -04:00 |
|
mark_story
|
a9750264e4
|
Revert "Add MySQL FULLTEXT support."
This reverts commit 36c99a358f .
|
2012-09-20 20:39:02 -04:00 |
|
Mark Story
|
f4a639cbfa
|
Merge pull request #862 from bar/mysql-fulltext
Add MySQL FULLTEXT support.
Fixes #262
|
2012-09-20 17:20:23 -07:00 |
|
euromark
|
490bbf836d
|
remove debug statement
|
2012-09-21 00:09:42 +02:00 |
|
euromark
|
bfaed32e58
|
allow between to be an array of strings
|
2012-09-21 00:06:26 +02:00 |
|
Mark Story
|
e931211fcc
|
Merge pull request #858 from dereuromark/2.3-request
adding query() for CakeRequest
|
2012-09-20 06:40:23 -07:00 |
|
Ber Clausen
|
36c99a358f
|
Add MySQL FULLTEXT support.
Minor optimizations and testing added.
|
2012-09-20 00:35:42 -03:00 |
|
mark_story
|
3dd82e6d88
|
Fix Database/ from always being appended to the driver name.
Fixes #3223
|
2012-09-19 20:55:39 -04:00 |
|
euromark
|
0be1943bcd
|
adding basic test
|
2012-09-20 01:56:52 +02:00 |
|
euromark
|
213d4caa85
|
coding standards
|
2012-09-20 01:50:15 +02:00 |
|
euromark
|
8a070ca3dd
|
doc block
|
2012-09-20 01:45:05 +02:00 |
|
euromark
|
3fa6b96ad0
|
adding CakeNumber::formatDelta() and fixing issue with near-zero values and format()
|
2012-09-20 01:41:41 +02:00 |
|
ADmad
|
d12f50a2b6
|
Removing unneeded App::uses() calls
|
2012-09-20 02:40:54 +05:30 |
|
mark_story
|
0f0b5e7668
|
Fix incorrect radio selection with falsey values.
Use strval() to work around 0 == '' type issues.
Cleanup some tests.
Fixes #3221
|
2012-09-19 10:14:29 -04:00 |
|
euromark
|
60385d1d28
|
test the query() method with arrays passed via $_GET
|
2012-09-19 03:14:55 +02:00 |
|
mark_story
|
99cbd22969
|
Fix coding standards.
|
2012-09-18 14:52:46 -04:00 |
|
mark_story
|
da6d49e554
|
Fix code conventions.
|
2012-09-18 14:50:03 -04:00 |
|
mark_story
|
5d830d7adb
|
Fix multiple selects always failing post validation.
Fixes #3218
|
2012-09-18 14:41:51 -04:00 |
|
mark_story
|
a1838a0c85
|
Implement missing bits for automatic sequence resetting.
Refs #3206
|
2012-09-18 14:12:23 -04:00 |
|
Mark Story
|
5d4a6fd6b6
|
Merge pull request #856 from ceeram/2.3-cakenumber
Simplify and improve fromReadableSize().
|
2012-09-18 10:55:28 -07:00 |
|
euromark
|
e8cfac0eec
|
adding query() for CakeRequest
|
2012-09-18 19:38:53 +02:00 |
|
Ceeram
|
ff676b5ea4
|
allow for lowercase as well, also strip the unit part off before pow()
|
2012-09-18 17:15:33 +02:00 |
|
Mark Story
|
144761c0b2
|
Merge pull request #852 from cakephp/2.3-reset-sequence
Implement resetSequence()
Fixes #3206
|
2012-09-18 07:42:11 -07:00 |
|
ADmad
|
88f5a7ad0f
|
Merge pull request #855 from daVinciWanaB/patch-7
Update docblock
|
2012-09-18 06:58:29 -07:00 |
|
Dave
|
46035cfd73
|
Update lib/Cake/View/Helper/FormHelper.php
|
2012-09-18 10:56:36 -03:00 |
|
ADmad
|
82a1194ea0
|
Merge pull request #854 from daVinciWanaB/patch-6
Update lib/Cake/View/Helper/FormHelper.php
|
2012-09-18 06:56:08 -07:00 |
|
Dave
|
990d5f89f0
|
Update lib/Cake/View/Helper/FormHelper.php
|
2012-09-18 10:51:24 -03:00 |
|
José Lorenzo Rodríguez
|
d999a83250
|
Merge pull request #835 from tigrang/default-block-value
Added ability to set default view block content
|
2012-09-18 00:59:27 -07:00 |
|
Tigran Gabrielyan
|
d30e092966
|
Fixed test case
|
2012-09-18 00:46:06 -07:00 |
|
Tigran Gabrielyan
|
f1a344eee4
|
Added test case for view block default value
|
2012-09-18 00:41:33 -07:00 |
|
Tigran Gabrielyan
|
6d98069f13
|
Added ability to set default view block content
|
2012-09-18 00:41:30 -07:00 |
|
Ceeram
|
90c32add9c
|
opmitisation of fromReadableSize
|
2012-09-18 09:34:05 +02:00 |
|