Commit Graph

9327 Commits

Author SHA1 Message Date
Alexander Makarov
ffc9553f50 Merge pull request #4138 from yiiframework-com-ua/uk_translate
[skip ci][UK][Guide] intro
2014-07-01 11:42:36 +03:00
Paul Klimov
78001851ee Merge pull request #4140 from jcvalerio/patch-1
Remove double "the"
2014-07-01 10:04:20 +03:00
AbrahamGreyson
1412c14762 Guide-zh-CN intro-yii.md proofread. 2014-07-01 11:32:12 +08:00
jcvalerio
6a169b780b Remove double "the" 2014-06-30 20:21:54 -06:00
Borales
aeada69419 [Uk][Guide] intro-upgrade-from-v1.md [skip ci] 2014-07-01 00:10:32 +03:00
Alexander Makarov
b72749a4e9 Merge pull request #4120 from Alex-Code/encodeLabel
Allow single items to choose their encoding option.
2014-07-01 00:11:00 +04:00
Alexander Makarov
deecdcad84 Adjusted exception message when pdkdbf2 is set but environment isn't OK 2014-06-30 21:23:33 +04:00
Alexander Makarov
dd5a16aa4a Fixes #4127: CaptchaValidator clientside error message wasn't formed properly 2014-06-30 20:35:49 +04:00
Alexander Makarov
efe5727ff7 Fixed changelog 2014-06-30 20:13:39 +04:00
Alexander Makarov
0378d84c1c Merge pull request #4129 from slash686/translation-ru-structure-widgets
[skip ci] Translation of docs to russian (structure-widgets section)
2014-06-30 20:07:46 +04:00
Alexander Makarov
c2ece9332a Merge pull request #4115 from yiisoft/security-adjustments
Added Security::generateRandomHexKey(), used it for various tokens and default key generation
2014-06-30 20:05:34 +04:00
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
Alexander Makarov
481db35512 Fixes #4114: Added Security::generateRandomHexKey(), used it for various tokens and default key generation 2014-06-30 16:36:52 +04:00
Alex-Code
8683b7905d Update CHANGELOG.md 2014-06-30 12:04:22 +01:00
Alex-Code
8595c1a15f Update CHANGELOG.md 2014-06-30 12:03:51 +01: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
Alex-Code
e1089618f8 Allow an item to choose if it's encoded. 2014-06-30 11:26:37 +01:00
Alex-Code
0711027e01 Allow single items to set their encoding option 2014-06-30 11:24:31 +01: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
东方孤思子(Paris·QianSen)
a7c3800785 fix wrong file name [skip ci] 2014-06-29 15:33:20 +08:00
东方孤思子(Paris·QianSen)
62628c7ce3 fix links and format [skip ci] 2014-06-29 15:33:17 +08: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 0ff0f9d32e

https://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