Kevin LEVRON
4c38cc2239
CS Fix
2014-03-12 16:53:34 +01:00
Alexander Makarov
f7a859f522
Merge pull request #2719 from klevron/2712
...
Fix #2712
2014-03-12 18:18:37 +03:00
David Renty
b7cf618348
asElapsedTime style improvements
2014-03-12 16:02:45 +01:00
David Renty
f7871e2458
asElapsedTime can now take DateInterval as parameter
2014-03-12 15:57:20 +01:00
Kevin LEVRON
0b92f270de
Update CHANGELOG.md
2014-03-12 15:23:18 +01:00
Kevin LEVRON
ade92c46ac
Update files.php
2014-03-12 15:21:52 +01:00
Kevin LEVRON
d27a07ebe5
Update view.php
2014-03-12 15:21:19 +01:00
Alexander Makarov
466e2600ad
Merge pull request #2718 from qiansen1386/patch-2
...
[doc]Composer is not a package manager.
2014-03-12 17:20:23 +03:00
东方孤思子(Paris·QianSen)
ebb27ef4d5
[doc]Composer is not a package manager.
...
It is a issue i found when I translate it.
> Composer is not a package manager, It's a tool for dependency management.
According to their [doc](https://getcomposer.org/doc/00-intro.md )
>Composer is a tool for dependency management in PHP. It allows you to declare the dependent libraries your project needs and it will install them in your project for you.
and
> **Composer is not a package manager.** Yes, it deals with "packages" or libraries, but it manages > them on a per-project basis, installing them in a directory (e.g. vendor) inside your project. By > default it will never install anything globally. Thus, it is a dependency manager.
So i think, It will be better, if we remain their offical appellation.
2014-03-12 22:07:08 +08:00
David Renty
a74fa20d2d
Typo
2014-03-12 14:51:20 +01:00
David Renty
ced45c5450
Call Yii::t everytime instead of passing a template variable
2014-03-12 14:49:28 +01:00
David Renty
fd7ed28221
Typo in asElapsedTime description
2014-03-12 14:38:00 +01:00
David Renty
e77ffe2c4a
Added asElapsedTime function
2014-03-12 14:29:49 +01:00
Alexander Makarov
ed5007e44b
more reference fixes
2014-03-12 12:47:16 +03:00
Alexander Makarov
d5df12039f
fixed another reference
2014-03-12 12:45:16 +03:00
Alexander Makarov
3b1d558942
fixed refences
2014-03-12 12:44:18 +03:00
Qiang Xue
aaa4e429a4
Fixes #2687 : table alias may not be respected when specified in relation query.
2014-03-11 20:13:03 -04:00
Carsten Brandt
5bbceebc31
Merge pull request #2705 from RusAlex/140311_tabs_vs_spaces
...
tabs vs spaces
2014-03-11 20:19:11 +01:00
Alexander Pletnev
b9c0871218
tabs vs spaces
2014-03-11 23:16:04 +04:00
Alexander Makarov
7870d02ed5
Merge pull request #2704 from ShNURoK42/patch-3
...
Update i18n.md
2014-03-11 20:18:37 +03:00
Alexandr
3c91574340
Update i18n.md
2014-03-12 00:15:03 +07:00
Carsten Brandt
40cb98bb02
updated @property annotations
2014-03-11 16:21:25 +01:00
Carsten Brandt
7570afdeea
fixed the build command after controller namespace changes
2014-03-11 16:20:03 +01:00
Alexander Makarov
c694d32e13
Merge branch 'fix_is_empty_file_validator' of github.com:ZhandosKz/yii2 into ZhandosKz-fix_is_empty_file_validator
...
Conflicts:
framework/CHANGELOG.md
2014-03-11 17:24:43 +04:00
Alex-Code
4807d2eebc
Update CHANGELOG.md
2014-03-11 13:16:12 +00:00
Zhandos
8be5938cbe
Update CHANGELOG.md
2014-03-11 18:16:06 +05:00
Alex-Code
3a87b8a34a
Improved check for active child items
...
Updated to avoid full tree traversal.
Also noticed ```activateItems``` didn't do anything so that's been fixed.
2014-03-11 13:10:09 +00:00
Zhandos
4a32a5a8a5
Update CHANGELOG.md
...
updated changelog about isEmpty bug.
2014-03-11 17:37:19 +05:00
Alexander Makarov
7a3fd41afc
Fixes #2701
2014-03-11 15:44:09 +04:00
Alexander Makarov
6889ae34de
Fixes #2615 : upgrade guide improvements
2014-03-11 15:37:08 +04:00
Alexander Makarov
0442fceec6
Fixed typo
2014-03-11 14:32:46 +04:00
Alexander Makarov
34be99fce8
Merge pull request #2700 from tof06/url-doc-fixes
...
Url doc fixes
2014-03-11 13:31:43 +03:00
Alexander Makarov
6f3d27fc8e
More examples for URL guide
2014-03-11 14:24:55 +04:00
Christophe BOULAIN
b3ef2a938c
typo in changelog
2014-03-11 11:18:35 +01:00
Christophe BOULAIN
ca3b2cd057
Fix some references to removed Html::url in phpdoc
2014-03-11 11:15:21 +01:00
Alexander Makarov
38e8afa0f8
Fixed another typo in changelog
2014-03-11 13:13:55 +04:00
Alexander Makarov
8b78eec2e0
Fixed typo in changelog
2014-03-11 13:11:27 +04:00
Carsten Brandt
5ad0efe36a
APIDOC beautification
2014-03-11 06:51:37 +01:00
Carsten Brandt
f41f55a00c
Merge pull request #2698 from ShNURoK42/patch-1
...
small doc fix in active-record
2014-03-11 06:50:15 +01:00
Alexandr
0b47d9a892
small doc fix in active-record
2014-03-11 12:22:31 +07:00
Carsten Brandt
6fff5662df
better use @see for See in phpdoc
2014-03-11 05:38:35 +01:00
Carsten Brandt
c94a40e90d
added a large amount of missing documentation
2014-03-11 05:38:35 +01:00
Qiang Xue
79457ce66e
Merge pull request #2696 from baodude/master
...
use toRoute instead of createUrl in ActionColumn
2014-03-10 23:07:46 -04:00
baodude
50d720ce34
use toRoute instead of createUrl in ActionColumn
...
use toRoute() instead of createUrl() in ActionColumn
2014-03-11 10:32:23 +08:00
Qiang Xue
bcf5b4644e
Fixes #2687 : ActiveQuery::joinWith() has problem when the query is used twice.
2014-03-10 21:44:48 -04:00
Qiang Xue
252f49b97a
doc fixes.
2014-03-10 21:31:06 -04:00
Zhandos
385ee5550a
Update FileValidatorTest.php
...
fix tabs
2014-03-10 23:19:00 +05:00
Zhandos
780c5aa36c
Update FakedValidationModel.php
2014-03-10 23:18:09 +05:00
Zhandos
2e84fcb0b0
Update FileValidator.php
...
fix tabs
2014-03-10 23:17:29 +05:00
Zhandos Nuftiev
b3b9bd353e
fix isEmpty method for file validator.
2014-03-10 23:10:47 +05:00