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

239 Commits

Author SHA1 Message Date
Qiang Xue
ad19e332f4 Added back some toArray() implementations. 2014-03-07 22:05:45 -05:00
Qiang Xue
fad635440b Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions. 2014-03-07 19:08:27 -05: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
e2aacad8aa Added links to PHP.net to apidoc 2014-03-07 19:41:43 +01:00
Qiang Xue
65bfd1633b Fixes #2646: Added support for specifying hostinfo in the pattern of a URL rule 2014-03-07 09:53:55 -05:00
Qiang Xue
e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi 
Conflicts:
	framework/db/BaseActiveRecord.php
 2014-03-06 00:00:33 -05:00
Carsten Brandt
8df35f7627 reset access cache when user identity is set 
fixes #2632
 2014-03-05 17:36:14 +01:00
AlexGx
eaaa5b1bb5 fix code style 2014-03-04 06:12:30 +02:00
Qiang Xue
94a9087b89 Renamed User::loginByToken() to loginByAccessToken(). 2014-03-03 15:03:18 -05:00
Qiang Xue
a8c7d36c02 Finished HATEOAS support. 2014-03-03 14:58:37 -05:00
Alexander Mohorev
95ea1c20bb code style. FOREACH 2014-03-03 21:47:47 +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
Qiang Xue
7a04dbaae1 Support for other auth types. 2014-03-03 10:18:39 -05:00
Qiang Xue
af33e821a0 typo fix. 2014-03-02 16:55:53 -05:00
Qiang Xue
48a12559b2 rest api WIP 2014-03-01 23:14:16 -05:00
Qiang Xue
4891aa79bf Fixes #1535: Improved yii\web\User to start session only when needed. Also prepared it for use without session. 2014-03-01 21:10:49 -05:00
Qiang Xue
ec05c0eaf7 typo fix. 2014-03-01 20:15:21 -05:00
Qiang Xue
489c094766 Fixes #1564: Removed yii\web\Session::autoStart and added hasSessionId. Session will be automatically started when accessing session data 2014-02-28 22:12:31 -05:00
Qiang Xue
032f38a57b Added yii\web\Request::getAuthUser() and getAuthPassword() 2014-02-28 21:29:18 -05:00
Qiang Xue
24e086deaf Added yii\web\UrlRuleInterface and yii\web\CompositeUrlRule 2014-02-28 14:40:25 -05:00
Qiang Xue
49010df192 Changed Controller::afterAction(), Module::afterAction() and ActionFilter::afterAction() to pass $result by value instead of reference 2014-02-27 10:52:17 -05:00
andy5
b9837d8d69 Change AssetBundle.register() return type to static 
Enable IDE typehints for custom AssetBundle properties (related to #2572).
 2014-02-27 05:50:14 -08:00
Qiang Xue
ad06b80e6e Enhanced parsing the accept header. 2014-02-26 23:11:59 -05:00
Qiang Xue
3dead3386c CS fix. 2014-02-24 07:33:16 -05:00
tof06
61767861fb Add X-PJAX-URL header when redirect a pjax request 2014-02-24 12:29:27 +01:00
tof06
8c1d39b348 Add getIsPjax method to Request 2014-02-24 12:28:33 +01: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
c46b35b13c allow configuring asset converter property with default class 2014-02-21 17:45:33 +01:00
Alexander Makarov
752b7cf9d1 Fixes #2502: Unclear error message when $_SERVER['DOCUMENT_ROOT'] is empty 2014-02-20 20:55:02 +04: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
5558fa1297 small code style fix 2014-02-17 03:56:35 +01:00
Qiang Xue
26cb7b2a3c Renamed fooVar to fooParam for various classes. 2014-02-15 18:18:27 -05:00
Borales
b4fd27a91b Removed unnecessary PHPDoc property (ce04134db2) 2014-02-13 19:09:50 +02:00
Qiang Xue
1cd3f2bbd7 Fixed test break. 2014-02-11 10:22:23 -05:00
Qiang Xue
65a8eae717 Fixes #2399: Fixed the bug that AssetBundle did not handle relative URLs correctly 2014-02-11 08:33:46 -05:00
Qiang Xue
80d69a6551 Renamed csrfParam back to csrfVar for consistency. 2014-02-10 11:27:54 -05:00
Qiang Xue
677ee94bb1 Fixes #2386 2014-02-09 13:54:01 -05:00
Dilip
e87220bed4 Update Request.php 2014-02-09 09:07:33 +05:30
Dilip
85a8191f6e Changed csrf-var to csrf-param 
Changed csrf-var to csrf-param due to meta validation error. The validation error as mentioned in the issue https://github.com/yiisoft/yii2/issues/2363. It is fixed in this pull request.
 2014-02-09 08:50:51 +05:30
Qiang Xue
fb4b0ae98d The scripts in asset bundles are now registered in View at the end of endBody(). It was done in endPage() previously 2014-02-05 22:45:26 -05:00
Qiang Xue
2dc341f893 not sending csrf header in ajax response. 2014-02-05 14:29:29 -05:00
Alexander Makarov
b44e653c63 Merge pull request #2325 from infoza/master 
Adding support for the X-HTTP-Method-Override header
 2014-02-05 15:37:01 +03:00
pzaremba
7d96de6619 one more revert. 2014-02-05 13:30:32 +01:00
pzaremba
75ae3db906 Reverted changes unrelated to issue #2325 2014-02-05 13:27:15 +01:00
pzaremba
9b96338a63 Revert "fixing wrapping - my NetBeans has a mind of its own." 
This reverts commit 80be824fc7.
 2014-02-05 13:24:01 +01:00
pzaremba
80be824fc7 fixing wrapping - my NetBeans has a mind of its own. 2014-02-05 12:32:59 +01:00
pzaremba
0bf39f6e98 Adding support for the X-HTTP-Method-Override header. 2014-02-05 12:28:24 +01:00
Qiang Xue
646e371b44 Fixes #1812: Hide potential warning message due to race condition occurring to Session::regenerateID() call 2014-02-04 17:02:32 -05:00