Aleksandr Krivtcun
b260fbbdde
Merge branch 'master' of git://github.com/yiisoft/yii2 into translation-ru-structure-widgets
2014-06-30 18:38:11 +04:00
Aleksandr Krivtcun
8eb739585a
translated docs (structure-widgets.md) to russian
2014-06-30 18:37:27 +04:00
Qiang Xue
37dde677c6
guide WIP [skip ci]
2014-06-30 08:37:23 -04:00
Antonio Ramirez
c933d0cba9
Update concept-components.md
2014-06-30 12:57:07 +02:00
Antonio Ramirez
7844f798d6
add concept-components.md
2014-06-30 12:52:33 +02:00
Antonio Ramirez
ced0925531
add concept-behaviors.md
2014-06-30 12:06:44 +02:00
Carsten Brandt
74843ccbf4
make fileinfo optional requirement
2014-06-30 11:31:15 +02:00
Carsten Brandt
08b7636d81
Review requirements
...
fileinfo is not a hard dependency.
2014-06-30 11:22:13 +02:00
Alexander Makarov
7611ef32ca
Merge pull request #4117 from creocoder/apps-advanced-common-user-code-style-fixes
...
[skip-ci] Advanced app `User` model code style fixes
2014-06-30 10:15:05 +04:00
Alexander Kochetov
fed61f7d96
Advanced app User model code style fixes
2014-06-30 08:41:36 +04:00
Alexander Kochetov
044fe3633e
Advanced app User model code style fixes
2014-06-30 08:24:48 +04:00
Alexander Makarov
a42e550ca0
Merge pull request #4104 from yiisoft/rbac-phpmanager-adjusment
...
\yii\rbac\PhpManager adjustments
2014-06-29 20:18:24 +04:00
Carsten Brandt
1f4a7997a3
Update requirements.php
2014-06-29 15:56:44 +02:00
Carsten Brandt
8df51a7ec0
made mcrypt a framework requirement
2014-06-29 15:26:32 +02:00
Paul Klimov
90a625013c
Result check at Security::generateRandomKey() added
2014-06-29 15:39:25 +03:00
Alexander Makarov
c68e5f1fdb
Adjusted naming
2014-06-29 16:18:19 +04:00
Carsten Brandt
1085f1bd9b
cleanup after #4092
...
fixes #4086
2014-06-29 13:29:23 +02:00
Carsten Brandt
2d2c9f03d3
Merge pull request #4092 from dizews/afterUpdate_event_ench
...
changedAttributes of AfterSaveEvent contain an old values
2014-06-29 12:52:51 +02:00
Carsten Brandt
c484536b28
Merge pull request #4108 from fps01/master
...
Fixed a call of function "generateRandomKey()" in app\base\Security
2014-06-29 12:06:29 +02:00
fps01
039909a846
Fixed a call of function "generateRandomKey()" in app\base\Security
2014-06-29 12:23:06 +04:00
Qiang Xue
399b6b18e3
Fixes #4103
2014-06-28 21:58:07 -04:00
Carsten Brandt
83dd3c7dd0
Merge pull request #4107 from SDKiller/patch-2
...
Update BaseMessage.php
2014-06-29 03:17:14 +02:00
Serge Postrash
eb60aaecdf
Update BaseMessage.php
...
See 0ff0f9d32ehttps://github.com/yiisoft/yii2/issues/4071
2014-06-29 04:41:13 +04:00
Alexander Makarov
bb01c1cc91
Merge branch 'master' into rbac-phpmanager-adjusment
...
Conflicts:
framework/UPGRADE.md
2014-06-29 03:35:19 +04:00
Alexander Makarov
3eee7b8e4b
Fixes #4072 : \yii\rbac\PhpManager adjustments
...
- Data is now stored in three separate files for items, assignments and rules. File format is simpler.
- Removed `authFile`. Added `itemsFile`, `assignmentsFile` and `rulesFile`.
- `createdAt` and `updatedAt` are now properly filled with corresponding file modification time.
- `save()` and `load()` are now protected instead of public.
- Added unit test for saving and loading data.
2014-06-29 03:32:46 +04:00
Paul Klimov
648b9b70f5
Merge pull request #4089 from klimov-paul/87-security-component-3
...
Fix #87 : security helper converted into component and improved
2014-06-29 00:04:03 +03:00
Qiang Xue
c8ee057e0b
Merge pull request #4102 from yii2-chinesization/master
...
Chinese Translation for this week
2014-06-28 14:59:30 -04:00
东方孤思子（Paris·QianSen）
ec801004a2
translated properties
2014-06-29 01:53:10 +08:00
Antonio Ramirez
d7623a3982
add concept-autoloading.md
2014-06-28 19:16:33 +02:00
Antonio Ramirez
5c19baab37
Merge remote-tracking branch 'upstream/master' into upstream
...
* upstream/master:
Reverted #4098 .
fix duplicated white space and typo [skip ci]
typo fix
Fixes #4098 : `yii\db\Query::addSelect()` should include `*` when it is called the first time
2014-06-28 18:47:21 +02:00
Paul Klimov
84cbf19bfe
Doc comments at Security::generateRandomKey() adjusted
2014-06-28 19:05:16 +03:00
Paul Klimov
69abbc7ff3
Fallback at Security::generateRandomKey() removed
2014-06-28 19:02:53 +03:00
Qiang Xue
09b00c5cd0
Reverted #4098 .
2014-06-28 11:59:58 -04:00
Alexander Makarov
992a43805f
Merge pull request #4101 from qiansen1386/patch-10
...
fix duplicated white space and typo [skip ci]
2014-06-28 19:39:16 +04:00
Antonio Ramirez
343e15965b
add concept-autoloading.md -wip
2014-06-28 17:24:06 +02:00
东方孤思子（Paris·QianSen）
49097a943a
fix duplicated white space and typo [skip ci]
2014-06-28 22:51:54 +08:00
Qiang Xue
9fd36afd5a
typo fix
2014-06-28 10:00:17 -04:00
Qiang Xue
4fa02c6425
Merge branch 'master' of git://github.com/yiisoft/yii2
2014-06-28 09:47:11 -04:00
Qiang Xue
dfadb6a917
Fixes #4098 : yii\db\Query::addSelect() should include * when it is called the first time
2014-06-28 09:46:56 -04:00
Antonio Ramirez
0d9bc8b270
Merge remote-tracking branch 'upstream/master' into upstream
...
* upstream/master:
typo fixes [skip ci]
2014-06-28 15:41:04 +02:00
Antonio Ramirez
0c2a3643a1
add concept-aliases.md
2014-06-28 15:40:47 +02:00
Qiang Xue
b4855f73b9
typo fixes [skip ci]
2014-06-28 09:40:43 -04:00
Antonio Ramirez
504c5a148b
add caching-http.md
2014-06-28 15:04:24 +02:00
Alexander Makarov
42e24f0fb1
Improved references to Composer packages in docs
2014-06-28 15:15:36 +04:00
Alexander Makarov
3a807614b7
Merge pull request #4099 from dilip-vishwa/patch-5
...
Upgrade Bootstrap from 3.1 to 3.2
2014-06-28 14:58:19 +04:00
Antonio Ramirez
912be0079e
add caching-fragment.md
2014-06-28 10:29:10 +02:00
Antonio Ramirez
4cf37cefb7
fix link
2014-06-28 10:28:56 +02:00
Dilip
79309d8f13
Upgraded Bootstrap from 3.1 to 3.2
2014-06-28 13:08:56 +05:30
Antonio Ramirez
a5caa2037e
add caching-page.md
2014-06-28 02:13:29 +02:00
Carsten Brandt
a2b45f5664
Merge pull request #4097 from deerawan/development
...
Fix json format in gii/generators/extension/default
2014-06-28 01:45:04 +02:00
