Commit Graph

7316 Commits

Author SHA1 Message Date
Qiang Xue
0aff05850c Merge branch 'patch-4' of github.com:kartik-v/yii2 into kartik-v-patch-4
Conflicts:
	framework/CHANGELOG.md
2014-05-21 14:46:58 -04:00
Kartik Visweswaran
63f5a74712 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-22 00:16:26 +05:30
Kartik Visweswaran
44b387e4fe Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-22 00:15:22 +05:30
Kartik Visweswaran
45e355a50c Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-22 00:12:21 +05:30
Kartik Visweswaran
16f279ebe3 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-22 00:06:06 +05:30
Qiang Xue
1803d666bf Merge pull request #3536 from rawtaz/3531-gridViewColumnNames-allowMoreChars
Fix #3531, allow more chars in \yii\grid\GridView's short syntax for columns.
2014-05-21 13:46:17 -04:00
Leo R. Lundgren
b1bf636983 Fix #3531, allow more characters in \yii\grid\GridView's short array syntax for columns. 2014-05-21 19:39:38 +02:00
Qiang Xue
81e12c3c45 Merge pull request #3534 from muyiwaolurin/patch-2
Update security-authorization.md
2014-05-21 12:59:24 -04:00
muyiwaolurin
d6f74f4b2b Update security-authorization.md
Typo
2014-05-21 11:08:40 -04:00
muyiwaolurin
279450d804 Update security-authorization.md
typo
2014-05-21 10:49:42 -04:00
Scott Tester
39265da4f5 Code style fix & CHANGELOG typo fix for bug #3522 2014-05-21 22:24:49 +10:00
Scott Tester
de484b5e76 Added BUG #3522 to the changelog. 2014-05-21 21:02:38 +10:00
Scott Tester
be89ff97d3 fixed normalizePath to keep a '.' path when necessary. 2014-05-21 20:55:52 +10:00
Alexander Makarov
f02beaea8f Merge pull request #3525 from Allineer/patch-1
Small typo in the framework/rbac/PhpManager.php
2014-05-21 09:44:08 +02:00
Allineer
f22953d092 Small typo in the framework/rbac/PhpManager.php 2014-05-21 11:42:40 +04:00
Kartik Visweswaran
ed5fe96432 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-21 12:25:03 +05:30
Qiang Xue
9d986b49d9 guide WIP [skip ci] 2014-05-20 18:00:44 -04:00
Kartik Visweswaran
1abd0ab486 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-20 23:53:37 +05:30
Kartik Visweswaran
0e40dfdd6e Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-20 23:42:49 +05:30
Alexander Makarov
249e27a87d Regenerated translations 2014-05-20 19:39:37 +04:00
Alexander Makarov
e9ee02dda8 Merge pull request #3491 from mbman/advanced-app-gitignore-codeguy
Advanced app's common tests codeception generated files added to .gitignore
2014-05-20 16:32:24 +02:00
Alexander Makarov
2cad8fcc6f Merge pull request #3517 from klimov-paul/apply-var-dumper-var-export
`VarDumper::export()` applied over framework.
2014-05-20 16:24:10 +02:00
Alexander Makarov
800b18db2e Merge pull request #3518 from DaSourcerer/invalid-chars-in-htmlspecialchars-handling
Handle invalid code sequences in Html::encode()
2014-05-20 16:09:21 +02:00
DaSourcerer
5ed7c3c712 Changelog update 2014-05-20 15:57:25 +02:00
DaSourcerer
be164e45db Handle invalid code sequences in Html::encode() 2014-05-20 15:44:23 +02:00
Klimov Paul
1641e057a9 VarDumper::export() applied over framework. 2014-05-20 16:35:12 +03:00
Qiang Xue
2b26dd3285 Improved doc [skip ci] 2014-05-20 08:34:28 -04:00
Qiang Xue
2188da0cd9 Merge pull request #3419 from klimov-paul/3232-var-export
Fix for #3232 var export
2014-05-20 08:28:36 -04:00
Alexander Makarov
b898553c7a Moved glossary from wiki 2014-05-20 13:15:53 +04:00
Qiang Xue
9b4b3b6735 typos. [skip ci] 2014-05-20 00:19:10 -04:00
Qiang Xue
cb66c92609 Finished caching guide [skip ci] 2014-05-20 00:17:10 -04:00
Qiang Xue
972173a5bc guide WIP [skip ci] 2014-05-19 18:10:29 -04:00
Qiang Xue
5fdc3d408b Added support for using path alias with FileDependency::fileName 2014-05-19 15:40:31 -04:00
Kartik Visweswaran
e1934ccf6c Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-19 21:41:31 +05:30
Kartik Visweswaran
5c778b4297 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-19 21:35:43 +05:30
Kartik Visweswaran
0ed190e995 Fix #3472: Configurable option to encode spaces in dropdowns 2014-05-19 21:32:13 +05:30
Klimov Paul
6f3ffae7d6 Merge branch 'master' of github.com:yiisoft/yii2 into 3232-var-export 2014-05-19 18:34:07 +03:00
Klimov Paul
8d0fb916c0 VarDumper::exportAsString() removed 2014-05-19 18:33:49 +03:00
Qiang Xue
5439ab7854 Changed the default value of Cache::keyPrefix to be null. 2014-05-19 11:29:34 -04:00
Qiang Xue
5c5fcd6ee1 guide WIP [skip ci] 2014-05-19 08:48:13 -04:00
Alexander Makarov
d84df88817 Merge pull request #3505 from dalli/master
[ci skip] Korean Language translation
2014-05-19 12:37:43 +02:00
Carsten Brandt
ad6b191081 improved docs about flash messages 2014-05-19 12:34:31 +02:00
Alexander Makarov
5303506c12 Merge pull request #3503 from djfly/patch-5
Update output-data-providers.md
2014-05-19 10:09:59 +02:00
Alexander Makarov
ec2246983a Merge pull request #3504 from ychongsaytc/patch-1
Update UniqueValidator.php
2014-05-19 10:05:58 +02:00
Chong Freeman
c6e8f66e1b Update UniqueValidator.php 2014-05-19 15:52:54 +08:00
ff
d5024f9acb Update output-data-providers.md
Modified a bit, better?
2014-05-19 14:01:42 +08:00
Qiang Xue
3cbf1adbae guide WIP [skip ci] 2014-05-18 19:51:44 -04:00
ff
83a406981b Update output-data-providers.md
defaultOrder this is often used for everyone
2014-05-19 00:24:41 +08:00
Qiang Xue
3893bcd08d guide WIP [skip ci] 2014-05-18 08:46:16 -04:00
Qiang Xue
ce12ddb6fd Merge pull request #3499 from ShNURoK42/master
Rename errorHandler to getErrorHandler()
2014-05-17 16:10:06 -04:00