php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-13 04:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,052 Commits 10 Branches 79 Tags
ade92c46acd92c50029ff6bc6d19783947ba7871
Commit Graph

90 Commits

Author SHA1 Message Date
Carsten Brandt
40cb98bb02 updated @property annotations 2014-03-11 16:21:25 +01:00
Carsten Brandt
5ad0efe36a APIDOC beautification 2014-03-11 06:51:37 +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
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
Carsten Brandt
595f55c504 api doc improvements 2014-03-08 14:20:19 +01:00
Alexander Makarov
24b0de63d5 Minor code style fixes for apidoc 2014-03-08 02:50:59 +04: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
Carsten Brandt
31a1eca556 add source code links to api docs 2014-03-07 17:52:12 +01:00
Carsten Brandt
5e356acbd7 exclude file support for apidocs 
issue #1797
 2014-03-07 16:51:18 +01:00
Qiang Xue
bbea1ab19c Fixes #2629: Module::controllerPath is now read only, and all controller classes must be namespaced under Module::controllerNamespace 2014-03-07 10:35:15 -05:00
Carsten Brandt
ca6bfdbbb5 final changes for apidoc refactoring 2014-03-07 14:40:52 +01:00
Carsten Brandt
acde64c88b finished guide command refactoring 2014-03-07 13:37:58 +01:00
Carsten Brandt
740a769477 improved HelpController with messages for each command 2014-03-06 22:43:57 +01:00
Carsten Brandt
62378c3b4a Merge branch 'master' into apidoc-refactoring 
* master: (153 commits)
  rest doc.
  CS fix
  Add size attribute to Modal
  major features and documentation finished for REST API.
  rest WIP
  Removed U+FEFF character from pt-PT language file to fixe #2631
  Revert "Used ternary operator instead of "or" for constant definition"
  `User` here
  REST wip.
  Changelog
  reset access cache when user identity is set
  Keyboard shortcut for previous, next and refresh buttons
  reset batch query result when rewinding.
  fixed loading namespaceless controller classes.
  Fixes #1467: Added support for organizing controllers in subdirectories
  replace pjax with external resouce via composer
  fixed > 100 typos introduced by me :-)
  fixed condition for HHVM test
  fixed phpdoc
  updated phpdoc references of BaseAR to the interface
  ...

Conflicts:
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/html/views/constSummary.php
	extensions/apidoc/templates/html/views/propertyDetails.php
 2014-03-06 22:09:58 +01:00
Alexander Makarov
386979d6a3 Revert "Used ternary operator instead of "or" for constant definition" 
This reverts commit 2bb6f13505.
 2014-03-06 01:56:51 +04:00
AlexGx
1982efbdfe many phpcs fixes 2014-03-05 00:22:55 +02:00
Alexander Makarov
2bb6f13505 Used ternary operator instead of "or" for constant definition 2014-03-04 22:17:11 +04:00
Alexander Mohorev
426af3177c code style. WHILE 2014-03-03 21:53:26 +03:00
Alexander Mohorev
f849623359 code style. FOR 2014-03-03 21:52:21 +03:00
Alexander Mohorev
95ea1c20bb code style. FOREACH 2014-03-03 21:47:47 +03:00
Alexander Makarov
a7a1bd8da0 Merge pull request #2578 from schmunk42/feature/update-composer-keywords 
replaced keyword "yii" with "yii2" in composer.json files (fixes #2557)
 2014-03-03 21:39:41 +03:00
Alexander Mohorev
b2f1b00bf2 code style. operator IF 2014-03-03 21:32:34 +03:00
Alexander Mohorev
c7e8d8b900 @param, @var, @property and @return must declare types as boolean, integer, string, array or null 2014-03-03 20:50:44 +03:00
Alexander Mohorev
d8971b252c short echo tags 2014-03-03 20:33:38 +03:00
Qiang Xue
6bdf02dc93 Fixes #2601 2014-03-02 17:04:40 -05:00
Carsten Brandt
6c0576af9e raised dependency for phpdocumentor docblock lib 
in this version a bug that affects markdown display has been fixed.

fixes #2589
 2014-03-01 15:17:27 +01:00
Carsten Brandt
e99d5dba7b fixed apidoc table style 2014-02-28 18:51:28 +01:00
Carsten Brandt
8c7eb97175 apidoc style and typo 2014-02-28 18:36:27 +01:00
Carsten Brandt
ebe972f36d fixed links in elasticsearch README 2014-02-28 18:17:28 +01:00
Carsten Brandt
db8685ccad fixed a bunch of typos and errors 2014-02-27 23:18:27 +01:00
Tobias Munk
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
Carsten Brandt
023f4d0ab6 refactored apidoc extensions completely. 
separated guide and apidoc, better maintainability
 2014-02-25 19:52:15 +01:00
Carsten Brandt
6b603c060b added anchors to ApiMarkdown 
fixes #2220
 2014-02-25 14:38:06 +01:00
Carsten Brandt
9142c9c8ee fixed issue with apidoc without guide 2014-02-22 15:44:31 +01:00
Carsten Brandt
26717e3e76 allow referencing the guide from API docs 2014-02-22 13:43:57 +01:00
Carsten Brandt
8f491f2836 moved @include tags of api docs directly into the class 2014-02-20 21:30:47 +01:00
Carsten Brandt
0d720e0695 added property visibility to api docs 
issue #2503
 2014-02-20 21:08:37 +01:00
Carsten Brandt
82d103d09a added method visibility to api docs 
issue #2503
 2014-02-20 21:04:50 +01:00
Carsten Brandt
c9c7db9ae5 fixed several issues with apidoc generator 2014-02-18 05:01:49 +01:00