php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,391 Commits 10 Branches 79 Tags
90b9ed87bd0265b2a645c6828635ab922fa7fd7c
Commit Graph

15391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Makarov
2c7387795b Added suggested translation for "junction table" 2015-12-13 14:13:07 +03:00
Carsten Brandt
6fb1b297a5 typo 2015-12-13 05:50:39 +01:00
Carsten Brandt
a204b491ae some guide fixes that prevent compiling 2015-12-13 05:25:09 +01:00
Carsten Brandt
838414118a block types in the guide should not be translated in the code 
otherwise parsing them is not easy. also translation becomes redundant.
We now introduce a json file to have translations for these blocks in a central place.

see also https://github.com/yiisoft-contrib/yiiframework.com/issues/77#issuecomment-164208003
 2015-12-13 02:45:21 +01:00
Carsten Brandt
51c2fce463 typo 2015-12-12 05:10:25 +01:00
Carsten Brandt
c7033712b9 fixed some code highlighting tags in the guide 
to match better the languages in highlight.js
 2015-12-12 05:07:36 +01:00
Carsten Brandt
5ffcd7b577 added nested array test to vardumper 
issue #10376
 2015-12-12 03:24:39 +01:00
Alexander Makarov
cdfe6a2627 Merge pull request #10370 from gael-wogenstahl/patch-1 
Fix french translation for compare validator [skip ci]
 2015-12-11 12:42:00 +03:00
Gaël Wogenstahl
d5a0b9a4b4 Fix french translation for compare validator 
Compare validator error messages translation are incorrect in french.
`{compareValue}` is used instead of `{compareValueOrAttribute}`
 2015-12-11 17:01:47 +11:00
Alexander Makarov
4a3a94346d Merge pull request #10365 from pana1990/update-messages-es 
Update messages-es [skip ci]
 2015-12-10 03:01:09 +03:00
Daniel Gomez Pan
cb3557c30d Update messages-es [skip ci] 2015-12-10 00:29:04 +01:00
Alexander Makarov
51287fa61f Merge pull request #10364 from ruslanbat/patch-1 
FIX rule for camelCase controller name in REST example [skip ci]
 2015-12-10 01:04:07 +03:00
Ruslan Bat
4a1a0fb4d8 FIX rule for camelCase controllerName 
<controller:\w+>s
if use this variant of rule  you cant get controller with camelCase name as  camel-case
 2015-12-09 23:57:01 +02:00
Alexander Makarov
e86af93478 Merge pull request #10360 from callmez/master 
Update yii.php [skip ci]
 2015-12-09 15:42:39 +03:00
callmez
a18423493c Update yii.php 2015-12-09 20:37:20 +08:00
SilverFire - Dmitry Naumenko
61d8bb0cd5 Changelog updated 2015-12-09 10:47:20 +02:00
Alexander Makarov
615a29f04e More fixes for MSSQL tests 2015-12-09 03:07:32 +03:00
Alexander Makarov
619c50d933 Fixed MSSQL initial schema for tests 2015-12-08 23:46:01 +03:00
Alexander Makarov
97b40bf705 Added note for upgrade guide 2015-12-08 20:54:55 +03:00
Alexander Makarov
0e0079bcae Fixes #9573: Added yii\rbac\ManagerInterface::getUserIDsByRole() and implementations 2015-12-08 20:00:48 +03:00
Alexander Makarov
11e1ffcdf4 Merge pull request #10354 from Pontorez/patch-1 
Typo, style
 2015-12-08 18:39:58 +03:00
Pontorez
77deee4230 Typo, style 2015-12-08 15:33:16 +00:00
Carsten Brandt
1b26a0dca2 Merge pull request #10343 from pana1990/update-travis 
Remove block comment [skip ci]
 2015-12-07 17:58:03 +01:00
Daniel Gomez Pan
436b6555fc Remove block comment [skip ci] 2015-12-07 13:08:05 +01:00
Carsten Brandt
f4290670a4 Merge pull request #10337 from yiisoft/revert-10335-patch-1 
Revert "Update db-active-record.md"
 2015-12-07 01:07:28 +01:00
Carsten Brandt
6340c52149 Merge pull request #10336 from yiijan/docs-ja-1207 
docs/guide-ja updated [ci skip]
 2015-12-07 00:55:22 +01:00
Carsten Brandt
f15613a8c3 Revert "Update db-active-record.md" 2015-12-07 00:54:29 +01:00
Nobuo Kihara
b9e38e56c1 docs/guide-ja updated [ci skip] 2015-12-07 07:41:16 +09:00
Dmitry Naumenko
7623539730 Merge pull request #10335 from agamayaservers/patch-1 
Update db-active-record.md
 2015-12-06 23:29:05 +02:00
agamayaservers
3ab8673bc7 Update db-active-record.md 2015-12-06 23:42:48 +03:00
SilverFire - Dmitry Naumenko
e8aa60e411 Merge branch 'pjax' of https://github.com/Alex-Code/yii2 into Alex-Code-pjax 2015-12-06 21:50:33 +02:00
Alexander Makarov
762307f2f5 Updated caching docs 2015-12-06 19:49:57 +03:00
Alexander Makarov
2c596cf5a5 Merge pull request #10334 from pana1990/patch 
Add @since [skip ci]
 2015-12-06 18:43:35 +02:00
Daniel Gomez Pan
ab5baa6c41 Add @since [skip ci] 2015-12-06 17:32:49 +01:00
SilverFire - Dmitry Naumenko
75404ff592 Guide for input-validation updated. Closes #10314 2015-12-06 11:19:29 +02:00
SilverFire - Dmitry Naumenko
9a371fb68d Guide EN,RU: Input file upload updated 2015-12-06 07:29:19 +02:00
SilverFire - Dmitry Naumenko
898ffa57c4 FileValidator - updated PHPDoc 2015-12-06 07:12:20 +02:00
Carsten Brandt
468886a77b small refactoring for #9452 2015-12-06 06:04:46 +01:00
Dmitry Naumenko
ccaa6efdc7 Merge pull request #9472 from schojniak/GroupUrlRule 
GroupUrlRule: if $this->routePrefix is unset then only one trim is called
 2015-12-05 21:26:12 +02:00
SilverFire - Dmitry Naumenko
2be8a716b1 #8995, #8996 - added unit test, changelog line 2015-12-05 21:23:33 +02:00
SilverFire - Dmitry Naumenko
d5eff682a0 Merge branch 'patch-1' of https://github.com/PowerGamer1/yii2 into PowerGamer1-patch-1 2015-12-05 21:22:24 +02:00
Klimov Paul
bea90e1228 Fixed yii\db\Query::where() does not add params from directly passed yii\db\Expression 2015-12-05 12:28:43 +02:00
Klimov Paul
170c376648 yii\helpers\VarDumper::dump() now respects PHP magic method __debugInfo() 2015-12-05 11:21:49 +02:00
Alexander Makarov
f370f47da4 Merge pull request #10327 from janisto/message_fi_update-7 
Update Finnish translation [skip ci]
 2015-12-04 14:49:37 +02:00
Jani Mikkonen
e75abaf9f6 Update Finnish translation 2015-12-04 14:40:57 +02:00
Carsten Brandt
56ed64103f Merge pull request #10324 from Vovan-VE/tweak-message-extract-output 
MessageController output DB lost EOL when unused messages unchanged
 2015-12-04 05:16:41 +01:00
Vovan-VE
d1d1106179 MessageController output DB lost EOL when unused messages unchanged 
When storing messages to DB and neither `removeUnused`, nor `markUnused`
is enabled, then output about obsoleted messages won't say anything
about update results and lost EOL:

    [/path] $ ./yii message/extract ...
    Extracting messages from <file>...

    Extracting messages from <file>...

    Inserting new messages...saved.
    Updating obsoleted messages...[/path] $ _

Patched to explain what happened and fix EOL:

    Inserting new messages...saved.
    Updating obsoleted messages...kept untouched.
    [/path] $ _
 2015-12-04 11:43:06 +08:00
SilverFire - Dmitry Naumenko
8f94a824fd Added #10302 to CHANGELOG 2015-12-03 23:27:31 +02:00
SilverFire - Dmitry Naumenko
f7cf641635 Guide tutorial-console updated 2015-12-03 23:19:51 +02:00
Sam Mousa
25b1178515 Implemented data-form support. 2015-12-03 16:01:11 +00:00