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
Carsten Brandt
80cc310895
updated phpdoc references of BaseAR to the interface
...
fixes #2623
2014-03-05 02:32:45 +01:00
Qiang Xue
c64ab9d7fc
Fixes #2624 : Html::textArea() should respect "name" option.
2014-03-04 19:34:09 -05: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
AlexGx
a94b2778b0
fix phpDoc LuaScriptBuilder build @throws
2014-03-04 23:13:53 +02:00
AlexGx
9c4c8ffbcc
apps code style fixes
2014-03-04 23:04:20 +02:00
Alexander Makarov
61b64d7513
Removed unused "use" statements
2014-03-04 22:40:04 +04:00
Alexander Makarov
12d4615039
Changed "and" to "&&"
2014-03-04 22:28:52 +04:00
Alexander Makarov
2bb6f13505
Used ternary operator instead of "or" for constant definition
2014-03-04 22:17:11 +04:00
Alexander Makarov
b0ef4c9084
Removed unused variables
2014-03-04 21:46:30 +04:00
Alexander Makarov
15a41eae9e
Removed executable flag from asset files
2014-03-04 21:23:34 +04:00
Alexander Makarov
c7daae46cd
Changelog for #2607
2014-03-04 21:10:56 +04:00
Alexander Makarov
51d6db7d80
Merge pull request #2607 from mitalcoi/db_message_source
...
enchansment of db message source
2014-03-04 20:08:40 +03:00
Paul Klimov
ef12934b6b
Merge pull request #2613 from mongosoft/mongodb
...
add findAndModify() method to the Collection class
2014-03-04 18:20:28 +02:00
Alexander Makarov
2ecb79dc07
Added note about overriding asset bundles according to #2556
2014-03-04 17:08:58 +04:00
Qiang Xue
e830708587
Merge pull request #2612 from tof06/master
...
Add an option to ignore pjax request on some links.
2014-03-04 08:03:24 -05:00
Christophe BOULAIN
078fdab686
Added some documentation to new pjax attribute
2014-03-04 13:45:36 +01:00
Alexander Mohorev
1676d914fa
Add unit tests
2014-03-04 15:34:47 +03:00
Qiang Xue
4b20fdc72e
typo fix.
2014-03-04 07:09:56 -05:00
