Commit graph

74 commits

Author SHA1 Message Date
mark_story
8cdee90b4f Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers.
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
Juan Basso
9b6b258fed Replace function is_integer (alias) by is_int.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
ADmad
5049265a49 Fixed incorrect doc. block for TimerHelper::format 2009-09-20 11:08:48 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
jperras
2737062c6f Fixing doc block for TimeHelper::timeAgoInWords(). Fixes #27. 2009-08-13 13:57:15 -04:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
DarkAngelBGE
8f61c666c2 Removing usage of r() from core
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8252 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 20:51:24 +00:00
mark_story
bf4fa09b8f Removing whitespace introduced in [8014]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8093 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:33:47 +00:00
mark_story
e7c71b4125 Updating doc blocks in helpers. Helps generate cleaner API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8014 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-03 18:48:28 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
mark_story
5c962accc1 Fixing timehelper::fromString when input time is invalid.
Tests added and renamed for better consistentancy with other tests.
Closes #5556

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7713 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-08 17:19:07 +00:00
mark_story
9ae4975bff Applied patch from 'biscazziere' updated TimeHelper::timeAgoInWords() to be i18n friendly. Closes #5082.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7496 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 03:15:10 +00:00
mark_story
c5cfc77365 Removing php5 only code.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7402 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:34:17 +00:00
gwoo
cf8ddbada0 reverting accident commit in time helper from [7387]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7400 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 00:48:14 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
mark_story
5ec8eef6ce Added userOffset check to timeAgoInWords, tests added. Closes #5068.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7333 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-10 03:30:28 +00:00
nate
f7a4858503 Correcting coding standards violations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7220 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 11:57:56 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
mark_story
ed56a8e637 Added ability to define end user time offset to TimeHelper closes #2656
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6975 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-20 00:24:00 +00:00
the_undefined
fbbde864f7 Added $invalid parameter to format function, closes #2709
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6941 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 03:58:34 +00:00
the_undefined
ec628f0fd2 Converted date_string occurrences to dateString according to coding standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6940 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 03:58:17 +00:00
DarkAngelBGE
85cd5adaf1 changing numeric check in TimeHelper::wasWithinLast to remove the use of a php extension
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6761 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 15:04:02 +00:00
DarkAngelBGE
0628b24760 fixing the time helper leap year problem,
adding tests to time helper to bring it close to 90% coverage

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6758 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-05 14:38:03 +00:00
nate
b5d0baf98b Fixing TimeHelper::timeAgoInWords()/relativeTime(), fixes #4241
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6485 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-28 05:06:37 +00:00
nate
14122fd1e6 Refactoring TimeHelper, adding tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6378 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-15 04:29:55 +00:00
gwoo
d963a721b3 updating TimeHelper, fixes #3801
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6316 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-03 18:42:36 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
gwoo
b57ee695a4 updating TimeHelper, closes #1182
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6285 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 01:45:57 +00:00
gwoo
66fc807b93 note to self, remember to make a diff first
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6238 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 02:18:00 +00:00
gwoo
1ee0b564e1 adding TimeHelper::toQuarter() with range, closes #3121
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6237 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-24 02:16:20 +00:00
gwoo
0f6c59ce50 removing TimeHelper::trim() closes #3049
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5915 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 21:42:24 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00