mark_story
|
cd3c54bb9d
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/VERSION.txt
|
2013-06-10 22:12:10 -04:00 |
|
euromark
|
a6f065e7a2
|
coding standards whitespace and single quote
|
2013-06-09 17:20:08 +02: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
|
fb86859585
|
Merge branch 'master' into 2.4
|
2013-05-19 14:37:41 +05:30 |
|
euromark
|
97c2cb367d
|
CS fixes
|
2013-05-17 10:36:17 +02:00 |
|
mark_story
|
aee8b50507
|
Merge branch 'master' into 2.4
|
2013-04-15 21:48:26 -04:00 |
|
mark_story
|
8eb56960d8
|
Remove remaining reference operators.
These were left over from the days of 1.x and aren't needed anymore.
|
2013-04-15 21:23:48 -04:00 |
|
Henrik Gemal
|
f46e00c7d9
|
Adding Kalaallisut locale
From pull request 1163
Fixes #3634
Signed-off-by: mark_story <mark@mark-story.com>
Conflicts:
lib/Cake/I18n/L10n.php
|
2013-03-01 22:02:42 -05:00 |
|
mark_story
|
d1c88ebf8a
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
|
2013-02-24 20:24:26 -05:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01:00 |
|
euromark
|
23ef13f9c7
|
adding Kazakh and correcting some locales
|
2013-02-10 20:07:09 +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 |
|
Ceeram
|
3f4d24bfc0
|
remove unused local variables and a few improvements
|
2012-12-23 13:53:13 +01:00 |
|
euromark
|
b811afbc44
|
double spaces to single ones
|
2012-12-22 23:48:15 +01:00 |
|
euromark
|
2b1e5b02b5
|
code cleanup
|
2012-12-21 00:40:12 +01:00 |
|
Mark Story
|
0230fa102a
|
Merge pull request #975 from dereuromark/2.3-i18n
use CakeSession wrapper in i18n class
|
2012-11-28 18:33:39 -08:00 |
|
ADmad
|
72d6ca636f
|
Docblock fixes
|
2012-11-29 04:36:29 +05:30 |
|
euromark
|
c3e501b2d9
|
use CakeSession wrapper
|
2012-11-27 00:09:21 +01: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 |
|
dogmatic69
|
641ba9f3e6
|
Merge branch '2.3' into type-checks
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
|
2012-10-24 19:03:44 +01:00 |
|
ADmad
|
3ee267d7ef
|
Moving the mb_* functions to bootstrap.php
|
2012-10-23 16:58:07 +05:30 |
|
ADmad
|
1763f46340
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/bootstrap.php
|
2012-10-23 16:53:01 +05:30 |
|
ADmad
|
922d9865fa
|
Moving multibyte encoding setting to bootstrap.php. Closes #3290
|
2012-10-23 13:20:01 +05:30 |
|
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 |
|
euromark
|
a33b187a09
|
doc block correction
|
2012-09-28 14:51:51 +02:00 |
|
euromark
|
032704346a
|
after correcting nld the iso standard should be enforced for all languages
|
2012-09-28 14:46:29 +02:00 |
|
euromark
|
c87b53a7d8
|
correcting iso standard for nld (dutch) - making dut the alias
|
2012-09-27 10:10:40 +02:00 |
|
euromark
|
213d4caa85
|
coding standards
|
2012-09-20 01:50:15 +02:00 |
|
dogmatic69
|
a38a616cba
|
changing join() to implode() for consistency
|
2012-09-15 11:06:02 +01:00 |
|
dogmatic69
|
22a2e1b51e
|
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
|
2012-09-14 18:42:25 +01:00 |
|
Jelle Henkens
|
f7ce5262b7
|
Updating mixed @param documentation to seperate list of accepted types
|
2012-05-21 21:55:10 +01:00 |
|
mark_story
|
9f9feec222
|
Merge branch '2.2-hash' into 2.2
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
|
2012-04-10 21:32:37 -04:00 |
|
ADmad
|
1949a20b5a
|
Ensure L10n::get() consistently returns the set language. Closes #2737
|
2012-04-09 00:49:24 +05:30 |
|
ADmad
|
35b48c2c8c
|
Fix indentation
|
2012-04-09 00:43:04 +05:30 |
|
mark_story
|
17bfbbb9df
|
Port over Set to Hash usage.
|
2012-03-26 22:32:55 -04:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
69ab443ed6
|
Fix whitespace for coding standards.
|
2012-03-10 21:19:04 -05:00 |
|
mark_story
|
664b0538b8
|
Fix more coding standards problems.
|
2012-03-04 22:49:38 -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 |
|
euromark
|
e94d307ee1
|
code conventions
|
2012-02-25 19:46:05 -05:00 |
|
ADmad
|
30522d0219
|
Adding $language parameter to I18n::translate()
|
2012-01-10 00:51:48 +05:30 |
|
ADmad
|
08825e54b7
|
Replacing hardcoded default domain with static property I18n::$defaultDomain
|
2012-01-10 00:51:48 +05:30 |
|
ADmad
|
1f246d61ca
|
Refactoring I18n class to expose public methods to read .po, .mo and locale definition files.
|
2012-01-10 00:51:47 +05:30 |
|