antograssiot
c2f298a8b7
Replace our custom code fence with markdown standard fence
2015-01-09 13:47:25 +01:00
euromark
5c5fb59c8d
Allow apps to overwrite translation domains from third party plugins.
2014-12-23 13:09:53 +01:00
Stephen Cuppett
9a0b6ada38
Update database.php.default to include sslmode
2014-11-20 22:37:39 -05:00
Mischa ter Smitten
a441a71f77
Improved doc block
2014-09-18 11:55:31 +02:00
Mischa ter Smitten
a69e9bc63b
Cs fixes
2014-09-18 10:50:35 +02:00
mark_story
08de917b3c
Fix accidental typo in SQL file.
...
Fixes #4061
2014-07-22 09:38:46 -04:00
mark_story
b129ce512e
Update db_acl.sql to use correct column names.
...
The column names added in bb15271
were incorrect.
Fixes #4052
2014-07-21 21:30:05 -04:00
euromark
009138b326
Fix CS
2014-07-05 13:49:50 +02:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
65d14c7e97
Remove mention of Role/default as it doesn't exist.
...
The default role merging was removed in
3abfaeecf3
and shouldn't be mentioned in
the docs.
Fixes #3871
2014-07-03 09:10:20 -04:00
mark_story
3a06e1f638
Update code examples to be consistent with other docs.
2014-07-03 09:09:25 -04:00
Anatoliy Petrovskiy
ad678e3988
improving acl perfomance
2014-06-23 13:51:52 +03:00
Anatoliy Petrovskiy
bb15271622
improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function
2014-06-20 20:49:02 +03:00
mark_story
8f5acb0932
Fix CS errors in skel/
2014-05-27 23:21:32 -04:00
mark_story
5544fcc4c2
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2014-03-03 21:20:58 -05:00
Bryan Crowe
003d1a6d47
Add missing semi-colon, fixes #2937
2014-03-03 01:03:56 -05:00
James Michael DuPont
316def45cb
adding in simple doc for db_acl
2014-03-02 10:25:47 -06:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
Saleh Souzanchi
4639d3597c
add DispatcherFilter Settings
2013-12-18 06:54:27 +03:30
Bryan Crowe
20faace775
Clean up grammar in Configure timezone in bootstrap
2013-12-16 21:59:29 -05:00
Bryan Crowe
3a7650ad9b
Remove smart quotes from Configure timezone in bootstrap
2013-12-16 21:51:36 -05:00
Bryan Crowe
708d462bf9
Add Configure timezone to boostrap
2013-12-16 21:14:32 -05:00
Rob Spencer
cda9320e96
Added support for passing additional flags to mysql connection
2013-11-24 00:47:06 -05:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
mark_story
328fcdc376
Sync skel and app directories.
...
Closes #1698
2013-10-22 22:18:59 -04:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04:00
Bryan Crowe
bb65765d70
Updated additional references of Cake to CakePHP
2013-09-27 21:31:35 -04:00
mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04:00
Bryan Crowe
915b51b239
Updated JavaScript casing and JsHelper references in doc blocks
2013-09-25 22:46:38 -04:00
Bryan Crowe
e00812d3f8
Updated doc block readability in bootstrap.php
2013-09-23 21:09:26 -04:00
mark_story
a7a6fcae8a
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
ADmad
29d0e26710
Dropping 'Log' suffix from log configs as per change in cb24dbb084
.
...
Reverts regressive change done in 7e28636a72
.
2013-09-05 19:37:41 +05:30
mark_story
9b0e26cc21
Deprecate MemcacheEngine and update defaults for Memcached
...
People should switch to Memcached instead. The underlying extension is
better maintained and provides improved features and performance.
Collapse the persistent and persistentId settings, while also making
non-persistent connections the default. Persistent connections should be
an opt-in feature as having them enabled by default could go very wrong
on shared hosting environments.
2013-08-31 13:29:54 -04:00
mark_story
f18d354f55
Merge branch 'master' into 2.4
2013-08-28 12:35:07 -04:00
Andras Kende
17f9661961
Added mask to File cache docblock
2013-08-27 10:02:48 -04:00
euromark
80d55feda6
also remove app ones
2013-08-25 21:42:03 +02:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
881e757a1e
Paths for App::build() require trailing /.
2013-07-22 13:51:09 +02:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07: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