Mark Story
df684ca9fe
Merge pull request #656 from jellehenkens/2.2-coding-conventions
...
Fixing code conventions
2012-05-19 08:56:02 -07:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
ADmad
d5b5327f70
Merge pull request #653 from jellehenkens/2.2-cake-time-date-time-objects
...
Support for DateTime objects in the CakeTime Utility class
2012-05-17 11:55:56 -07:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a
CakeTime::format crashed when timezone is passed
2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Mark Story
fd216c4dda
Merge pull request #655 from jellehenkens/2.2-app-dir-tests
...
Updating CakeSchema test case to test non standard app folder names
2012-05-16 09:52:17 -07:00
Rachman Chavik
c9b801b96d
making CakeLog to work with bogus $type and $scope
...
closes #2881
2012-05-16 08:16:20 +07:00
mark_story
a37bdba8fe
Revert accidental change.
2012-05-15 21:07:43 -04:00
mark_story
7d9f441020
Add documentation.
2012-05-15 21:00:18 -04:00
Jelle Henkens
110536d575
Fixing CakeSchema to test APP_DIR with different names than all lowercase
2012-05-15 21:41:11 +01:00
mark_story
0faaedfff5
Split up tests.
...
Fix API usage in tests.
2012-05-14 21:32:31 -04:00
mark_story
cbd6cafed7
The event manager should be re-used.
...
View::__construct() gets the controller's event manager,
only to override it the first time getEventManager() is called.
Don't overwrite the Controller's event manager as it allows plugins
to more easily hook into the view process.
2012-05-14 21:18:09 -04:00
Rachman Chavik
6bb29ea03b
changing CakeLog::_autoConfig for better bc
...
closes #2880
2012-05-15 08:16:55 +07:00
Mark Story
405aacc0fc
Merge pull request #654 from jellehenkens/2.2-schema-shell-test
...
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 17:30:30 -07:00
Jelle Henkens
ef270b95c7
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 18:12:31 +01:00
ADmad
07c901dfd0
Merge pull request #651 from jellehenkens/2.2-cake-time-fixes
...
CakeTime::nice() and CakeTime::niceShort() do not respect the timezone if no date is passed
2012-05-13 05:50:51 -07:00
Jelle Henkens
0d9506fa2e
Fixing issue where nice and niceShort did not use the timezone if no dateString is passed
2012-05-13 13:43:06 +01:00
Rachman Chavik
6ede36f8e0
removing unneeded LOG_* constant checks
2012-05-13 18:51:57 +07:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
Rachman Chavik
595cad84b3
ensure that plain CakeLogInterface still works
2012-05-13 18:51:57 +07:00
Rachman Chavik
8e8763d69d
change to match syslog levels & customizable levels
2012-05-13 18:51:57 +07:00
ADmad
88fe559ec5
Merge pull request #650 from jellehenkens/2.2-code-formatting
...
Fixing code formatting for extract() calls
2012-05-13 04:43:21 -07:00
Jelle Henkens
dbd826f794
Removing extra space in the extract() calls
2012-05-13 10:37:50 +01:00
mark_story
64f03acd4c
Fix code standards errors.
2012-05-12 23:28:43 -04:00
mark_story
d9244048b6
Fix hard coded date.
2012-05-12 23:25:11 -04:00
mark_story
579aff5ad3
Fix error with options.
2012-05-12 22:35:49 -04:00
mark_story
176ec2df0c
Add documentation on additional options.
2012-05-12 22:26:34 -04:00
mark_story
683146de14
Add a few more tests.
2012-05-12 22:26:34 -04:00
mark_story
0edbe0a123
Fix more whitespace.
2012-05-12 22:26:34 -04:00
mark_story
14bfd83dad
Reduce complexity in timeAgoInWords.
...
All the special cases were handled by the deeply
nested if.
2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea
Fix whitespace and formatting.
2012-05-12 22:26:33 -04:00
mark_story
a80a7dadf8
Re-factor element generation.
...
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
2012-05-12 22:26:33 -04:00
mark_story
4f12f254f4
Add test for element.
2012-05-12 22:26:33 -04:00
mark_story
fd5a8a8d6b
Fix code standards.
...
Remove failing test, and fix coding standards.
2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec
Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element.
2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3
Added test cases for new features.
2012-05-12 22:26:33 -04:00
Magnus Johansson
0729aca706
Added some more intelligence to the CakeTime class
2012-05-12 22:25:48 -04:00
ADmad
14b7210d2b
Fixed server offset calculation
2012-05-13 06:20:29 +05:30
mark_story
9628910c86
Merge branch '2.1' into 2.2
2012-05-12 20:26:36 -04:00
mark_story
8103eae9f1
Make input prompt clearer in extract task.
...
Make the prompt display the paths that will be scanned. Hopefully
this makes the shell a bit easier to use and understand. Also
make the shell not accept 0 paths as a correct answer.
Fixes #2877
2012-05-12 20:26:11 -04:00
ADmad
0fdf9dd4d3
Merge pull request #649 from jellehenkens/2.2-router-test-typo
...
Fixing small variable typo in test case
2012-05-12 12:35:01 -07:00
Jelle Henkens
c2920aa3bf
Fixing small variable typo
2012-05-12 18:43:39 +01:00
mark_story
a3a2655fd5
Fix whitespace errors.
2012-05-11 21:38:21 -04:00
Mark Story
5d3291ba19
Merge pull request #645 from huoxito/2.2
...
Make controller test template extends ControllerTestCase instead of CakeTestCase
2012-05-11 17:35:34 -07:00
ADmad
eeff950cf9
Removing default null value for $data parameter. Refs GH pull request #646
2012-05-12 00:18:47 +05:30
Washington
287c7b432a
fix broken tests for TestTask class
2012-05-11 15:30:47 -03:00
Washington
c651bf25d3
remove stub class from controller tests template and mock condition to
...
make it extends ControllerTestCase
2012-05-11 14:51:56 -03:00
Rachman Chavik
335f3558a9
fixing null request returned by Router::getRequest()
...
fixes issues for Router::getRequest() called in a Plugin/Foo/routes.php
during bootstrap.
2012-05-11 22:16:17 +07:00
