Charles Pick 0a0ccf8dc9 Resolve merge conflicts

2013-08-20 23:30:12 +01:00

..

captcha

Changed header case Content-type to Content-Type

2013-08-03 11:25:20 +02:00

pagers

change copyright symbol

2013-01-15 18:38:02 +07:00

views

change copyright symbol

2013-01-15 18:38:02 +07:00

CActiveForm.php

Resolve merge conflicts

2013-08-20 23:30:12 +01:00

CAutoComplete.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CClipWidget.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CContentDecorator.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CFilterWidget.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CFlexWidget.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CHtmlPurifier.php

Indentation fixes again

2013-04-29 15:57:23 +03:00

CInputWidget.php

Fixes #1794: added ability to change widget ID via $htmlOptions['id'] array item in:

2013-06-27 21:52:21 +06:00

CMarkdown.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CMaskedTextField.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CMultiFileUpload.php

change copyright symbol

2013-01-15 18:38:02 +07:00

COutputCache.php

Improved documentation for php expressions

2013-05-01 23:16:00 +02:00

COutputProcessor.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CStarRating.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CTabView.php

Fixed unnecessary closing PHP tag in docblock.

2013-06-27 22:02:07 +06:00

CTextHighlighter.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CTreeView.php

change copyright symbol

2013-01-15 18:38:02 +07:00

CWidget.php

change copyright symbol

2013-01-15 18:38:02 +07:00