mark_story
|
d1f5acd0e0
|
Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
cake/console/libs/shell.php
cake/libs/model/connection_manager.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/groups/database.group.php
|
2009-10-14 00:51:55 -04:00 |
|
mark_story
|
4794680444
|
Deprecating CakeSession::del(), use delete() instead.
Updating file headers.
Updating test cases.
|
2009-10-02 13:11:43 -04:00 |
|
mark_story
|
1b063d6218
|
Reformatting code in CakeSession.
|
2009-09-01 23:25:03 -04:00 |
|
AD7six
|
a4bc755cc7
|
whitespace normalization
|
2009-08-02 16:10:24 -07:00 |
|
gwoo
|
15ed658a27
|
Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
|
2009-08-02 15:59:54 -07:00 |
|
AD7six
|
fd0aaefb39
|
whitespace normalization
|
2009-07-26 12:46:07 +02:00 |
|
gwoo
|
cfb46024d7
|
fixing Configure where Set is not found.also adding to CakeSession
|
2009-07-25 12:32:02 -07:00 |
|
gwoo
|
766e12bc2a
|
Merge branch '1.3' into 1.3-newlines
|
2009-07-25 10:41:40 -07:00 |
|
AD7six
|
b2142df2bc
|
adding a newline before all comment blocks
|
2009-07-24 21:18:37 +02:00 |
|
gwoo
|
61c2c3009d
|
updating session requires and removing deperacted method from text helper
|
2009-07-23 13:07:03 -07:00 |
|
gwoo
|
0ea02c5a94
|
Merge branch 'master' into 1.3
|
2009-06-03 10:00:56 -07:00 |
|
gwoo
|
303bc0fc89
|
fixing up some tests. pretty much all greens for me.
|
2009-06-02 17:21:15 -07:00 |
|
gwoo
|
5f2ee8fc44
|
renaming session to cake_session
|
2009-06-02 14:52:30 -07:00 |
|