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 |
|
mark_story
|
27d7e2865e
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
|
2012-11-20 23:02:33 -05:00 |
|
Ceeram
|
e02eab05d5
|
Remove all todo from core, create tickets for them
|
2012-11-14 14:59:51 +01:00 |
|
mark_story
|
e0aab77dab
|
Merge branch 'master' into 2.3
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
|
2012-11-10 21:33:26 -05:00 |
|
Ceeram
|
aaf2d2ef71
|
fix remaining cs errors
|
2012-11-04 13:56:13 +01:00 |
|
ADmad
|
1e50ead75b
|
Fix coding standard error
|
2012-10-29 02:19:24 +05:30 |
|
ADmad
|
3ee267d7ef
|
Moving the mb_* functions to bootstrap.php
|
2012-10-23 16:58:07 +05:30 |
|
euromark
|
213d4caa85
|
coding standards
|
2012-09-20 01:50:15 +02:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
mark_story
|
69ab443ed6
|
Fix whitespace for coding standards.
|
2012-03-10 21:19:04 -05:00 |
|
mark_story
|
c5be343b72
|
Fix most of the coding standards issues in I18n/
There are a number of whitespace related issues in Multibyte, and
variable name related ones in I18n that cannot be easily changed.
|
2012-03-03 20:15:21 -05:00 |
|
Mark Story
|
21ac8492b1
|
Adding an int cast.
PHP 5.4 doesn't like floats for string offsets.
|
2011-12-27 21:57:33 -05:00 |
|
Kyle Robinson Young
|
51f9837db4
|
Code standards formatting
|
2011-12-15 22:52:07 -08:00 |
|
Juan Basso
|
f5a54d00dd
|
Changed methods and attributes from private to protected.
|
2011-08-20 00:43:34 -04:00 |
|
Juan Basso
|
895c10af7b
|
Adjusted some types in @param, @return and @var.
|
2011-07-31 22:57:17 -04:00 |
|
Juan Basso
|
070980b170
|
Fixed some API doc in i18n and network.
|
2011-07-28 23:56:10 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
AD7six
|
83e7028ecd
|
fix multibyte test case
put the mb_internal_encoding call in a file which is _always_ loaded
|
2011-05-17 18:41:35 +02:00 |
|
Jose Lorenzo Rodriguez
|
eea981940e
|
Replacing config string in favor of Config
|
2011-05-13 03:36:45 -04:30 |
|
evilbloodydemon
|
255dc1c44b
|
Unused variables in I18n removed
|
2011-04-23 00:02:07 +04:00 |
|
José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
b8344ecd33
|
Replacing some of the App::import by App::uses
|
2010-12-08 23:15:18 -04:30 |
|
José Lorenzo Rodríguez
|
5dddb362ec
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/config/ini_file.php
|
2010-12-06 09:42:52 -04:30 |
|
José Lorenzo Rodríguez
|
6b40c9c854
|
Moving I18n related classes to the new folder schema
|
2010-12-04 13:45:07 -04:30 |
|