Klimov Paul
e9700cd2d7
Do comments at "yii\console\controllers\AssetController::saveTargets()" has been adjusted.
2013-05-20 20:08:26 +03:00
Klimov Paul
670daf1389
Merge branch 'asset-command' with 'master'
2013-05-20 20:04:47 +03:00
Antonio Ramirez
8101b5ed88
Merge branch 'upstream' into 313-Inflector-Helper
...
* upstream:
Fixes issue #320 : Module::createController() will fail with a route with trailing slash.
Fixed test break about AssetController.
requirements css.php twitter bootstrap update to 2.3.2
Twitter bootstrap updated to 2.3.2
Modified the IAssetConvert interface.
hashing the key for registerCss and registerJs.
Update AccessRule.php
refactored code after feedback
Fixed framework path.
Added support for View::POS_READY.
new proposed structure
remove from master (update track)
made some changes, fix some pitfalls, remove PHP_EOL
#20 proposed architecture for bootstrap
Conflicts:
yii/helpers/base/Inflector.php
2013-05-20 17:40:25 +02:00
Qiang Xue
7f9cc39797
Merge pull request #247 from tonydspaniard/bootstrap
...
Bootstrap proposed architecture
2013-05-20 07:20:11 -07:00
Qiang Xue
712ba7d972
Merge branch 'master' of github.com:yiisoft/yii2
2013-05-20 10:16:05 -04:00
Qiang Xue
1b7b200c1e
Fixes issue #320 : Module::createController() will fail with a route with trailing slash.
2013-05-20 09:58:40 -04:00
Paul Klimov
0084fa9b18
Merge pull request #322 from creocoder/requirements-css-php
...
requirements css.php twitter bootstrap update to 2.3.2
2013-05-20 06:52:27 -07:00
Qiang Xue
2fccd566b2
Fixed test break about AssetController.
2013-05-20 09:51:05 -04:00
Alexander Kochetov
f3c3a3476c
requirements css.php twitter bootstrap update to 2.3.2
2013-05-20 17:43:08 +04:00
Qiang Xue
a5850657f8
Merge pull request #319 from slavcodev/patch-1
...
AccessRule match controller error.
2013-05-20 06:37:42 -07:00
Qiang Xue
057062cb48
Merge pull request #321 from creocoder/bootstrap-update-to-2.3.2
...
Twitter bootstrap updated to 2.3.2
2013-05-20 06:33:18 -07:00
Alexander Kochetov
73437c5712
Twitter bootstrap updated to 2.3.2
2013-05-20 17:24:36 +04:00
Qiang Xue
241b6fc49a
Modified the IAssetConvert interface.
2013-05-20 08:41:20 -04:00
Qiang Xue
5f23f631ba
hashing the key for registerCss and registerJs.
2013-05-20 07:55:05 -04:00
Veaceslav Medvedev
5e5b629df4
Update AccessRule.php
2013-05-20 11:28:33 +03:00
Antonio Ramirez
520e5b954a
refactored code after feedback
2013-05-20 08:19:22 +02:00
Qiang Xue
f3d23ec0e9
Fixed framework path.
2013-05-19 21:22:12 -04:00
Qiang Xue
0d41a25eb4
Added support for View::POS_READY.
2013-05-19 20:37:10 -04:00
Antonio Ramirez
105e277f8d
Merge branch 'master' into bootstrap
...
* master: (84 commits)
remove from master (update track)
minor fixes
updated the README file of the bootstrap app.
Inflector class
readjusting files for the framework package.
renamed files.
Added punycode as part of the framework.
Renamed core asset bundles.
fixed wrong dependency name.
Added bootstrap bundles.
Reorganized the bootstrap app to prepare it as a separate composer package.
Update Pagination.php
"ManagerTestBase::testExecuteBizRule()" has been fixed to not produce side effects on other tests.
changed back to "create_time".
Always enable profiling for DB queries.
Fixed SiteController about Yii.
changed to insert_time.
Minor doc fix.
refactored AutoTimestamp.
Added UrlRule::host.
...
Conflicts:
yii/assets.php
2013-05-20 01:45:07 +02:00
Antonio Ramirez
2551273356
new proposed structure
2013-05-20 01:37:08 +02:00
Antonio Ramirez
edd7ec4214
Inflector second revision
2013-05-20 00:38:25 +02:00
Antonio Ramirez
a1af54a0d4
Merge branch 'master' of github.com:yiisoft/yii2 into 313-Inflector-Helper
...
* 'master' of github.com:yiisoft/yii2:
updated the README file of the bootstrap app.
readjusting files for the framework package.
2013-05-19 22:39:04 +02:00
Antonio Ramirez
ab695d1118
remove from master (update track)
2013-05-19 22:37:57 +02:00
Antonio Ramirez
70b161ba01
Merge branch 'master' of github.com:yiisoft/yii2
...
* 'master' of github.com:yiisoft/yii2:
updated the README file of the bootstrap app.
readjusting files for the framework package.
2013-05-19 22:37:09 +02:00
Antonio Ramirez
1cc2e4a0c5
minor fixes
2013-05-19 22:27:40 +02:00
Qiang Xue
75c54507b9
updated the README file of the bootstrap app.
2013-05-19 16:25:27 -04:00
Antonio Ramirez
17397a8876
Inflector class
2013-05-19 22:19:24 +02:00
Qiang Xue
e8a824cc46
readjusting files for the framework package.
2013-05-19 15:52:01 -04:00
Qiang Xue
0066e95290
renamed files.
2013-05-19 14:57:00 -04:00
Qiang Xue
619c4f9fd0
Added punycode as part of the framework.
2013-05-19 09:33:13 -04:00
Qiang Xue
c9b65d3008
Renamed core asset bundles.
2013-05-19 09:26:50 -04:00
Klimov Paul
9a472c8323
"yii\console\controllers\AssetController::getAssetManager()" has been updated enforcing 'basePath' and 'baseUrl' config parameters.
2013-05-19 16:17:02 +03:00
Klimov Paul
84237dd828
E_NOTICE at "yii\console\controllers\AssetController::loadBundleDependency()" has been fixed.
2013-05-19 15:57:49 +03:00
Klimov Paul
57e5474143
Method "yii\console\controllers\AssetController::loadBundleDependency()" has been improved allowing dection of the circular dependency.
2013-05-19 15:46:24 +03:00
Qiang Xue
f83eaecd5a
fixed wrong dependency name.
2013-05-18 22:54:32 -04:00
Qiang Xue
8e96b12e18
Added bootstrap bundles.
2013-05-18 22:52:03 -04:00
Qiang Xue
7dc624d1da
Reorganized the bootstrap app to prepare it as a separate composer package.
2013-05-18 21:54:03 -04:00
Klimov Paul
4695362ae2
Unit test for "yii\console\controllers\AssetController" has been adjusted.
2013-05-18 21:40:39 +03:00
Klimov Paul
9f66abc984
"yii\console\controllers\AssetController" has been updated:
...
- assetManager has been converted into virtual property
- bundle dependency load has been fixed
2013-05-18 21:33:06 +03:00
Qiang Xue
ff1b258411
Merge pull request #308 from sergon/patch-1
...
pages -> pagination
2013-05-18 09:08:41 -07:00
gsd
bb32d973be
Update Pagination.php
2013-05-18 22:05:09 +06:00
Klimov Paul
d4b896f65c
"ManagerTestBase::testExecuteBizRule()" has been fixed to not produce side effects on other tests.
2013-05-18 17:28:28 +03:00
Carsten Brandt
285a45520c
fixed auth manager unit test to not expect generic exception
...
This is not allowed by phpunit as a test may not fail anymore
2013-05-18 13:41:09 +02:00
Qiang Xue
946f65523c
changed back to "create_time".
2013-05-17 14:14:42 -04:00
Qiang Xue
d06e785e79
Always enable profiling for DB queries.
2013-05-17 11:48:31 -04:00
Qiang Xue
80b3d5641d
Fixed SiteController about Yii.
2013-05-17 11:17:41 -04:00
Qiang Xue
4ad0b9a335
changed to insert_time.
2013-05-17 10:36:35 -04:00
Qiang Xue
84fe426c5f
Minor doc fix.
2013-05-17 08:46:44 -04:00
Qiang Xue
e69afe32b5
refactored AutoTimestamp.
2013-05-17 08:41:24 -04:00
Klimov Paul
14228f8615
Merge branch 'asset-command'
2013-05-17 11:57:00 +03:00
