Commit Graph

7547 Commits

Author SHA1 Message Date
Klimov Paul
3f001aeed0 Escaping of the special characters at 'MATCH' statement added 2014-06-03 13:47:15 +03:00
Alexander Makarov
2a75cd19c0 Added missing relations to Redis/Elasticsearch test models 2014-06-03 14:24:11 +04:00
Alexander Makarov
4769e730fa Fixed sqlite schema SQL 2014-06-03 14:20:30 +04:00
Alexander Makarov
9c564808e5 Added missing models for Redis tests 2014-06-03 14:02:41 +04:00
Qiang Xue
092ca93a3c diagram update [skip ci] 2014-06-02 20:49:46 -04:00
Joel Small
e636174992 Added ability to generate dropdown from Enum field
Alternatively, if statement could be: if(substr($column->dbType, 0, 4) === 'enum'), however expected implemented option to be more robust across other database formats.

Created after followup on this issue:  https://github.com/yiisoft/yii/issues/292#issuecomment-44780779
2014-06-03 08:32:40 +09:30
Qiang Xue
85536c403d updated diagrams [skip ci] 2014-06-02 18:20:50 -04:00
Qiang Xue
511e5ea255 diagram update [skip ci] 2014-06-02 15:25:32 -04:00
Qiang Xue
11e2c2d93a resized diagram [skip ci] 2014-06-02 15:20:31 -04:00
Qiang Xue
37c3907105 resized diagram [skip ci] 2014-06-02 14:58:14 -04:00
Qiang Xue
a154767396 updated app structure diagram [skip ci] 2014-06-02 14:55:23 -04:00
Qiang Xue
4c776ab744 guide WIP [skip ci] 2014-06-02 14:23:58 -04:00
Alexander Makarov
d34e3c326f Fixed typo in test 2014-06-02 20:14:48 +04:00
Alexander Makarov
a5c4a0ebb4 Adjusted BaseActiveRecord code for better noSQL compatibility 2014-06-02 20:13:48 +04:00
Alexander Makarov
ed041f7ade Added missing imports 2014-06-02 18:52:13 +04:00
Alexander Makarov
d0aadffb91 Added missing test models for elasticsearch 2014-06-02 18:33:12 +04:00
Alexander Makarov
0003b10b02 ElasticSearch tests fix 2014-06-02 18:14:02 +04:00
Alexander Makarov
8aee47590d Merge remote-tracking branch 'origin/master' 2014-06-02 17:38:52 +04:00
Alexander Makarov
f7bc1060d3 Merge branch 'NmDimas-unlinkAll' 2014-06-02 17:38:27 +04:00
Alexander Makarov
4624793954 Merge branch 'unlinkAll' of github.com:NmDimas/yii2 into NmDimas-unlinkAll
Conflicts:
	framework/CHANGELOG.md
2014-06-02 17:38:15 +04:00
Qiang Xue
fc28cee5f5 minor doc update [skip ci] 2014-06-02 09:34:50 -04:00
Alexander Makarov
ceb2689f68 Merge branch 'leandrogehlen-patch-1' 2014-06-02 16:10:34 +04:00
Alexander Makarov
7669b06214 Merge branch 'patch-1' of github.com:leandrogehlen/yii2 into leandrogehlen-patch-1
Conflicts:
	framework/CHANGELOG.md
2014-06-02 16:10:21 +04:00
Qiang Xue
bc19fd50aa guide WIP [skip ci] 2014-06-01 22:03:31 -04:00
Qiang Xue
01e11e37a3 Added overview section [skip ci] 2014-06-01 18:12:38 -04:00
NmDimas
95d2b29bff Change unit test to Unlink and add test to unlinkAll 2014-06-01 22:40:05 +03:00
Qiang Xue
ba77b2d14f updated structure diagram [skip ci] 2014-06-01 14:43:09 -04:00
Qiang Xue
c01958efef Finished controller chapter [skip ci] 2014-06-01 08:32:44 -04:00
Qiang Xue
a0240daadb Merge pull request #3658 from creocoder/activequery-one-refactoring
ActiveQuery::one() slight refactoring
2014-05-31 19:58:44 -04:00
Alexander Kochetov
ce1e469751 ActiveQuery::one() slight refactoring 2014-06-01 02:34:48 +04:00
leandrogehlen
e6f05c6b9a Adjusted documentation 2014-05-31 18:37:53 -03:00
leandrogehlen
fbb2d940ec Adjusted changelog 2014-05-31 18:35:20 -03:00
Alexander Makarov
0c02edbfca Adjusted default validator method phpdoc 2014-06-01 00:26:16 +04:00
Alexander Makarov
44273f0790 Revert "Merge pull request #3445 from Alex-Code/getValue"
This reverts commit a5846fa269, reversing
changes made to 2a6e064aca.
2014-06-01 00:14:44 +04:00
leandrogehlen
51c162d65e Fixes typo 2014-05-31 10:42:04 -03:00
leandrogehlen
95f87f77c4 Changelog 2014-05-31 10:40:10 -03:00
leandrogehlen
f072b55638 Renamed Formatter::currencySymbol to currencyCode 2014-05-31 10:38:31 -03:00
Alexander Makarov
a5846fa269 Merge pull request #3445 from Alex-Code/getValue
Check if property is set
2014-05-31 13:07:59 +04:00
Alexander Makarov
2a6e064aca Merge branch 'Alex-Code-defaultValueValidator'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-05-31 12:11:24 +04:00
Alexander Makarov
68341dd50e Merge branch 'defaultValueValidator' of github.com:Alex-Code/yii2 into Alex-Code-defaultValueValidator
Conflicts:
	framework/CHANGELOG.md
2014-05-31 12:09:45 +04:00
leandrogehlen
b2e8c07e4f changelog 2014-05-30 16:23:49 -03:00
leandrogehlen
0efa0faaf7 Added comment about $currency when it is null 2014-05-30 16:23:25 -03:00
Alexander Makarov
da2381cbcd Merge remote-tracking branch 'origin/master'
Conflicts:
	framework/CHANGELOG.md
2014-05-31 00:36:27 +06:00
Alexander Makarov
2fc1a382e9 Merge branch 'arturf-master' 2014-05-31 00:34:44 +06:00
Alexander Makarov
ad7f7c43ac Fixes #3636: Hide menu container tag with empty items in yii\widgets\Menu 2014-05-31 00:34:14 +06:00
Carsten Brandt
0b248dff81 Merge PR #3643 branch 'mime-types-from-apache' of github.com:yiisoft/yii2
* 'mime-types-from-apache' of github.com:yiisoft/yii2:
  changelog
  generated mimeType detection file from apache http mime.types file

Conflicts:
	framework/CHANGELOG.md
2014-05-30 16:58:07 +02:00
Klimov Paul
12a00d4966 Merge branch 'master' of github.com:yiisoft/yii2 2014-05-30 17:04:35 +03:00
Klimov Paul
5a8672a1ee Docs about nested layouts added 2014-05-30 17:04:08 +03:00
Carsten Brandt
ac9a7c65d7 changelog 2014-05-30 16:01:39 +02:00
Carsten Brandt
e5713c8e12 generated mimeType detection file from apache http mime.types file
MimeTypeController generates a map of file extensions to MIME types

It uses `mime.types` file from apache http located under
http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=markup

This file has been placed in the public domain for unlimited
redistribution,
so we can use it and ship it with Yii.

see also yiisoft/yii#2851 and yiisoft/yii#2857
2014-05-30 15:54:51 +02:00