php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 16:38:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,940 Commits 10 Branches 79 Tags
0019f130cb00594aeac09cfa8c5bb04828dd8b0a
Commit Graph

110 Commits

Author SHA1 Message Date
Alexander Makarov
6d97ded6c6 Fixes #2659 2014-03-08 03:01:14 +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
Alexander Makarov
71835d977e More short syntax for arrays 2014-03-07 02:03:23 +04:00
Thiago Talma
bd067b02ff Changelog 2014-03-05 13:45:37 -03:00
Thiago Talma
5b648c99ff Keyboard shortcut for previous, next and refresh buttons 2014-03-05 13:09:34 -03:00
AlexGx
c906d43343 fix php5.4 array syntax 2014-03-05 00:26:40 +02:00
AlexGx
1982efbdfe many phpcs fixes 2014-03-05 00:22:55 +02:00
Alexander Makarov
b0ef4c9084 Removed unused variables 2014-03-04 21:46:30 +04:00
Alexander Makarov
0a2a5d46b7 Merge pull request #2595 from thiagotalma/master 
Arrows to display the previous and next files.
 2014-03-04 00:31:35 +03:00
Thiago Talma
facb546950 Changelog 2014-03-03 16:56:59 -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
6e7edfdf5b short array syntax 2014-03-03 20:21:55 +03:00
Qiang Xue
6bdf02dc93 Fixes #2601 2014-03-02 17:04:40 -05:00
Thiago Talma
430f862b7c Arrows to display the previous and next files. 2014-03-01 22:16:03 -03:00
Tobias Munk
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
Thiago Talma
7037769fa7 Fixed typo 2014-02-26 19:22:15 -03:00
Thiago Talma
8f7aa2fb8f Fixed typos 2014-02-26 17:11:56 -03:00
Alexander Makarov
80d3afa0dc Gii extension generator adjustments 2014-02-26 12:46:57 +04:00
Tobias Munk
c624f91dc3 fixed typos 2014-02-26 00:38:46 +01:00
Tobias Munk
d32b3a0e8f updated docs and hints 2014-02-26 00:38:23 +01:00
Tobias Munk
9ad28d9088 added safe validator for keywords 2014-02-26 00:37:26 +01:00
Tobias Munk
be54f24b47 updated defaults, UI, validation and templates 2014-02-25 01:11:42 +01:00
Tobias Munk
01d444f6da Merge commit 'fcac7f64b37c6a8d4ead9816b2580f50580c540d' into feature/gii-extension-generator 2014-02-24 18:34:07 +01:00
Tobias Munk
4192c72256 minor docs update (still WIP) 2014-02-24 18:33:50 +01:00
Qiang Xue
976532c131 fixed typo 2014-02-24 07:12:33 -05:00
Qiang Xue
73a15c2bbf Merge pull request #2504 from thiagotalma/master 
Allow add a condition telling the table to avoid ambiguity error.
 2014-02-23 18:15:45 -05:00
Tobias Munk
87e09805f1 Merge branch 'master' into feature/gii-extension-generator 2014-02-23 01:22:34 +01:00
Qiang Xue
50308d8788 Fixes #2491: Added support for using the same base class name of search model and data model in Gii [skip ci] 2014-02-22 15:01:18 -05:00
Alexander Makarov
d8d44b6127 Merge pull request #2501 from yiisoft/unify-urls 
Fixes #2426: Changed URL creation method signatures to be consistent
 2014-02-21 23:53:15 +03:00
Carsten Brandt
5ee50a8454 Merge pull request #2497 from yiisoft/merge-query-and-relation2 
WIP merge ActiveRelation into ActiveQuery
 2014-02-21 19:00:45 +01:00
Thiago Talma
ba9f5d6521 Allow add a condition telling the table to avoid ambiguity error. 2014-02-20 17:20:10 -03:00
Carsten Brandt
b7fddd8dd6 Added LinkPager::$linkOptions 
fixes #2367
 2014-02-20 19:14:46 +01:00
Alexander Makarov
6a1816a94e Allow using string for URL in case there are no parameters 2014-02-20 20:45:16 +04:00
Alexander Makarov
43c17d99cc Fixes #2426: Changed URL creation method signatures to be consistent 2014-02-20 20:10:33 +04:00
Carsten Brandt
098567ce16 fixed phpdoc errors and updated properties 2014-02-20 13:42:30 +01:00
Carsten Brandt
1708a36d95 WIP merge ActiveRelation into ActiveQuery 
allow extending only one class to add scopes, fixes #2146

TODO:

- [ ] adjust guide docs
- [ ] adjust README files of extensions
- [ ] finish work and fix test breaks
 2014-02-20 05:53:36 +01:00
Johnny Theill
276883b890 Use 'Yii::$app->request->post()' instead of $_POST 2014-02-17 03:29:48 +01:00
Tobias Munk
097ee6f874 first draft of the extension generator 2014-02-13 04:06:42 +01:00
Alexander Makarov
4a201c7ad5 Removed unused variables 2014-02-07 13:39:35 +04:00
Alexander Makarov
69f0e5bef5 Merge pull request #2329 from tonydspaniard/1094-modal-generator-autocomplete-fix 
1904 modal generator autocomplete fix
 2014-02-06 13:40:53 +03:00
Alexander Makarov
a78ff145b8 Removed unused variable 2014-02-06 00:44:53 +04:00
Antonio Ramirez
333630ae3a fix formatting 2014-02-05 17:35:30 +01:00
Antonio Ramirez
b659d8736c fix formatting 2014-02-05 17:33:18 +01:00
Antonio Ramirez
b98d116ae0 refactored to add function on gii.js 2014-02-05 17:30:03 +01:00
Alexander Makarov
e51eae1951 Changelog for #2327 2014-02-05 20:29:06 +04:00
Thiago Talma
7ddb6e8d6e Spaces added 2014-02-05 14:20:22 -02:00
Antonio Ramirez
65c740e91f remove tabs for spaces in js 2014-02-05 17:06:37 +01:00