php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-21 17:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,307 Commits 10 Branches 79 Tags
8d082c11a1c502487b200842927e1a5733abbc7d
Commit Graph

552 Commits

Author SHA1 Message Date
Carsten Brandt
d82195706f UPGRADE and CHANGELOG notes for the Formatter changes 2014-09-10 17:56:25 +02:00
Carsten Brandt
98079b84a2 Merge branch 'master' into Erik-r-2359-formatter-refactored 
* master: (1112 commits)
  Removed unused "use" statements
  Fixed array syntax
  Removed unused "use" statements
  Перевод runtime-handling-errors.md на русский язык
  Mark tests with problematic DBMS as skipped.
  Fixes #3511: Dropped `yii.allowAction()` and modified `yii.confirm()` in `yii.js` to support callbacks
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Create runtime-url-handling.md
  Fixed test break.
  Fixes #3410: yii.activeForm.js now supports adding/removing fields dynamically
  Fixes #2914: `ActiveForm::fieldConfig` will be merged recursively with the `$options` parameter in `ActiveForm::field()`
  Fixes #4936 [skip ci]
  Reverted/fixed some incorrect changes.
  missing "." sign
  Fixed formatting, initialized options array
  Fixed phpdoc
  ...

Conflicts:
	framework/CHANGELOG.md
	framework/base/Formatter.php
	framework/i18n/Formatter.php
	tests/unit/framework/base/FormatterTest.php
	tests/unit/framework/i18n/FormatterTest.php
 2014-09-07 20:44:48 +02:00
Carsten Brandt
f8f0ff5445 moved formatter to i18n namespace 2014-09-07 20:40:34 +02:00
Carsten Brandt
065db64db3 finsihed formatter implementation 
neads cleanup
 2014-09-07 20:35:15 +02:00
Carsten Brandt
2a15ae12e6 refactored number formatting 2014-09-07 18:34:47 +02:00
Carsten Brandt
a4e86c02de date formatter iteration 2014-09-07 15:54:57 +02:00
Carsten Brandt
7f1f759472 small doc adjustments 2014-09-07 14:54:47 +02:00
Qiang Xue
e3ca5a8168 Reverted/fixed some incorrect changes. 2014-09-05 20:23:11 -04:00
Alexander Makarov
73045c83b9 Simplified ArrayTrait::fields() default implementation since it works fine w/ just field names as values 2014-09-06 01:34:16 +04:00
Carsten Brandt
73cb5f8aac changed syntax for referencing the guide in apidoc 
New syntax:

```
[link to guide](guide:file-name.md)
[link to guide](guide:file-name.md#subsection)
```

fixes #4719
 2014-09-05 14:59:22 +02:00
Qiang Xue
ef1a6d20d1 When an ID is found to be in both Application::controllerMap and Application::modules, the former will take precedence 2014-09-04 23:34:11 -04:00
Alexander Makarov
3af08064b8 Fixes #4911: Changed callback signature used in yii\base\ArrayableTrait::fields() from function ($field, $model) { to function ($model, $field) { 2014-09-04 00:35:23 +04:00
Klimov Paul
6709154792 yii\base\ErrorHandler::handleError() adjusted keeping native error processing on error reporting miss match. 2014-08-19 12:42:41 +03:00
disem
7d64e93c00 Merge branch 'master' of git://github.com/yiisoft/yii2 into dynamic-model-typo-fix 2014-08-13 15:51:26 +03:00
disem
a83d441534 typo fix 2014-08-13 15:51:10 +03:00
Henry Abbott
00aab7c379 Fixed typo in comments for generatePasswordHash 2014-08-09 00:23:29 -04:00
Qiang Xue
dee0382c1f Added yii\base\InvalidValueException. 
Refactored `yii\web\User`.
 2014-08-06 10:07:14 -04:00
Carsten Brandt
0ed6355ee1 test and docs to be clear about #4558 2014-08-01 15:35:23 +02:00
Qiang Xue
da544b2676 Fixes #4519: yii\base\Model::isAttributeRequired() should check if the when option of the validator is set 2014-07-29 21:01:24 -04:00
Thiago Talma
45ee387f92 It is not required by default when you set the "when" attribute 2014-07-29 20:59:21 -04:00
Qiang Xue
83b800271b Merge branch 'master' of git://github.com/yiisoft/yii2 2014-07-29 20:54:07 -04:00
Qiang Xue
a0d19e922b Fixes #4497: changed to use hex digits by default when hashing data. 2014-07-29 20:54:01 -04:00
Carsten Brandt
3a1e0f3a5c property codestyle framework 2014-07-30 00:21:31 +02:00
Carsten Brandt
ca9d4867f4 code style 2014-07-29 22:23:59 +02:00
Carsten Brandt
1f31f27787 phpdoc 2014-07-29 22:19:14 +02:00
Carsten Brandt
8701d7df3b more explicit comment in phpdoc, code style 2014-07-29 02:45:56 +02:00
Alexander Makarov
be24a2e2c7 Removed mentions of $deriveKeyStrategy from Security phpdoc 2014-07-28 13:36:06 +04:00
Carsten Brandt
9e9175fe09 fixed typo 
fixes #4480
 2014-07-28 09:12:29 +02:00
Alexey Samoylov
b3260567c2 Mistype 2014-07-28 12:10:14 +08:00
tom--
33f2525a39 Remove nonsense branch logic 2014-07-27 14:30:13 -04:00
tom--
4f5b7afd95 Merge branch 'master' of git://github.com/yiisoft/yii2 into 4469-compareString-without-shortcut 2014-07-27 12:04:03 -04:00
tom--
c6a8b418ef compareString(): timing depends only on length of $actual input, unit test 2014-07-27 12:03:03 -04:00
Vincent
56a9536b51 Typo in docs 2014-07-26 17:07:06 +02:00
Qiang Xue
b680afc721 Fixes #4462. 2014-07-26 10:08:52 -04:00
Alexander Makarov
c5a3cd511e Security component adjustments: fixed comment style, hkdf() and pbkdf2() are now protected, compareString() is now public 2014-07-26 14:09:38 +04:00
tom--
2c5c2c101b Fixes #4131: Security adjustments 2014-07-26 03:29:30 +04:00
Alexander Makarov
0edd8bc65a Fixed missing and incorrect phpdoc 2014-07-25 17:26:35 +04:00
Kai Mindermann
46b553f012 fixes formatter doing one division too much, fixes #4427 2014-07-24 15:55:21 +04:00
Kai Mindermann
f3520187d6 formatter: adds unit tests for base 1000, fixes #4412 2014-07-24 14:57:52 +04:00
Qiang Xue
390a6c782e Fixes #4409: Upper case letters in subdirectory prefixes of controller IDs were not properly handled 2014-07-23 22:10:13 -04:00
Alexander Makarov
8802d0305e Avoid method call in for condition 2014-07-23 16:42:41 +04:00
Qiang Xue
d62f7bebb5 Fixes #4231: turned Controller::findLayoutFile() from protected to public. 2014-07-09 17:12:49 -04:00
Qiang Xue
9c4d4715dd guide WIP [skip ci] 2014-07-03 08:33:09 -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
481db35512 Fixes #4114: Added Security::generateRandomHexKey(), used it for various tokens and default key generation 2014-06-30 16:36:52 +04:00
Paul Klimov
90a625013c Result check at Security::generateRandomKey() added 2014-06-29 15:39:25 +03: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
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
Paul Klimov
84cbf19bfe Doc comments at Security::generateRandomKey() adjusted 2014-06-28 19:05:16 +03:00