Commit Graph

7316 Commits

Author SHA1 Message Date
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
d4869eab6b reverted 315cfbc03b to be nice to travis 2014-03-07 16:01:04 +01:00
Carsten Brandt
315cfbc03b check if travis can do a crazy build for us :) 2014-03-07 15:58:06 +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
Carsten Brandt
6d3e60f963 Merge pull request #2656 from yiisoft/apidoc-refactoring
Apidoc refactoring
2014-03-07 14:47:13 +01: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
Alexander Makarov
96d131899f Fixed ErrorException changes 2014-03-07 13:46:21 +04:00
Qiang Xue
4f8c037a21 fixed unset. 2014-03-06 21:18:28 -05:00
Qiang Xue
9b8ffdfacc Fixes #2653: Fixed the bug that unsetting an unpopulated AR relation would trigger exception (qiangxue) 2014-03-06 20:38:55 -05:00
Qiang Xue
11baf61977 Fixed unsetting relation bug. 2014-03-06 19:19:23 -05:00
Qiang Xue
4d538d6bba removed ModelSerializer as it is replaced by new REST implementation. 2014-03-06 19:17:23 -05:00
Johnny Theill
70463d538c fix tests 2014-03-07 00:13:28 +01:00
Alexander Makarov
3422c01712 Minor phpdoc fix 2014-03-07 03:07:49 +04:00
Alexander Makarov
05339536a6 Used Exception instead of die() in classmap CLI controller 2014-03-07 03:07:49 +04:00
Alexander Makarov
fa66122170 Merge pull request #2651 from yiisoft/error-handler-adjustments
Fixes #2603: `yii\base\ErrorHandler` now extends `\ErrorHandler`
2014-03-07 01:38:03 +03:00
Alexander Makarov
44558df59d #2603: yii\base\ErrorHandler now extends \ErrorHandler 2014-03-07 02:21:36 +04:00
Alexander Makarov
c5ec3550de Removed unused "use" statements 2014-03-07 02:10:32 +04:00
Alexander Makarov
71835d977e More short syntax for arrays 2014-03-07 02:03:23 +04: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
Qiang Xue
2c1bd7f2f6 Merge pull request #2599 from yiisoft/feature-restapi
RESTful API support
2014-03-06 12:39:51 -05:00
Qiang Xue
42ba8fe697 rest doc. 2014-03-06 10:05:43 -05:00
Alexander Makarov
5433aeccc8 Merge pull request #2644 from tof06/2643-add-modal-size-attribute
Add size attribute to Modal
2014-03-06 16:28:58 +03:00
Christophe BOULAIN
6f49e46609 CS fix 2014-03-06 12:18:32 +01:00
Christophe BOULAIN
0ab7f1e0ae Add size attribute to Modal 2014-03-06 11:04:03 +01:00
Qiang Xue
e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi
Conflicts:
	framework/db/BaseActiveRecord.php
2014-03-06 00:00:33 -05:00
Qiang Xue
1b03dc8f4c major features and documentation finished for REST API. 2014-03-05 23:52:33 -05:00
Qiang Xue
147bbe72e8 Merge branch 'feature-restapi' of git://github.com/yiisoft/yii2 into feature-restapi 2014-03-05 22:22:02 -05:00
Qiang Xue
18c7c63e66 rest WIP 2014-03-05 22:21:55 -05:00
Carsten Brandt
bdce87b242 Merge pull request #2640 from jneto81/2631-language-pt-pt-fix
Removed U+FEFF character from pt-PT language file to fixe #2631
2014-03-06 00:36:31 +01:00
jneto81
310d77f3b9 Removed U+FEFF character from pt-PT language file to fixe #2631 2014-03-05 23:22:29 +00: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
Carsten Brandt
4fbfef58a8 Merge pull request #2636 from maximal/patch-1
`User` here
2014-03-05 19:45:58 +01:00
MaximAL
f7580ad2d5 User here 2014-03-05 21:43:41 +03:00
Qiang Xue
3f42d5826a REST wip. 2014-03-05 13:29:24 -05:00
Alex-Code
0adc656362 sub menus didn't get checked for being active.
Based off the method in ```Menu.php``` I've updated ```Nav``` so it will check if sub menus are active or not.
2014-03-05 16:50:02 +00:00
Alexander Makarov
7bc181ce44 Merge pull request #2633 from thiagotalma/master
Keyboard shortcut for previous, next and refresh buttons
2014-03-05 19:47:54 +03:00
Thiago Talma
bd067b02ff Changelog 2014-03-05 13:45:37 -03:00
Carsten Brandt
8df35f7627 reset access cache when user identity is set
fixes #2632
2014-03-05 17:36:14 +01:00
Thiago Talma
5b648c99ff Keyboard shortcut for previous, next and refresh buttons 2014-03-05 13:09:34 -03:00
Qiang Xue
993963bb94 reset batch query result when rewinding. 2014-03-05 09:00:32 -05:00
Qiang Xue
5474300c8b fixed loading namespaceless controller classes. 2014-03-05 08:29:07 -05:00
Qiang Xue
10061359ed Fixes #1467: Added support for organizing controllers in subdirectories 2014-03-04 23:30:48 -05:00
Carsten Brandt
80e9b80078 replace pjax with external resouce via composer
We are now maintaining a fork of pjax:
https://github.com/yiisoft/jquery-pjax
2014-03-05 05:06:37 +01:00
Carsten Brandt
e51bf13161 Merge pull request #2620 from AlexGx/apps-codestyle-fix
apps code style fixes
2014-03-05 02:53:29 +01:00
Carsten Brandt
3777ec2bd3 fixed > 100 typos introduced by me :-) 2014-03-05 02:38:59 +01:00
Carsten Brandt
ecc066ac34 fixed condition for HHVM test 2014-03-05 02:35:37 +01:00
Carsten Brandt
f34a0c63a1 fixed phpdoc 2014-03-05 02:35:01 +01:00
Carsten Brandt
aa9d3b3e66 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2: (40 commits)
  Fixes #2624: Html::textArea() should respect "name" option.
  Removed unused "use" statements
  Changed "and" to "&&"
  Used ternary operator instead of "or" for constant definition
  Removed unused variables
  Removed executable flag from asset files
  Changelog for #2607
  Added note about overriding asset bundles according to #2556
  Added some documentation to new pjax attribute
  Add unit tests
  typo fix.
  Update MessageController.php
  Update MessageController.php
  add findAndModify() method to the Collection class
  Add an option to ignore pjax request on some links.
  fix code style php5.4 syntax
  Inline control structures are not allowed
  fix code style
  fix code style
  fix typo double `;`, `Each PHP statement must be on a line by itself`
  ...
2014-03-05 02:33:30 +01:00