Alexander Makarov
c68e5f1fdb
Adjusted naming
2014-06-29 16:18:19 +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
Antonio Ramirez
93cf3bb5e9
Remove white space excess
2014-06-28 01:44:40 +02:00
Antonio Ramirez
e583e0be54
Merge remote-tracking branch 'upstream/master' into upstream
...
* upstream/master:
resolved naming conflict in apidoc
2014-06-28 01:30:30 +02:00
Antonio Ramirez
7370664825
add caching-overview.md
2014-06-28 01:30:11 +02:00
Carsten Brandt
fd8828cfb4
resolved naming conflict in apidoc
2014-06-28 01:25:10 +02:00
Antonio Ramirez
d8ae74ee05
Merge remote-tracking branch 'upstream/master' into upstream
...
* upstream/master:
gridview and listview use widget ID in base tag
typo fix [skip ci]
Update CHANGELOG.md
made elasticsearch error messages more readable
Spanish structure-views [skip ci]
Fix filename
Update README.md
https://github.com/yiisoft/yii2/pull/4091#discussion_r14296860
Fix possibility of non-removed symlinked directory.
Fixed typo. [skip ci]
changed default for rotateByCopy of FileTarget
2014-06-28 01:11:02 +02:00
Antonio Ramirez
392f291086
add caching-data.md
2014-06-28 01:10:44 +02:00
Antonio Ramirez
f11636eb40
Minor fixes
2014-06-28 01:10:30 +02:00
Paul Klimov
052ae83340
Option Security::autoGenerateSecretKey added
2014-06-28 00:11:48 +03:00
Paul Klimov
25a3637709
Upgrade note about Security updated
2014-06-27 23:33:16 +03:00
Paul Klimov
5a42985750
Option Security::useDeriveKeyUniqueSalt added
2014-06-27 23:30:28 +03:00
Paul Klimov
772667fa1c
Doc comments at Security updated
2014-06-27 23:13:57 +03:00
Paul Klimov
4ce4707a3a
Option Security::passwordHashStrategy added
2014-06-27 23:05:23 +03:00
Paul Klimov
4063502439
Option Security::deriveKeyStrategy added
2014-06-27 22:10:02 +03:00
Paul Klimov
846596294d
Fallback for Security::generateRandomKey() added
2014-06-27 21:45:52 +03:00
Paul Klimov
4768dcdbc2
Method Security::compareString() extracted
2014-06-27 21:33:42 +03:00
Carsten Brandt
085f2c0142
gridview and listview use widget ID in base tag
2014-06-27 20:26:26 +02:00
Qiang Xue
5ce9716832
typo fix [skip ci]
2014-06-27 14:13:05 -04:00
Alexander Makarov
bfce5611c2
Merge pull request #4095 from lucianobaraglia/translation-es
...
Spanish structure-views [skip ci]
2014-06-27 21:02:31 +04:00
Carsten Brandt
11ed296de4
Update CHANGELOG.md
2014-06-27 18:55:40 +02:00
Carsten Brandt
eb317507d2
made elasticsearch error messages more readable
2014-06-27 18:47:23 +02:00
Qiang Xue
2b47bc696f
Merge pull request #4094 from qiansen1386/patch-9
...
Fix filename
2014-06-27 12:42:17 -04:00
Budi Irawan
45e4973ac8
fix json format in gii/generators/extension/default
2014-06-27 23:38:03 +07:00
