Commit graph

1023 commits

Author SHA1 Message Date
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Mark Story
98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:18:44 -05:00
Mark Story
85b193048d Fixing ConsoleShell's use of Router. Fixes #236 2010-01-20 10:47:04 -05:00
ADmad
22073e3376 Renaming Configure var 'Security.cipher_seed' to 'Security.cipherSeed'. Also added a srand() call at end of Security::cipher function to reset seed. Closes #73 , #183 , #218 2010-01-20 01:23:20 +05:30
tPl0ch
49ad582759 Fixes #222 . Fixed ShellDispatcher constructors to not issue warnings on PHP5.3 with E_STRICT
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-19 09:19:21 -05:00
Juan Basso
d60a66f16b Separate the variables of internationalized strings in controllers of cake bake.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:10:31 -05:00
Juan Basso
0ac99eddb5 Replacing "echo sprintf" by "printf" where possible. Fixes #209.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 00:56:22 -05:00
ADmad
2441849fa0 Replacing constant CIPHER_SEED with Configure class variable 'Security.cipher_seed' and renaming Security class method 'checkSessionKey' to 'checkSecurityKeys' 2010-01-16 03:26:26 +05:30
Mark Story
813a7779e0 Removing inflections.php from skel directory. 2010-01-15 13:28:09 -05:00
Mark Story
c20aba6b9c Merge branch 'merger' into 1.3 2010-01-15 13:27:19 -05:00
Mark Story
f11068b831 Trimming trailing whitespace from files. Refs #201 2010-01-15 13:26:47 -05:00
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
f2cc41bb3a Fixing php4 issues for AclShell test case. 2010-01-14 22:15:14 -05:00
Mark Story
8f2a4a1e0e Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a Trimming trailing whitespace from files. Refs #201 2010-01-14 20:15:54 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
Mark Story
8243afa383 Updating css file in skel dir. 2010-01-13 23:03:02 -05:00
Mark Story
e60243c464 Merge branch '1.3' into scaffold-design 2010-01-13 22:16:47 -05:00
Mark Story
619f9210f3 Removing orphaned method. 2010-01-13 21:55:32 -05:00
Mark Story
f93094b6ea Moving skel/config/sql to skel/config/schema
Updating index.php and test.php in skel dir.
2010-01-13 00:17:15 -05:00
Mark Story
53f0771a48 Fixing output of 'Actions' in bake templates. Now outputs a __() call. 2010-01-13 00:14:57 -05:00
Mark Story
ee8ebce837 Merge branch '1.3' into scaffold-design 2010-01-12 23:33:52 -05:00
Mark Story
dc00cfe539 Adding &nbsp; to baked index files to fix rendering issues in IE. 2010-01-12 18:28:16 -05:00
Juan Basso
5149d65c7e Adding redirect to baked controllers so when no delete could be done an
error page is not displayed.
Fixes #188

Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-11 18:07:29 -05:00
Mark Story
4a96f52be9 Refactoring testsuite shell and consolidating duplicated filename generation logic. 2010-01-11 18:04:38 -05:00
Mark Story
980a85cec4 Updating testsuite shell to use new CodeCoverage methods. 2010-01-10 15:55:09 -05:00
Mark Story
f4bda62ea3 Adding doc blocks and correcting constructor of CakeCliReporter
Fixing TestSuite console code coverage output.
2010-01-09 23:00:03 -05:00
Mark Story
081509a09c Fixing typos.
Removing useless constant.
Fixing constructor
2010-01-09 21:30:46 -05:00
Mark Story
696af91aa0 Refactoring testsuite shell features, and adding i18n text. 2010-01-09 21:25:05 -05:00
Mark Story
80670d85fb Updating TestSuite shell to use refactored classes and methods in the TestSuite. 2010-01-09 20:20:51 -05:00
Mark Story
1e0215b7c1 Correcting whitespace. 2010-01-09 19:44:50 -05:00
Mark Story
95135d18cc Merge branch '1.3' into 1.3-misc 2010-01-03 23:36:32 -05:00
predominant
47fc47ff59 Refs #147. Adding more verbose baked validations for models. 2010-01-01 17:28:05 +11:00
Mark Story
a9a8c0b0e4 Adding access tags and additional param/return docs. 2009-12-29 22:50:43 -05:00
Mark Story
fdd8cf0138 Making FixtureTask always refresh schema for models. 2009-12-29 22:39:49 -05:00
Mark Story
31fff5e390 Making ViewTask always refresh model schema so baked views reflect current schema. 2009-12-29 22:23:52 -05:00
Mark Story
ec88bd9c8c Forcing ModelTask to always reload schema for models when baking. Also setting the dbo's cacheSources = false so table listings are always fresh as well. 2009-12-29 22:23:03 -05:00
Mark Story
b0a50e10b7 Updating bake templates and default css file. 2009-12-28 23:13:04 -05:00
Mark Story
1216884a30 Starting work on bake template redesign. 2009-12-28 23:13:04 -05:00
Mark Story
1183846390 Removing $cakeDebug from skel layout. 2009-12-28 10:20:11 -05:00
Mark Story
9230bb93af Merge branch '1.3' into 1.3-misc 2009-12-16 23:07:44 -05:00
Mark Story
780e85a031 Refactoring ModelTask::_confirmAssociations() so it doesn't fail with $i counter. 2009-12-15 23:14:03 -05:00
ceeram
64045e1e18 Apply new Helper syntax to remaining files
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-14 18:52:13 -05:00
predominant
6be2fd05e4 Changing default Security.level to medium. 2009-12-13 11:59:14 +11:00
Mark Story
6615094350 Merge branch '1.3' into 1.3-misc 2009-12-10 23:42:55 -05:00
Mark Story
76780ab99c Updating uses of Routing.admin to be Routing.prefixes, as Routing.admin is deprecated. 2009-12-08 23:52:02 -05:00
predominant
8b9ee22c84 Removing "Long description for file" from /cake/console tree. 2009-12-08 20:18:19 +11:00
ADmad
e2c4c0d4de Removed adding of Html and Form helper by default to baked controllers as its not DRY and they are alrady inherited from Controller class. If var helpers is declared in AppController, Html and Form should be included there. 2009-12-08 01:41:52 +05:30
mark_story
24b636cc71 Merge branch 'mergers' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00