Commit graph

4211 commits

Author SHA1 Message Date
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
3a1b0924c4 Additional doc tag fixes for Router. 2010-01-26 14:10:58 -05:00
Mark Story
c2e7e5642e Updating doc blocks for View and Theme View. 2010-01-25 18:14:16 -05:00
Mark Story
a77a064164 Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences. 2010-01-25 17:59:05 -05:00
Mark Story
134ce68dce Updating and correct doc blocks for lib classes.
Removing unused private property in Router.
2010-01-25 15:37:55 -05:00
Mark Story
38eac37bb1 Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252 2010-01-25 12:49:12 -05:00
Mark Story
f6d12dbde6 Adding support for CURRENT_TIMESTAMP to all dbo's. 2010-01-25 12:25:14 -05:00
Mark Story
59319b098b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:20:05 -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
7459da2aff Updating doc blocks for HttpSocket and File. 2010-01-25 11:18:44 -05:00
Mark Story
b33fdba6d9 Updating doc blocks on Folder class and implementing a few small refactors to make code simpler. 2010-01-25 11:18:33 -05:00
José Lorenzo Rodríguez
9c24c72db3 Fixing regression introduced in commit c2d19c2011, closes #258 2010-01-25 09:06:06 -04:30
José Lorenzo Rodríguez
c2d19c2011 Various Optimizations, thanks jrbasso. Closes #232 2010-01-23 22:33:53 -04:30
Mark Story
23a62b488b Updating and expanding documentation blocks in Dispatcher and CakeLog. 2010-01-22 18:11:49 -05:00
Mark Story
1877281cd8 Expanding doc blocks for Cache. 2010-01-22 17:54:28 -05:00
Juan Basso
ad496cea18 Optimized Security::cipher(). Fixes #176
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-22 15:34:02 -05:00
Mark Story
1cfd273052 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 15:44:53 -05:00
Mark Story
f4e837d985 Removing all methods currently issuing warnings about being deprecated. 2010-01-21 15:14:23 -05:00
José Lorenzo Rodríguez
e77ed92646 Merge branch '1.3-cache' into 1.3
* 1.3-cache:
  Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
  Removing php5 visibility keywords.
  Fixing various errors related to Cache::increment() and Cache::decrement().
  Removing test ignore
  Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
47c7387548 Fixing various errors related to Cache::increment() and Cache::decrement().
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
2d3cde1abb Updating doc block for ConnectionManager and including note about possible PHP4 issues. 2010-01-21 13:18:00 -05:00
Juan Basso
b21538c426 Getting a list of connections in the constructor of ConnectionManager
class. Fixes issues where using ConnectionManager::create() before the
standard connections are enumerated will result in the standard
connections never being enumerated.  Fixes #206

Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-21 12:59:00 -05:00
Mark Story
2915493049 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6 Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223 2010-01-21 11:59:49 -05:00
José Lorenzo Rodríguez
dff7e17fa2 Adding atomic increment and decrement methods to cache engines, closes #234 2010-01-21 12:11:44 -04:30
ADmad
a8040506b0 Fixing spacing between button tag attributes. Fixes #241 2010-01-21 22:03:03 +05:30
Mark Story
913450daef Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208 2010-01-21 10:35:20 -05:00
Juan Basso
c4afeb3fe6 Minor optimization on datasource and Mysql[i]. 2010-01-20 01:44:59 -04:30
Juan Basso
e328043586 Minor optimization in helper. No need cast, always is array. 2010-01-20 01:41:43 -04:30
Juan Basso
8d5acf0706 Infector::_cache is a protected method and no need be singleton. 2010-01-20 01:39:36 -04:30
Juan Basso
d2d19eeda4 Fixing import in CakeSession. 2010-01-20 01:06:34 -04:30
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
renan.saddam
39dd15d3f6 Removing the with key from otherFields array, also fixing the page title. Tests added. 2010-01-19 14:05:29 -02:00
Mark Story
e1b0c41254 Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220 2010-01-19 09:22:13 -05:00
Mark Story
9b3a2fd658 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-18 21:57:46 -05:00
Mark Story
080e34718d Minor refactor, and adding tests from previous commit. Fixes #208 2010-01-18 21:57:03 -05:00
AD7six
7943f3d168 allowing vritual fields to work whether specified with a model alias or
not. by concequence allows find('list', array('fields' => array('id',
'virtual'))) to work
2010-01-18 21:54:15 -05:00
Mark Story
06ba7ac828 Adding omitted default route, and test cases to test its functionality. Fixes #212 2010-01-18 10:05:23 -05:00
Juan Basso
473e07a674 Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -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
predominant
ab666f8ea7 Revert "Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14."
This reverts commit b50b5922fd.
2010-01-17 14:50:09 +11:00
Mark Story
92ff9ccae0 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 20:15:13 -05:00
predominant
b50b5922fd Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14. 2010-01-17 11:38:45 +11:00
Mark Story
8cae1e850a Fixing spacing. 2010-01-16 18:50:04 -05:00
Mark Story
826dbc466f Fixing failing test caused by merge with 1.2 2010-01-16 18:26:06 -05:00
José Lorenzo Rodríguez
3bd4cc07a6 Fixes to make TimeHelper and test cases more compatible with PHP 4 2010-01-15 17:48:41 -04:30
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
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
7088afbb88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 00:11:33 -05:00