Commits · 1f102b270c97f392cb8aae1aaa87940cef1f71c6 · PSDI Army / yii2

14 Jun, 2014 4 commits
- Merge remote-tracking branch 'origin/master' · 1f102b27
  Riverlet authored Jun 14, 2014
```
Conflicts:
	docs/guide-zh-CN/intro-yii.md
```
  1f102b27
- translated. · a30847d5
  Riverlet authored Jun 14, 2014
  
  a30847d5
- translated. · 820b5828
  Riverlet authored Jun 14, 2014
  
  820b5828
- translate · dcb5c771
  riverlet authored Jun 14, 2014
  
  dcb5c771
13 Jun, 2014 7 commits
- #3807: Wrong js/css path composition at `AssetController::buildTarget()` fixed · 49f5d364
  Klimov Paul authored Jun 13, 2014
  
  49f5d364
- Test path composition in 'AssetControllerTest' adjusted · 88c25245
  Klimov Paul authored Jun 13, 2014
  
  88c25245
- Merge pull request #3848 from lucianobaraglia/translation-es · 02bd3540
  Alexander Makarov authored Jun 13, 2014
```
Spanish start-databases.md [skip ci]
```
  02bd3540
- Fullname in translation teams (yes, it's a chicks magnet) [skip ci] · 1e73dd44
  Luciano Baraglia authored Jun 13, 2014
  
  1e73dd44
- Fullname in translation teams (yes, it's a chicks magnet) [skip ci] · df1ee121
  Luciano Baraglia authored Jun 13, 2014
  
  df1ee121
- Spanish start-databases.md [skip ci] · b5bf4c79
  Luciano Baraglia authored Jun 13, 2014
  
  b5bf4c79
- guide WIP [skip ci] · b489cada
  Qiang Xue authored Jun 12, 2014
  
  b489cada
12 Jun, 2014 29 commits
- Merge pull request #3846 from lucianobaraglia/translation-es · 4ec0e131
  Alexander Makarov authored Jun 13, 2014
```
Typo fix [skip ci]
```
  4ec0e131
- Typo fix [skip ci] · 14fad723
  Luciano Baraglia authored Jun 12, 2014
  
  14fad723
- Merge pull request #3845 from lucianobaraglia/translation-es · e44e1ad2
  Alexander Makarov authored Jun 13, 2014
```
Spanish start-workflow.md [skip ci]
```
  e44e1ad2
- Spanish start-workflow.md [skip ci] · cfa5d3ca
  Luciano Baraglia authored Jun 12, 2014
  
  cfa5d3ca
- Merge pull request #3843 from umneeq/yii-widgets-menu-fix · 5fc3733f
  Alexander Makarov authored Jun 12, 2014
```
Fix Menu bug when using `template` with `encodeLabel` => false
```
  5fc3733f
- Added bug to CHANGELOG.md · c3cde232
  Dmitry Chernikov authored Jun 12, 2014
  
  c3cde232
- Merge pull request #3844 from alanwillms/pt-br-translations · b9db070a
  Alexander Makarov authored Jun 12, 2014
```
Brazilian Portuguese translation for Yii intro and upgrading from version 1.1
```
  b9db070a
- Add my name to pt-BR translation team · 15053156
  Alan Willms authored Jun 12, 2014
  
  15053156
- Merge branch 'master' of git://github.com/yiisoft/yii2 into pt-br-translations · a393a12d
  Alan Willms authored Jun 12, 2014
  
  a393a12d
- Translate intro-upgrade-from-v1.md into Brazilian Portuguese · 07c16371
  Alan Willms authored Jun 12, 2014
  
  07c16371
- Fix Menu bug when using `template` with `encodeLabel` => false · f27edcc2
  Dmitry Chernikov authored Jun 12, 2014
  
  f27edcc2
- Merge pull request #3841 from lucianobaraglia/translation-es · d05124c3
  Alexander Makarov authored Jun 12, 2014
```
Some words change
```
  d05124c3
- Some words change · 74bc75f6
  Luciano Baraglia authored Jun 12, 2014
  
  74bc75f6
- Merge pull request #3839 from Ragazzo/structure_application_components_translated · b76dd723
  Alexander Makarov authored Jun 12, 2014
```
structure application components translated
```
  b76dd723
- structure application components translated · 29f9670f
  Mark authored Jun 12, 2014
  
  29f9670f
- Merge pull request #3838 from lucianobaraglia/translation-es · 15351b34
  Alexander Makarov authored Jun 12, 2014
```
Spanish start-installation.md and typo in english guide [skip ci]
```
  15351b34
- Spanish start-installation.md and typo in english guide [skip ci] · dac3c5c1
  Luciano Baraglia authored Jun 12, 2014
  
  dac3c5c1
- Merge pull request #3837 from klevron/french-doc · b0ae2d44
  Alexander Makarov authored Jun 12, 2014
```
French intro-yii
```
  b0ae2d44
- Merge pull request #3835 from zxcq544/ru-docs-aliases · 068195d2
  Alexander Makarov authored Jun 12, 2014
```
Ru docs aliases and small fix to autoloading 
```
  068195d2
- Merge pull request #3836 from Ragazzo/structure_entry_scripts_docs_translated · 930aa1f9
  Alexander Makarov authored Jun 12, 2014
```
structure entry scripts guide translated
```
  930aa1f9
- French Fix · d80b6d5b
  Kevin LEVRON authored Jun 12, 2014
  
  d80b6d5b
- French Fix · 2e2579db
  Kevin LEVRON authored Jun 12, 2014
  
  2e2579db
- structure entry scripts guide translated · e058d0ac
  Mark authored Jun 12, 2014
  
  e058d0ac
- small fix · c0cc736e
  zxcq544 authored Jun 12, 2014
  
  c0cc736e
- Merge https://github.com/yiisoft/yii2 into ru-docs-aliases · e1edb190
  zxcq544 authored Jun 12, 2014
  
  e1edb190
- minor doc edit [skip ci] · 8b077e02
  Qiang Xue authored Jun 12, 2014
  
  8b077e02
- Merge https://github.com/yiisoft/yii2 into ru-docs-aliases · 45169ee1
  zxcq544 authored Jun 12, 2014
  
  45169ee1
- French intro-yii · 78de0dbe
  Kevin LEVRON authored Jun 12, 2014
  
  78de0dbe
- syntax fix [skip ci] · 7098ce45
  Qiang Xue authored Jun 12, 2014
  
  7098ce45