php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 11:10:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,174 Commits 10 Branches 80 Tags
8c07086b51a522093bb857959962887f7a60ebac
Commit Graph

1396 Commits

Author SHA1 Message Date
Alexander Makarov
3ab3f996b7 Merge branch 'nav-active' of github.com:Alex-Code/yii2 into Alex-Code-nav-active 
Conflicts:
	extensions/bootstrap/CHANGELOG.md
	extensions/bootstrap/Nav.php
 2014-03-19 18:23:57 +04:00
Qiang Xue
8e11ad0360 refactored code to use Instance::ensure() 2014-03-18 12:31:27 -04:00
Qiang Xue
72c99663ff Refactored container. 2014-03-18 11:49:52 -04:00
Qiang Xue
8c2e39235f Turn module and application into DI containers. 2014-03-17 23:57:01 -04:00
Tobias Munk
21d02e1483 fixes #2776 renamed default template folder 2014-03-17 23:49:18 +01:00
Carsten Brandt
c3ce904af5 fixed detailview attributes 
fixes #2765
 2014-03-17 12:27:01 +01:00
Qiang Xue
7960ccdf50 Tab to spaces conversion. 2014-03-16 20:05:54 -04:00
Luciano Baraglia
7c75b9bc53 GII generated files changes according to PSR2 2014-03-16 17:50:32 -03:00
SonicGD
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
Alexander Makarov
cd8e626018 Fixes #2737 2014-03-13 19:43:06 +04:00
Qiang Xue
41385ed492 code cleanup. 2014-03-12 20:13:48 -04:00
Thiago Talma
3f25bc9408 Update files.php 2014-03-12 15:12:43 -03:00
Thiago Talma
c7a85e8ff9 Add id in diff link. #2712 2014-03-12 13:20:40 -03:00
Kevin LEVRON
4c38cc2239 CS Fix 2014-03-12 16:53:34 +01:00
Kevin LEVRON
0b92f270de Update CHANGELOG.md 2014-03-12 15:23:18 +01:00
Kevin LEVRON
ade92c46ac Update files.php 2014-03-12 15:21:52 +01:00
Kevin LEVRON
d27a07ebe5 Update view.php 2014-03-12 15:21:19 +01:00
Carsten Brandt
40cb98bb02 updated @property annotations 2014-03-11 16:21:25 +01:00
Alex-Code
4807d2eebc Update CHANGELOG.md 2014-03-11 13:16:12 +00:00
Alex-Code
3a87b8a34a Improved check for active child items 
Updated to avoid full tree traversal.
Also noticed ```activateItems``` didn't do anything so that's been fixed.
 2014-03-11 13:10:09 +00:00
Christophe BOULAIN
ca3b2cd057 Fix some references to removed Html::url in phpdoc 2014-03-11 11:15:21 +01:00
Carsten Brandt
5ad0efe36a APIDOC beautification 2014-03-11 06:51:37 +01:00
Carsten Brandt
6fff5662df better use @see for See in phpdoc 2014-03-11 05:38:35 +01:00
Carsten Brandt
c94a40e90d added a large amount of missing documentation 2014-03-11 05:38:35 +01:00
Alexander Makarov
348dfa78eb Merge pull request #2676 from yiisoft/url-helper 
#2630: `yii\heplers\Html::url` moved to new `yii\helpers\Url::create`
 2014-03-11 01:36:05 +03:00
Qiang Xue
1998935309 Merge pull request #2671 from hqx/2670-ConsoleLocalOptions 
2670 console local options
 2014-03-10 18:23:26 -04:00
Alexander Makarov
5d6c314d4e Adjusted URL helper, fixed usage 2014-03-10 15:25:15 +04:00
JacekK
0702a09166 Merge branch 'master' of git://github.com/yiisoft/yii2 into guide-not-found-links 2014-03-09 23:30:06 +01:00
JacekK
edc3d2b11a fixed some urls in guide; moved elasticsearch png file to proper location, to be seen by apidoc generator 2014-03-09 23:28:11 +01:00
Christian Nadolle
706ab7f968 combine globalOptions() with local options into options($id) 
adjust existing Console Controllers and docs
 2014-03-09 22:45:04 +01:00
Alexander Makarov
92b381795b Adjusted Url helper methods 2014-03-10 01:34:05 +04:00
Carsten Brandt
f7a5c29e20 apidoc cleanup 2014-03-09 15:22:17 +01:00
Alexander Makarov
3400eb5215 #2630: yii\heplers\Html::url moved to new yii\helpers\Url::create 2014-03-09 16:41:55 +04:00
Luciano Baraglia
269d1303a9 Code style fixes 2014-03-08 20:47:04 -03:00
Carsten Brandt
168b37eb9b minor apidoc style 2014-03-08 21:04:47 +01:00
Paul Klimov
c01fdc5ec9 Merge branch 'master' of github.com:yiisoft/yii2 2014-03-08 15:20:45 +02:00
Carsten Brandt
595f55c504 api doc improvements 2014-03-08 14:20:19 +01:00
Carsten Brandt
c815d0cef7 Merge branch 'master' of github.com:yiisoft/yii2 
* 'master' of github.com:yiisoft/yii2:
  Make code coverage work
  Note about  embedded documents added to mongodb extension readme
  yii\mongodb\file\Collection::ensureMongoId() fixed to suppress exception on invalid _id format.
  yii\mongodb\file\ActiveRecord::update() fixed to save the attributes while updating file.
  Fixes #2661: Added boolean column type support for SQLite
  Refactored controller creation process.
  Added back some toArray() implementations.
  Fixed test break.
  Update console-migrate.md
  Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions.
  Fixes #2659
  Minor code style fixes for apidoc
  Changed assertions
  fix tests
 2014-03-08 14:19:55 +01:00
Paul Klimov
bc73a2481c MongoDB log fixed to handle Mongo objects correctly 2014-03-08 15:19:46 +02:00
Paul Klimov
f56616394e Note about embedded documents added to mongodb extension readme 2014-03-08 14:34:35 +02:00
Paul Klimov
866ba85010 yii\mongodb\file\Collection::ensureMongoId() fixed to suppress exception on invalid _id format. 2014-03-08 14:12:08 +02:00
Paul Klimov
8d5536ac12 yii\mongodb\file\ActiveRecord::update() fixed to save the attributes while updating file. 2014-03-08 11:49:09 +02:00
Alexander Makarov
6d97ded6c6 Fixes #2659 2014-03-08 03:01:14 +04:00
Alexander Makarov
24b0de63d5 Minor code style fixes for apidoc 2014-03-08 02:50:59 +04:00
Carsten Brandt
cf9597a7aa code style 2014-03-07 22:17:03 +01:00
Carsten Brandt
1b7e1cd027 Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style 
* 'feature' of https://github.com/mongosoft/yii2:
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/models/Context.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/bootstrap/views/index.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/views/index.php
	extensions/apidoc/templates/offline/views/offline.php
	extensions/apidoc/templates/online/views/index.php
	extensions/elasticsearch/Connection.php
	extensions/redis/ActiveQuery.php
	framework/base/ErrorException.php
	framework/helpers/BaseFileHelper.php
	tests/unit/framework/helpers/FileHelperTest.php
 2014-03-07 21:54:44 +01:00
Carsten Brandt
668dacbab6 Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style 
* 'ext-codestyle-fix' of https://github.com/AlexGx/yii2:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/Renderer.php
	extensions/apidoc/templates/offline/assets/AssetBundle.php
	extensions/apidoc/templates/offline/views/index.php
 2014-03-07 21:34:23 +01:00
Carsten Brandt
e2aacad8aa Added links to PHP.net to apidoc 2014-03-07 19:41:43 +01:00
Carsten Brandt
f279719196 be consistent, use singular inheritdoc 2014-03-07 18:46:26 +01:00
Carsten Brandt
adb28deeff added support for basic @inheritDoc tags 2014-03-07 18:43:50 +01:00