Commit Graph

13606 Commits

Author SHA1 Message Date
Alexander Makarov
476b9b444f Merge pull request #8804 from nepster-web/patch-5
Update security-best-practices.md [skip ci]
2015-06-16 00:37:31 +02:00
Carsten Brandt
ca492533f5 Merge pull request #8805 from alcirmonteiro/master
docs/guide-pt-BR/rest-resources.md - translate [ci skip]
2015-06-15 23:29:56 +02:00
Davidson Alencar
751e6f7c20 docs/guide-pt-BR/rest-resources.md - translate [ci skip] 2015-06-15 18:01:12 -03:00
Nepster
d4eb4b3f17 Update security-best-practices.md 2015-06-15 23:34:02 +03:00
Alexander Makarov
cca0f043b8 Merge pull request #8799 from alcirmonteiro/master
docs/guide-pt-BR/rest-quick-start.md - translate [ci skip]
2015-06-15 16:09:24 +02:00
Alexander Makarov
39334cf289 Merge pull request #8800 from gagiD/bosnian-messages-translation
Bosnian messages translation [skip ci]
2015-06-15 16:09:02 +02:00
gagiD
1881435764 Merge branch 'master' of git://github.com/yiisoft/yii2 into bosnian-messages-translation 2015-06-15 15:50:49 +02:00
gagiD
347c66b6c0 Added Bosnian translations 2015-06-15 15:50:29 +02:00
Davidson Alencar
c981801975 docs/guide-pt-BR/rest-quick-start.md - translate [ci skip] 2015-06-15 10:05:02 -03:00
Qiang Xue
7ce9c9e463 Merge pull request #8793 from pine3ree/patch-2
doc-block typo
2015-06-14 20:02:01 -04:00
maks feltrin
d613719298 Update ActionColumn.php 2015-06-15 01:34:35 +02:00
Alexander Makarov
f348820e13 Merge pull request #8792 from ShNURoK42/patch-2
Update structure-controllers.md [skip ci]
2015-06-14 23:12:32 +02:00
Alexandr
0967cd9d99 Update structure-controllers.md 2015-06-15 04:09:09 +07:00
Carsten Brandt
29d33b06cb Merge pull request #8790 from yiisoft/remove-duplicate-without-pk
abort removing duplicate records when pk is not in result set
2015-06-14 22:37:22 +02:00
Alexander Makarov
6625161713 Made badges consistent. Fixes #7053 2015-06-14 21:36:08 +02:00
Carsten Brandt
d0c6cb7700 abort removing duplicate records when pk is not in result set
in this cases it does not make sense to remove duplicates as the result is not on record level anymore.
This could be the case after GROUP BY has been applied.

fixes #8772
2015-06-14 19:29:57 +02:00
Qiang Xue
1f69c73d6c Merge pull request #8778 from CyanoFresh/patch-1
Update output-data-widgets.md
2015-06-13 09:11:55 -04:00
Alex Solomaha
1db5787456 Update output-data-widgets.md 2015-06-13 15:39:30 +03:00
Phan Xuan Dung
5ebb81a3e7 Start gii Update 2015-06-13 16:01:06 +07:00
Phan Xuan Dung
b0ca32e1d6 Start database. Update readme 2015-06-13 10:53:45 +07:00
Qiang Xue
b612f9187f i18n doc WIP 2015-06-12 23:11:13 -04:00
Carsten Brandt
f524722cf4 Merge pull request #8766 from alcirmonteiro/master
docs/guide-pt-BR/security-authorization.md - translate [ci skip]
2015-06-12 18:48:38 +02:00
Davidson Alencar
f7d8a7bd8a docs/guide-pt-BR/security-authorization.md - translate [ci skip] 2015-06-12 09:16:07 -03:00
Alexander Makarov
256e247f17 Merge pull request #8720 from vchenin/docs_uk
📖 docs/*uk add tutorial-console.md + some corrections [skip ci]
2015-06-12 13:12:58 +02:00
Qiang Xue
9969ae0491 i18n WIP 2015-06-11 22:02:18 -04:00
Carsten Brandt
30f003381d revised AR documentation
fixed some incorrectness in update() and insert() and also fixes #8761
2015-06-12 00:55:12 +02:00
Vadym Chenin
f5fc397225 📖 docs/*uk Update Ukrainian translation [skip ci] 2015-06-11 22:58:42 +03:00
Steve Guns
753ff5bdaf Updated NL translation 2015-06-11 18:50:35 +02:00
Alexander Makarov
7a32272fe1 Merge pull request #8721 from ShNURoK42/patch-1
Update yii.activeForm.js [skip ci]
2015-06-11 11:41:05 +02:00
nkovacs
a99ae5b1ed Fixes #8661: Fixed yii.activeForm.js scrolling to top 2015-06-11 11:37:19 +02:00
Qiang Xue
eeb1dec840 i18n doc WIP 2015-06-10 21:53:13 -04:00
Alexander Makarov
ebc49a32f1 Merge pull request #8738 from unclead/guide-ru-input-multiple-models
Translation of guide-ru/input-multiple-models.md part [ci skip]
2015-06-10 19:42:57 +02:00
Eugene Tupikov
14cb0d3f2c Translation of guide-ru/input-multiple-models.md part 2015-06-10 22:25:44 +06:00
Alexander Makarov
51b4b1e02d Merge pull request #8735 from githubjeka/patch-1
[RU DOC] Update README.md [skip ci]
2015-06-10 14:57:43 +02:00
Evgeniy Tkachenko
ebff81faae Update README.md
The pages were translated.
2015-06-10 15:27:48 +03:00
Alexander Makarov
63f9ec4da6 Fixed formatting 2015-06-10 13:39:47 +02:00
Alexander Makarov
836d8378bc Merge branch 'marius7383-8625-message-controller-mark-unused' 2015-06-10 13:35:36 +02:00
Alexander Makarov
c0c3fa79af Merge branch '8625-message-controller-mark-unused' of https://github.com/marius7383/yii2 into marius7383-8625-message-controller-mark-unused
Conflicts:
	framework/CHANGELOG.md
2015-06-10 13:33:20 +02:00
Alexander Makarov
50de9ff9ca Merge pull request #8730 from umneeq/patch-1
Update yii\captcha\Captcha.php [skip ci]
2015-06-09 23:36:17 +02:00
Dmitry Chernikov
7a32c63a5c Update yii\captcha\Captcha.php
phpDoc microfix
2015-06-10 00:23:55 +03:00
Qiang Xue
10d9bf16a2 Merge pull request #8722 from faxriddin/master
structure_controllers
2015-06-09 10:04:53 -04:00
Faxriddin Baltayev
302d0404ec Merge pull request #1 from kanet4u/patch-1
let's start...
2015-06-09 18:11:03 +05:00
Alexandr
75dd60ae4a Update yii.activeForm.js 2015-06-09 19:10:53 +07:00
Vadym Chenin
42ae06fa9e 📖 docs/*uk add tutorial-console.md + some corrections [skip ci] 2015-06-09 14:26:22 +03:00
Klimov Paul
c378c8d71c Issue #8670 added to CHANGELOG.md 2015-06-09 13:04:04 +03:00
Klimov Paul
58760538d0 Merge branch 'master' of github.com:yiisoft/yii2 into 8670-multi-data-session 2015-06-09 12:58:17 +03:00
Klimov Paul
d9d1fceef6 Unite test for yii\web\DbSession added 2015-06-09 12:57:48 +03:00
Alexander Makarov
0c470dfb6a Merge pull request #8717 from abeleev/patch-1
Update test-fixtures.md [skip ci]
2015-06-09 11:16:43 +02:00
abeleev
eebe166258 Update test-fixtures.md 2015-06-09 15:43:16 +07:00
Qiang Xue
3e295a9dba Merge pull request #8712 from mongosoft/master
PSR-2 code style fixes
2015-06-08 20:13:14 -04:00