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
euromark
a9de83daeb
console cake cleanup and unification
...
remove duplicate define
2014-06-17 02:28:52 +02:00
mark_story
8f5acb0932
Fix CS errors in skel/
2014-05-27 23:21:32 -04:00
Mark Story
f287bc76c0
Force .bat files to have CRLF endings.
...
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.
Hopefully this fixes the issue.
Fixes #3585
2014-05-27 19:06:08 -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
euromark
85337a5d15
correct templates
2014-01-03 13:28:45 +01: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
mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08: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
Eric Büttner
1e3865acc7
formatting app::uses blocks (refs #2265 )
2013-11-18 11:56:00 +01:00
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
Bryan Crowe
8eb6652fd7
Change Cake to CakePHP
2013-10-28 22:14:50 -04:00
Marc Würth
0e348dfbbd
Improved wording of link to GH repo in home.ctp
2013-10-24 15:51:59 +02:00
James Watts
65ad320d6f
Revised CakePHP and external links on the home page
2013-10-24 12:59:52 +02:00
mark_story
328fcdc376
Sync skel and app directories.
...
Closes #1698
2013-10-22 22:18:59 -04:00
Marc Würth
ae00916753
Added display of CakePHP version to the default layout
...
Refs https://github.com/cakephp/cakephp/issues/2077#issuecomment-26377120
2013-10-16 02:07:59 +02:00
Marc Würth
fcb7f86b76
include calls without parentheses
...
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
2013-10-16 01:40:45 +02: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
60b0893c79
Merge branch 'master' into 2.5
2013-10-06 23:49:32 -03:00
Bryan Crowe
4dfd37909f
Fixed CS error
2013-10-03 22:05:46 -04:00
euromark
1c6a379346
Fix issue 4116 and also merge both versions of home.ctp
2013-09-30 20:45:26 +02: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
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
Mark Story
863abf2a7f
Merge pull request #1599 from mvdriel/fix-identing
...
Fixed identing and spacing
2013-09-02 04:46:51 -07:00
Mark van Driel
38820e0a16
Fixed identing and spacing
2013-09-02 13:22:44 +02:00
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
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
