Carsten Brandt 82dc3b124c Merge branch 'master' into redis ...

* master: (131 commits)
  css fix.
  Finished model generator.
  more tests for FileHelper
  Added note about theme asset bundle to bootstrap widgets guide
  fixed typos in ArrayHelperBase phpdoc
  More tests for ArrayHelper and Inflector
  Fixed typo and code style
  Fixes #21: implemented jQueryUI Slider
  Fixes #790: added visible for Nav and Dropdown
  finished rule generation for model generator.
  bug fix of form generator.
  minor fixes of debugger.
  Added SafeValidator.
  fix dataProvider getSort()
  cleanup MemCache timeout API after #804
  Added failureCallback, reduced timeouts to 1s
  Mentioning that timeoutms is available in memcache only.
  set default format for gridview to text
  Removed extra line
  Added timeoutms parameter in MemCache
  ...

Conflicts:
	tests/unit/data/config.php

2013-08-26 18:10:06 +02:00

..

assets

refactored ActiveField.

2013-08-14 21:17:13 -04:00

base

Added StringHelper::diff().

2013-08-19 08:52:39 -04:00

behaviors

Fixes issue #600.

2013-07-05 16:29:01 -04:00

bootstrap

Fixes #790: added visible for Nav and Dropdown

2013-08-26 01:23:27 +04:00

caching

Merge branch 'master' into redis

2013-08-26 18:10:06 +02:00

captcha

code style fixes

2013-08-13 02:43:47 +04:00

console

Finished documentation of Console Helper and Controller

2013-08-12 02:27:23 +02:00

data

fix dataProvider getSort()

2013-08-24 23:43:17 +02:00

db

Merge branch 'master' into redis

2013-08-26 18:10:06 +02:00

debug

css fix.

2013-08-26 08:39:27 -04:00

gii

css fix.

2013-08-26 08:39:27 -04:00

grid

set default format for gridview to text

2013-08-24 16:44:04 +02:00

helpers

fixed typos in ArrayHelperBase phpdoc

2013-08-26 03:21:37 +04:00

i18n

added missing GettextMessageSource phpdoc

2013-07-21 19:23:24 +04:00

log

Added more YII_ENV constants.

2013-07-31 07:18:59 -04:00

messages

Fixes #722.

2013-08-06 13:38:29 -04:00

rbac

renamed Command::queryRow() to queryOne().

2013-07-09 08:01:10 -04:00

requirements

Updated bootstrap to release version including wrappers and views

2013-08-21 03:00:13 +04:00

test

reorganized the main repo to satisfy PSR-0.

2013-05-21 21:19:05 -04:00

validators

Added SafeValidator.

2013-08-25 09:14:11 -04:00

views

bring back missing exception callstack display.

2013-08-24 06:22:23 -04:00

web

Bug in XML format

2013-08-23 11:34:31 -07:00

widgets

better handling with exceptions in __toString()

2013-08-23 07:05:33 -04:00

.gitignore

reorganized the main repo to satisfy PSR-0.

2013-05-21 21:19:05 -04:00

.htaccess

Converted CRLF to LF. Added gitattributes file.

2013-06-22 15:28:11 +03:00

assets.php

Reorganized captcha code.

2013-08-03 07:20:39 -04:00

classes.php

sort classmap alphabetically

2013-08-18 19:40:51 +02:00

yii

Console application has to exit with exitCode

2013-06-20 22:31:36 +02:00

yii.bat

reorganized the main repo to satisfy PSR-0.

2013-05-21 21:19:05 -04:00

Yii.php

Fixed yii autoload precedence.

2013-08-18 20:33:11 -04:00

YiiBase.php

re-added Exception about wrong class name to autoloader

2013-08-18 19:33:33 +02:00