php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-04 00:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,494 Commits 10 Branches 79 Tags
5ceb7bbdbc787a3253bb7891dc005c7b51f4650c
Commit Graph

4038 Commits

Author SHA1 Message Date
Klimov Paul
a0e54d623e Merge branch 'master' of github.com:yiisoft/yii2 into asset-command 2013-05-22 20:22:25 +03:00
resurtm
e1ea91a775 Merge pull request #343 from resurtm/fixes-145 
Fixes #145. Reusable cache dependencies.
 2013-05-22 10:02:36 -07:00
resurtm
54610f179f Better naming. Additional newline. Doctype tiny fix. 2013-05-22 22:56:17 +06:00
resurtm
2430ebe95d MSSQL AR tests. 2013-05-22 22:37:09 +06:00
resurtm
1f9a46850c MSSQL initial query builder. 2013-05-22 22:25:49 +06:00
resurtm
90395b5df2 Refinements to MSSQL driver classes. 2013-05-22 21:34:41 +06:00
Antonio Ramirez
5783d3a1c4 Merge remote-tracking branch 'upstream/master' into 331-bootstrap-carousel 
* upstream/master:
  A little yii\bootstrap classes refactoring
 2013-05-22 16:24:58 +02:00
Alexander Kochetov
5743d482d8 A little yii\bootstrap classes refactoring 2013-05-22 17:37:41 +04:00
resurtm
cdcb8e513c Merge upstream/master into upstream/mssql. 2013-05-22 19:28:11 +06:00
Carsten Brandt
b030326db6 moved files to right places 2013-05-22 12:54:20 +02:00
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
Antonio Ramirez
b5ad49ed09 added carousel widget 2013-05-22 12:44:02 +02:00
Alexander Kochetov
b18be6e302 jui.effect and jui.position dependencies 2013-05-22 14:40:31 +04:00
resurtm
ebcc936ab1 Fixes #145. Reusable cache dependencies. 2013-05-22 15:10:14 +06:00
Antonio Ramirez
6316c4242c Merge branch 'upstream' into 313-Inflector-Helper 
* upstream:
  Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.
 2013-05-22 10:59:41 +02:00
Antonio Ramirez
05523640f2 fixed pluralize + singularize rules for tests 2013-05-22 10:59:09 +02:00
Alexander Kochetov
7d02cb601a jui.widget dependency 2013-05-22 12:50:09 +04:00
Alexander Kochetov
0dd38324cd Theme dependencies 2013-05-22 12:45:50 +04:00
Alexander Kochetov
a044907ddd Datepicker language assets dependencies 2013-05-22 12:34:45 +04:00
resurtm
a954312a18 Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator. 2013-05-22 14:18:39 +06:00
Alexander Kochetov
024dab3093 JQuery UI bundle assets config 2013-05-22 12:06:58 +04:00
Alexander Kochetov
f80b0c634c JQuery UI bundle assets 2013-05-22 12:05:18 +04:00
Antonio Ramirez
7b98b42418 added inflection methods from StringHelper + some comment fixes 2013-05-22 08:35:03 +02:00
Antonio Ramirez
641e6ee7cf ported inflection methods from StringHelper to Inflector helper class 2013-05-22 08:34:17 +02:00
Qiang Xue
b24d04ae90 Added psr-0. 2013-05-21 21:50:29 -04:00
Qiang Xue
f72105166c reorganized the main repo to satisfy PSR-0. 2013-05-21 21:19:05 -04:00
Carsten Brandt
baac7e14df moved classes from framework -> yii 2013-05-11 14:56:24 +02:00
Carsten Brandt
3518813ac4 Merge branch 'master' into redis 
* master: (108 commits)
  fixed indentation in test files
  cleanup tests
  Travis-CI build status.
  CS fixes.
  CS fixes.
  Change magic property to normal method. (Thanks to @maxlapko.)
  CS fixes.
  Fixed duplicated merge.
  Fixes issue #50: implemented pager widgets.
  fix: remove pointless unset
  remove fix for unset timezone from bootstrap app
  mod: don't use ArrayHelper to avoid loading another class during every request
  better have timezone fix in application
  Add exception classes hierarchy UML diagram.
  Initial Gettext support.
  RBAC sql files identation fix
  RBAC sql files
  DbManager some Db fields renaming
  DbManager code style fix + right Exception type fix
  Unit tests fix
  ...

Conflicts:
	tests/unit/framework/caching/ApcCacheTest.php
	tests/unit/framework/caching/CacheTest.php
 2013-05-11 13:12:49 +02:00
resurtm
f2e6d408e3 MSSQL driver classes moved to the proper location. 2013-05-11 09:40:04 +06:00
resurtm
9873442d70 Merge branch 'master' of github.com:yiisoft/yii2 into mssql 
Conflicts:
	yii/db/Connection.php
 2013-05-11 09:38:14 +06:00
Qiang Xue
0d814fa523 Moved "framework" to "iii". 2013-05-09 12:00:15 -04:00
Qiang Xue
15e1a79952 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-09 11:53:27 -04:00
Qiang Xue
b68bd8ef63 Fixed Yii::importNamespaces() bug. 2013-05-09 11:53:13 -04:00
Qiang Xue
599debc2b9 Merge pull request #195 from suralc/trait-autoload 
Check if trait was loaded
 2013-05-09 08:41:49 -07:00
Qiang Xue
8520be08de Fixes issue #174: make URL parameters available in $_GET. 2013-05-09 11:40:51 -04:00
Suralc
882a611666 Removed static variable from autoload per qiangxue's suggestion 2013-05-09 13:44:37 +02:00
Carsten Brandt
2387e59c4e Renamed yii.php -> Yii.php for class, filename consitency 
See https://github.com/yiisoft/yii2/issues/123#issuecomment-17657374
Issue #123
 2013-05-09 13:31:43 +02:00
Carsten Brandt
776162b05e created StringHelper::basename() 
In contrast to php function basename() It that always uses \ and /
as directory separator.
It is needed for use on Classnames that contain namespaces.
Fixes #192
 2013-05-09 13:16:40 +02:00
Alexander Makarov
ad26b7d3d1 Use Composer autoload to handle dependency class loading 2013-05-09 14:26:46 +04:00
Suralc
bac5c0e729 Check if trait was loaded 2013-05-09 12:18:17 +02:00
Carsten Brandt
a51019bbed Console helper: use self:: for refering to constants 2013-05-09 11:31:34 +02:00
Qiang Xue
0f33f90161 Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-08 22:58:38 -04:00
Qiang Xue
c7e40f5c7a Debug toolbar WIP. 2013-05-08 22:58:32 -04:00
Carsten Brandt
a61ec6bdd5 Merge pull request #186 from suralc/console-static-fix 
[Please Review before merge] Fixed static in signature error
 2013-05-08 16:46:26 -07:00
Dev-Speranza
6ed419849e Fix $schemaMap declaration for Mssql driver 2013-05-09 02:40:02 +03:00
Qiang Xue
b836665dfd Added beginPage and endPage events. 2013-05-08 17:36:34 -04:00
Qiang Xue
6b770dad6e Merge branch 'master' of https://github.com/yiisoft/yii2 2013-05-08 15:27:27 -04:00
Qiang Xue
96fd37de2e Fixes issue #49: finished CAPTCHA feature. 2013-05-08 15:27:06 -04:00
Suralc
8197ab556e Revert static calls in switch 2013-05-08 20:18:14 +02:00
Suralc
ded4ccd778 Fixed php 5.4+ Exception in Console helper 2013-05-08 20:01:31 +02:00