Carsten Brandt 144e73b48a Merge branch 'master' into redis ...

* master: (179 commits)
  Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.
  bug fix.
  Added composer extension.
  Added psr-0.
  Fixed breaking test.
  Fixed iii include path.
  reorganized the main repo to satisfy PSR-0.
  Fixed bootstrap asset registration issue.
  Widget::$transition removed, bundles depency fixed
  'yii/bootstrap/popover' bundle depency optimization
  Bundle names fixes, base widget fixes, other widgets fixes
  Fixed join query for AR.
  Responsive bundle depency fix
  Bundle names and depency fixes
  YiiBase move all after class definition
  YiiBase
  Reloaded
  Additional bootstrap packages
  New approach
  minor refactoring.
  ...

Conflicts:
	tests/unit/framework/caching/ApcCacheTest.php
	tests/unit/framework/caching/CacheTest.php

2013-05-22 12:49:31 +02:00

..

assets

reorganized the main repo to satisfy PSR-0.

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

base

reorganized the main repo to satisfy PSR-0.

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

behaviors

reorganized the main repo to satisfy PSR-0.

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

bootstrap

reorganized the main repo to satisfy PSR-0.

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

caching

reorganized the main repo to satisfy PSR-0.

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

console

reorganized the main repo to satisfy PSR-0.

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

db

Merge branch 'master' into redis

2013-05-22 12:49:31 +02:00

debug

reorganized the main repo to satisfy PSR-0.

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

helpers

reorganized the main repo to satisfy PSR-0.

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

i18n

reorganized the main repo to satisfy PSR-0.

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

logging

reorganized the main repo to satisfy PSR-0.

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

rbac

reorganized the main repo to satisfy PSR-0.

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

renderers

reorganized the main repo to satisfy PSR-0.

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

requirements

reorganized the main repo to satisfy PSR-0.

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

test

reorganized the main repo to satisfy PSR-0.

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

validators

Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.

2013-05-22 14:18:39 +06:00

views

reorganized the main repo to satisfy PSR-0.

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

web

reorganized the main repo to satisfy PSR-0.

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

widgets

reorganized the main repo to satisfy PSR-0.

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

.gitignore

reorganized the main repo to satisfy PSR-0.

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

.htaccess

reorganized the main repo to satisfy PSR-0.

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

assets.php

reorganized the main repo to satisfy PSR-0.

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

yii

reorganized the main repo to satisfy PSR-0.

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

yii.bat

reorganized the main repo to satisfy PSR-0.

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

Yii.php

reorganized the main repo to satisfy PSR-0.

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

YiiBase.php

reorganized the main repo to satisfy PSR-0.

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