Commit graph

579 commits

Author SHA1 Message Date
phpnut
fec633f227 Corrected bad merge on model.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3479 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:42:51 +00:00
phpnut
678ec860a1 Adding fix from #1215
Fixes issues with saving HABTM

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3478 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 18:37:51 +00:00
phpnut
27fc6bced9 Fixing error when using associations with recursive level deeper then 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3474 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 02:47:11 +00:00
phpnut
10ad71b30c Adding fix for association query when the association has a null value
for a FK


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3473 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 02:11:38 +00:00
phpnut
9fa1748678 "Refactoring email component,
adding smtp method for sending email using smtp"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3471 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-12 01:55:32 +00:00
phpnut
40d39976c1 "Adding initial design for EmailComponent.
This is still being developed and has not been fully tested as it is.
Some vars are not used yet."

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3470 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-12 00:26:50 +00:00
phpnut
dbdf3c7ddc "Adding vars to the EmailComponent class"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3469 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 20:37:13 +00:00
phpnut
8faed8a111 "Adding elements/email "
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3468 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 20:13:28 +00:00
phpnut
3078352759 "Adding email component class"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3467 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 20:06:01 +00:00
nate
39c32d0454 Adding default parameter for TextHelper::truncate
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3466 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 18:01:00 +00:00
dho
6af78cde12 Adding folder for custom tasks and a task to create the application skeleton
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3465 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 09:05:12 +00:00
nate
93f7dd32ca Fixing issue with magic field values ({$__cake_ID__}) being quoted twice
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3464 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 07:09:14 +00:00
nate
198dab8a46 Filtering out empty magic fields when saving models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3463 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 00:35:06 +00:00
nate
e1696b55c6 Committing suggested DEBUG setting change from Ticket #1056
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3462 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 17:32:52 +00:00
nate
28b18839c3 Minor fixes and updates to HtmlHelper and FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3461 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 17:30:29 +00:00
nate
725a2700aa Updating Router method name, and adding magic route variables
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3460 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 17:25:44 +00:00
nate
c42b793266 Minor update to Controller::postConditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3459 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 17:08:53 +00:00
phpnut
e08a4a1da6 Merging changes for SessionHelper into 1.2.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3458 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 14:33:20 +00:00
dho
5dcd93f0ff Adding execute function to interface
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3457 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 14:11:21 +00:00
dho
4df649dae5 Adding help function
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3456 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 13:50:23 +00:00
nate
8cfaa0538b Adding SessionHelper to 1.2 branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3455 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-07 20:35:35 +00:00
phpnut
eb202d44f9 Merging fixes into trunk:
Revision: [3440]
Adding note to api doc of the redirect function (#1358)

Revision: [3439]
Revoking previous change, fixing bug in api doc

Revision: [3432]
added fix for #1352

Revision: [3430]
Adding nl2br in Sanitize::html

Revision: [3420]
Typo fixed

Revision: [3383]
Refactoring last commit for admin check

Revision: [3382]
Adding fix for admin being searched in entire string

Revision: [3379]
Fixing errors when CSS not showing after recent fixes to error class

Revision: [3376]
Backporting string-escaping fix from 1.2 for Ticket #

Revision: [3373]
Adding Windows-specific port delimiter for connecting to SQL Server (Ticket #1261).

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3454 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-07 19:23:27 +00:00
nate
fe903b2531 Adding regex limiter for route $requirements
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3453 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-06 12:57:17 +00:00
nate
f9b45b4114 Adding $requirements parameter to Router::connect(), to enable custom named expressions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3452 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-06 03:41:38 +00:00
nate
d232f47d72 Adding CGI_MODE detection and CGI-mode SCRIPT_NAME emulation to env()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3451 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-05 18:10:59 +00:00
nate
213e22b1a8 Adding descrption compatiblity fixes to SQLite driver (Ticket #1211)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3450 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-05 15:37:13 +00:00
nate
9f454bf5b9 Fixing operator parsing issue with array-based conditions (Ticket #1364)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3447 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-04 13:37:26 +00:00
nate
c40e3e355c Fixing class load order in vendors() and uses()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3446 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-03 06:46:43 +00:00
nate
a4dbb38d78 Fixing field() issue in HtmlHelper::radio()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3445 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-01 13:47:21 +00:00
nate
0856014477 Fixing undefined default action issue in Router
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3444 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-31 19:23:11 +00:00
nate
e812204ebc Moving model and field information into view
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3443 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-30 16:23:24 +00:00
nate
cb87dfc71d Fixing issue with empty $conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3442 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-30 16:00:20 +00:00
nate
fe3522c305 Adding Controller::disableCache() method, to send cache-disabling headers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3441 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-29 19:09:35 +00:00
dho
fa38da38e5 Adding note to api doc of the redirect function (#1358)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3440 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-29 07:05:43 +00:00
dho
614131b7a7 Revoking previous change, fixing bug in api doc
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3439 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-29 06:07:31 +00:00
nate
88079265b2 Adding $scripts_for_layout view variable, View::addScript(), and extra parameters to relevant HtmlHelper methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3438 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-28 20:41:08 +00:00
nate
05d954a5bf Adding quotes around JSON keys (Ticket #702)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3437 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-28 15:40:19 +00:00
nate
00df232f9e Fixing /admin issue with HtmlHelper::url() (Sort-of covered by Ticket #1340)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3436 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-27 17:49:50 +00:00
nate
b46c20ead4 Fixing limit/offset bug in hasMany/hasAndBelongsToMany associations, to enable paging of related models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3435 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-27 16:47:05 +00:00
nate
6156bae011 Adding Router param setting enhancements from a *long* time ago
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3431 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-25 17:38:53 +00:00
dho
feb526a9ba Adding nl2br in Sanitize::html
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3430 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-25 12:45:07 +00:00
nate
554b4ceb42 Fixing DataSource calls for PHP4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3429 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-25 00:43:48 +00:00
nate
eff03b1dea Fixing associative array issue with normalizeList()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3428 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-24 12:40:19 +00:00
nate
4f53c301a8 Fixing URLs in HtmlHelper::meta(), and moving textarea() to FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3427 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 19:35:08 +00:00
nate
cdb11b2ba2 Changing $params['url']['extension'] to $params['url']['ext']
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3426 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 12:08:44 +00:00
nate
e2efcc108c Initial import of RSS and XML helpers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3425 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 08:05:44 +00:00
nate
419808f7df Adding RequestHandler::responseType() to get current response header, and adding automagic loading of helpers based on request content type
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3424 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:44:10 +00:00
nate
8041562a76 Adding variable access convenience methods to View
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3423 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:32:59 +00:00
nate
4c45120b75 Fixing '#' issue with HtmlHelper::url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3422 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:29:13 +00:00
nate
2370ee9512 Adding default RSS layout, and upading default XML layout
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3421 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:28:29 +00:00