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
phpnut
160cd28440
Correcting @return int
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
phpnut
da97a5c871
Correcting @return bool
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596
Adding documentation to classes belonging to Cake console.
...
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
phpnut
603ed0e39c
Initial start of Unicode support, I may move this handling of this to a unicode class.
...
Implemented multi-byte methods for:
String::strpos();
String::stripos();
String::strtoupper();
Added test cases for String::utf8() String::ascii() String::strpos() String::stripos() and String::strtoupper()
Corrected file encodings.
Added loading of configurations from cake/config
Added specifc case folding files to cake/config/unicode/casefolding
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5691 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-24 23:49:54 +00:00
phpnut
23dfd90b29
Correcting code structure to standards
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
phpnut
a8a91e35be
Correcting all headers in the files
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
nate
de52eb88c9
Updating helper class hierarchy, and adding 1.2 fix for Ticket #1569
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3750 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:40:34 +00:00
gwoo
80481ae318
added extract() to Set, added format() to TimeHelper, fixed bake admin views creation
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3636 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-13 07:41:10 +00:00
nate
f762385bf6
Removing AUTO_OUTPUT references from TimeHelper
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3418 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:26:03 +00:00
phpnut
7232325624
Added TimeHelper::gmt()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3354 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-03 18:50:06 +00:00
nate
0a5b1b6450
Adding fix for Ticket #1063
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3234 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-12 04:25:00 +00:00
nate
9e00a87b1c
Adding fix for Ticket #20 , added isThisWeek(date) and isThisMonth($date)
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3117 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 19:26:13 +00:00
nate
79ba4fa94d
Fixing code formatting
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3114 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 15:29:06 +00:00
phpnut
e5c074a0dc
Merging fixes into 1.x.x.x branched code:
...
Revision: [2955]
Revision: [2951]
Revision: [2918]
Revision: [2911]
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00
phpnut
5e268e0805
Merging fixes into 1.x.x.x branched code:
...
Revision: [2802]
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
32f9e1e0e5
Merging fixes into trunk.
...
Revision: [2522]
renamed Bake class file
Revision: [2521]
removing old bake scripts
Revision: [2520]
Adding new Bake script
Revision: [2519]
Adding fix for Ticket #622
Revision: [2518]
Adding fix for Ticket #535
Revision: [2517]
Adding fix for Ticket #648 , associated records are now post-processed by afterFind() method in associated model
Revision: [2516]
Adding fix for Ticket #618
Revision: [2515]
More error page fixes
Revision: [2514]
Adding fix for Ticket #690
Revision: [2513]
Removing empty method
Revision: [2512]
Adding fix for Ticket #675
Revision: [2511]
More fixes for Ticket #670
Revision: [2510]
Adding fix for Ticket #670 , and removing pointless part of Helper::output(), since print() *always* returns 1.
Revision: [2509]
Adding fixes for Tickets #677 and #681
Revision: [2508]
Added patch from Ticket #632
Revision: [2502]
Adding fix to prevent model ID from getting overwritten when saving HABTM data [TEST ME] - thanks sdevore
Revision: [2501]
Rewriting foreach loops in queryAssociation()
Revision: [2493]
Adding fix for Ticket #673
Revision: [2492]
Adding reconnect() method, to reconnect to database with different settings
Revision: [2491]
Adding Microsoft SQL Server driver [EXPERIMENTAL]
Revision: [2490]
Fixing a bug that occurs when connecting to two different databases on the same server, and enabling cross-database model associations
Revision: [2488]
Adding fix for Ticket #651
Revision: [2487]
Adding fix for Ticket #665
Revision: [2486]
Adding fix for Ticket #655
Revision: [2485]
Forcing DboMysql to validate disconnect, and adding fix for Ticket #663
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2528 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:24:57 +00:00
phpnut
a75e08976f
Merging fixes and enhancements into trunk
...
Revision: [2025]
A little more work on plugin to set some default routing.
Revision: [2024]
Changed DboSource::field() so the name() is not called for some field variables.
Revision: [2023]
Changes made in [2022] should only check if the $conditions is not empty.
Revision: [2022]
Changed DboSource::conditions() so it will add the "ticks" needed around the Model.field names.
The Model.field name conventions must be used for this to work.
Revision: [2021]
Adding fix for Ticket #405
Revision: [2020]
Added fix for Ticket #403
Revision: [2019]
Added patch from Ticket #404 .
Fixing formatting of files.
Revision: [2018]
Fixing formatting of files
Revision: [2017]
Fixed bad search and replace
Revision: [2016]
Fixing formatting of files
Revision: [2015]
Replaced all 3 space indents with 4 space indents
Revision: [2014]
Updating variables to use the naming proper conventions
Revision: [2013]
Added patch from Ticket #406
Revision: [2012]
Adding fix for Ticket #407 .
Fix variables that where not formatted per the coding conventions
Revision: [2011]
Adding patch from Ticket #401
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2026 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-18 23:42:21 +00:00