Commit Graph

15391 Commits

Author SHA1 Message Date
Chris Harris
eaeb926768 Adds char datatype to framework 2016-02-20 01:52:23 -08:00
Chris Harris
eaa00b6fd9 Merge branch 'master' of git://github.com/yiisoft/yii2 2016-02-19 18:39:22 -08:00
Alexander Makarov
d7f6f11193 HTMLPurifier dependency updated to ~4.7.0 2016-02-20 02:57:45 +03:00
Daniel Gomez Pan
c8a8bfb093 WIP #10840: add @since [skip ci] 2016-02-19 22:47:36 +01:00
Daniel Gomez Pan
ea14db4eca WIP #10840: rename 'key_exists' to 'array_key_exists' 2016-02-19 22:33:06 +01:00
Alexander Makarov
5389342767 Merge pull request #10915 from pana1990/10903-migration-docs
fix docs [skip ci]
2016-02-20 00:10:39 +03:00
Daniel Gomez Pan
dc13fd8cfe fix docs [skip ci] 2016-02-19 21:37:02 +01:00
Carsten Brandt
6c5c2ff64f added test for AccessRule class
related to #10898
2016-02-19 17:04:35 +01:00
Daniel Gomez Pan
6a5df64768 WIP #10840: fix regexp 2016-02-19 16:26:53 +01:00
Daniel Gomez Pan
c6d7ba188d WIP #10840: refactor regexp 2016-02-18 12:48:37 +01:00
Chris Harris
0400eb9cee Resolved merge conflict in changelog 2016-02-18 02:34:02 -08:00
Dmitry Naumenko
2c3e31b580 Merge pull request #10891 from lukBarros/patch-2
grammatical adjustment
2016-02-18 11:10:09 +02:00
Dmitry Naumenko
9b9d198f24 Merge pull request #10890 from lukBarros/patch-1
Change link broken by outher file of doc
2016-02-18 11:05:48 +02:00
Lucas Barros
af8e792f0d grammatical adjustment 2016-02-17 23:49:47 -03:00
Lucas Barros
c9cc8fb42f Change link broken by outher file of doc
Related in #10789
2016-02-17 21:18:39 -03:00
Daniel Gomez Pan
ab18f77fcc WIP #10840: fixes phpdocs [skip ci] 2016-02-18 00:24:45 +01:00
Alexander Makarov
1918341a50 Merge pull request #10888 from careykevin/patch-2
Fix spelling [skip ci]
2016-02-18 00:16:48 +03:00
Alexander Makarov
c9d7f761d4 Merge pull request #10887 from careykevin/patch-1
Fix spelling [skip ci]
2016-02-18 00:16:26 +03:00
Kevin Carey
75b40c08ea Fix spelling
Misspelling of "maintenance"
2016-02-17 14:35:07 -05:00
Kevin Carey
836a65b697 Fix spelling
Misspelling of "maintenance"
2016-02-17 14:33:36 -05:00
Daniel Gomez Pan
29b76e2e8c WIP #10840: add phpdocs [skip ci] 2016-02-17 18:05:19 +01:00
Carsten Brandt
187c314d01 better fix for test break b9880f3247 2016-02-17 14:27:10 +01:00
SilverFire - Dmitry Naumenko
4e4fb02264 Fixed QueryBuilterTest for PgSQL 2016-02-17 07:42:04 +02:00
Dmitry Naumenko
4640f7478a Merge pull request #10874 from lukBarros/patch-1
Sync the file guid, translater, review for ptBR
2016-02-17 07:35:19 +02:00
Lucas Barros
f639d63cf9 Sync the file guid, translater, review for ptBR 2016-02-16 23:33:08 -03:00
Daniel Gomez Pan
f6c2a4382d WIP #10840: fix naming var 2016-02-16 23:23:19 +01:00
Daniel Gomez Pan
26ff223855 WIP #10840: add display shorcuts in help command 2016-02-16 22:56:29 +01:00
Daniel Gomez Pan
edfdb54430 WIP #10840: rename shortCuts() to optionAliases() 2016-02-16 22:35:40 +01:00
Carsten Brandt
b9880f3247 added test for custom index hints in FROM and JOIN
close #10869
2016-02-16 21:24:00 +01:00
Daniel Gomez Pan
a0a44c382a WIP #10840 2016-02-16 15:47:28 +01:00
Carsten Brandt
33f86b3913 updated composer.json to match the one in framework 2016-02-16 15:04:50 +01:00
Alexander Makarov
bf3d8fe40f Use $arr[] = 'x' instead of array_push 2016-02-16 14:35:15 +03:00
Alexander Makarov
4bc7c51180 Removed unnecessary if 2016-02-16 14:13:43 +03:00
Alexander Makarov
5c4e2d4372 Removed unnecessary parentheses 2016-02-16 14:08:43 +03:00
Alexander Makarov
1f7134634b Use static:: instead of $this for static method calls 2016-02-16 14:06:23 +03:00
Alexander Makarov
97bc4e0567 Fixed wrong case in method calls 2016-02-16 13:53:53 +03:00
Alexander Makarov
608479dc53 Use actual cache methods instead of deprecated ones, fixed static method call in non-static context 2016-02-16 13:50:42 +03:00
Alexander Makarov
b6caff1952 Removed unused imports 2016-02-16 13:48:09 +03:00
Alexander Makarov
1af5980b35 Removed unused use statement, replaced preg_split with explode 2016-02-16 13:46:13 +03:00
Dmitry Naumenko
84a3bc2ebf Merge pull request #10842 from lukBarros/master
Added and translated into Brazil of the Portuguese session of the URL helper
2016-02-16 10:20:42 +02:00
Alexander Makarov
69d8f2296f Merge pull request #10860 from pana1990/patch
Add @since [skip ci]
2016-02-16 01:42:14 +03:00
Alexander Makarov
386aacae5c Fixes #10422: yii\db\ColumnSchemaBuilder::buildNotNullString now returns NULL instead of empty string to properly work with MSSQL (reverted from commit 2498a9b3bb) 2016-02-16 01:39:42 +03:00
Daniel Gomez Pan
8b0f28f780 Add @since [skip ci] 2016-02-15 23:06:58 +01:00
nevermnd
2498a9b3bb Fixes #10422: yii\db\ColumnSchemaBuilder::buildNotNullString now returns NULL instead of empty string to properly work with MSSQL 2016-02-15 23:55:34 +03:00
Sam Mousa
af5f5d0e3e Fixes #9851: Fixed partial commit / rollback in nested transactions 2016-02-15 23:32:32 +03:00
quantum
7b46bd1f7c Fixes #10451: Check of existence of $_SERVER in \yii\web\Request before using it 2016-02-15 23:22:45 +03:00
Alexander Makarov
1ec972fbf7 Fixes #10610: Added BaseUrl::$urlManager to be able to set URL manager used for creating URLs 2016-02-15 22:35:58 +03:00
Dmitry Naumenko
a41208b37f Merge pull request #10777 from pana1990/10764-enh-options-tag
WIP #10764
2016-02-15 21:01:14 +02:00
Daniel Gomez Pan
3bf3c20710 Merge remote-tracking branch 'upstream/master' into 10764-enh-options-tag
# Conflicts:
#	framework/CHANGELOG.md
2016-02-15 17:37:40 +01:00
Dmitry Naumenko
6ac7496931 Merge pull request #10853 from githubjeka/filevalidator_doc
Update phpDoc maxSize of FileValidator
2016-02-15 18:25:30 +02:00