ADmad
|
636cc8c103
|
Merge branch 'master' into 2.4
|
2013-06-09 18:08:32 +05:30 |
|
mark_story
|
e5b1182a0d
|
Only delete files that have a matching group + prefix.
Fixes #3873
|
2013-06-08 22:42:41 -04:00 |
|
ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
Marc Würth
|
4c9f0414cb
|
Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
|
2013-05-31 00:11:19 +02:00 |
|
ADmad
|
a10275fb8b
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
|
2013-05-05 14:36:46 +05:30 |
|
Rachman Chavik
|
5682907a88
|
Add Cache::groupConfigs() to get group->config map
|
2013-05-01 12:03:15 +07:00 |
|
euromark
|
09d9efe235
|
spelling corrections (a url to an URL, unify URL)
|
2013-04-29 11:05:17 +02:00 |
|
Rachman Chavik
|
03e5207aa1
|
Fix: write() after clearGroup() does not actually write to file
Although clearGroup() does not use $this->_File, it needs to be null-ed
so that subsequent write() call do not see stale object.
|
2013-04-26 14:43:36 +07:00 |
|
Adam Taylor
|
433dd09ec4
|
Fix typos
|
2013-03-05 00:05:14 -07:00 |
|
Marc Würth
|
f3262f768b
|
Fix two typos in CacheEngine.php
|
2013-02-25 07:53:28 +01:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01:00 |
|
Graham Weldon
|
66d856d883
|
Added extra line for referencing license file for copyright
|
2013-02-08 21:22:51 +09:00 |
|
Graham Weldon
|
7b860debe4
|
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
|
2013-02-08 20:59:49 +09:00 |
|
euromark
|
11a88042bd
|
fix doc block endings
|
2013-01-11 15:06:54 +01:00 |
|
euromark
|
05167a6420
|
assert that the cache does not silently fail
|
2013-01-07 13:43:21 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
euromark
|
881127ef4d
|
unify new lines at the end of the file
|
2012-12-05 15:00:24 +01:00 |
|
ADmad
|
72d6ca636f
|
Docblock fixes
|
2012-11-29 04:36:29 +05:30 |
|
Rachman Chavik
|
7d844866f0
|
RedisEngine: authenticate connection if 'password' is set
|
2012-11-02 09:38:18 +07:00 |
|
dogmatic69
|
408e619c9f
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
|
2012-10-01 02:08:00 +01:00 |
|
mark_story
|
59e948fb1b
|
Merge branch 'master' into 2.3
|
2012-09-28 21:20:24 -04:00 |
|
James Michael DuPont
|
2d46fc60be
|
Fixing undefined variable usage
Squash of pull request #872
|
2012-09-28 20:46:25 -04:00 |
|
dogmatic69
|
aa87791432
|
replacing is_integer() with is_int()
|
2012-09-15 11:15:01 +01:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
mark_story
|
7ae660c779
|
Merge branch '2.1' into 2.2
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
|
2012-06-10 20:05:25 -04:00 |
|
fiblan
|
d2ac734da6
|
Xcache is not available for php-cli
|
2012-06-08 11:14:22 +02:00 |
|
Jelle Henkens
|
ab1f336e21
|
Adding timeout and port options to the redis cache engine
|
2012-05-29 23:39:56 +01:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
Jose Lorenzo Rodriguez
|
5674e9fd17
|
Another micro-optimization, sorry
|
2012-04-23 23:42:57 -04:30 |
|
Jose Lorenzo Rodriguez
|
e7a7a177cc
|
Merge remote-tracking branch 'origin/2.2' into 2.2
|
2012-04-23 23:34:45 -04:30 |
|
Jose Lorenzo Rodriguez
|
63c0c2c75f
|
Very random micro-optimizations
|
2012-04-23 23:29:32 -04:30 |
|
mark_story
|
7e38f9d79f
|
Fix more coding standards errors.
|
2012-04-23 22:27:27 -04:00 |
|
Jose Lorenzo Rodriguez
|
02d222a349
|
Adhering to coding standards
|
2012-04-22 20:33:07 -04:30 |
|
Jose Lorenzo Rodriguez
|
042221bbf6
|
Merge branch '2.2-redis-engine' into 2.2
|
2012-04-22 19:14:24 -04:30 |
|
Jose Lorenzo Rodriguez
|
9f415d012c
|
Merge branch '2.2-cache-groups' into 2.2
Conflicts:
lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
|
2012-04-22 18:59:22 -04:30 |
|
Jose Lorenzo Rodriguez
|
e73bb27450
|
Merge remote-tracking branch 'origin/2.2-redis-engine' into 2.2-redis-engine
|
2012-04-11 23:24:39 -04:30 |
|
Jose Lorenzo Rodriguez
|
d588758783
|
Removing extra space after boolean cast
|
2012-04-11 23:22:38 -04:30 |
|
José Lorenzo Rodríguez
|
4958f0ee5d
|
Using a more specific function to check for numbers on redis engine read
|
2012-03-28 23:22:30 -05:30 |
|
José Lorenzo Rodríguez
|
e6a87bac40
|
Removing extra spaces
|
2012-03-28 23:18:32 -05:30 |
|
Jose Lorenzo Rodriguez
|
f105abde4e
|
Implementing Redis cache engine
|
2012-03-28 23:30:33 -04:30 |
|
Jose Lorenzo Rodriguez
|
2a1e4a2aae
|
Making clearGroup() a no-op method instead of abstract to ease migration to 2.2
|
2012-03-27 00:08:24 -04:30 |
|
Jose Lorenzo Rodriguez
|
2bb3dc6bf7
|
Reducing key length when using groups in WincacheEngine
|
2012-03-27 00:07:23 -04:30 |
|
Jose Lorenzo Rodriguez
|
afba5aafb7
|
Redcing key name when using groups in MemcacheEngine
|
2012-03-27 00:05:56 -04:30 |
|
Jose Lorenzo Rodriguez
|
27b90b0e47
|
Reducing key size when using groups in ApcEngine
|
2012-03-27 00:01:34 -04:30 |
|
Jose Lorenzo Rodriguez
|
2100a64ffd
|
Prefixing group names in XcacheEngine
|
2012-03-27 00:00:52 -04:30 |
|
Jose Lorenzo Rodriguez
|
ffdd98be1b
|
Prefixing group names in WincacheEngine
|
2012-03-26 23:35:15 -04:30 |
|
Jose Lorenzo Rodriguez
|
98b14ff144
|
Prefixing group names in MemcacheEgine
|
2012-03-26 23:34:03 -04:30 |
|
Jose Lorenzo Rodriguez
|
957322ec82
|
Prefixing group names with the cache enging prefix to avoid possible conflicts with shared servers
|
2012-03-26 23:02:26 -04:30 |
|
Jose Lorenzo Rodriguez
|
cf2b6acd71
|
Fixing some typos
|
2012-03-26 00:29:02 -04:30 |
|