php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-19 16:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,316 Commits 10 Branches 79 Tags
949fe449ccf3b33d45cf7b1611b8045ba835e3e6
Commit Graph

7316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carsten Brandt
e407d0489c updated elasticsearch querybuilder test to use yiitest index 
better not delete all to avoid data loss

pr #2324
 2014-02-06 19:31:50 +01:00
Qiang Xue
bad9c0cccc Merge branch 'master' of github.com:mintao/yii2 into mintao-master 
Conflicts:
	extensions/yii/elasticsearch/CHANGELOG.md
 2014-02-06 13:20:48 -05:00
Qiang Xue
ad913dd8f1 Merge pull request #2347 from bohdan4ik/patch-1 
Fix typo
 2014-02-06 12:57:12 -05:00
Bohdan Shulha
03c3775865 Fix typo 2014-02-06 19:55:58 +02:00
Qiang Xue
1f42b72baa Fixes #2346: ActiveQuery used in building sub-query should not need to set FROM clause explicitly. 2014-02-06 10:39:27 -05:00
Qiang Xue
fa353294bb Merge pull request #2345 from mitalcoi/patch-4 
Update FixtureController.php
 2014-02-06 09:28:06 -05:00
Sorokin Victor
a73953c05b Update FixtureController.php 
typo fix
 2014-02-06 16:22:39 +02:00
Alexander Makarov
69f0e5bef5 Merge pull request #2329 from tonydspaniard/1094-modal-generator-autocomplete-fix 
1904 modal generator autocomplete fix
 2014-02-06 13:40:53 +03:00
Alexander Makarov
d438913eeb Merge pull request #2339 from infoza/master 
minor fixes
 2014-02-06 12:27:23 +03:00
pzaremba
8205fff0fa reverting 2014-02-06 10:08:18 +01:00
Qiang Xue
076c7cd38c Fixes #2310 2014-02-05 22:45:52 -05:00
Qiang Xue
fb4b0ae98d The scripts in asset bundles are now registered in View at the end of endBody(). It was done in endPage() previously 2014-02-05 22:45:26 -05:00
Qiang Xue
73dff0146c doc improvement [skip ci] 2014-02-05 21:33:32 -05:00
Qiang Xue
e70817e887 Fixes #2336. 2014-02-05 21:18:53 -05:00
Qiang Xue
0994615851 removed duplicated query parameters. 2014-02-05 21:08:13 -05:00
Qiang Xue
13b7c8e866 refactored Pjax. Added title change support. [skip ci] 2014-02-05 20:49:38 -05:00
Qiang Xue
a872d60503 Fixes #2335. 2014-02-05 16:08:39 -05:00
Qiang Xue
2698717b2a Merge pull request #2320 from schmunk42/feature/toolbar-ui 
toolbar UI updates
 2014-02-05 16:01:46 -05:00
Alexander Makarov
0e8063302d Removed unused variable 2014-02-06 00:48:48 +04:00
Alexander Makarov
eb3c6866dd Removed unused variable 2014-02-06 00:46:50 +04:00
Alexander Makarov
a78ff145b8 Removed unused variable 2014-02-06 00:44:53 +04:00
Alexander Makarov
f226ee5610 password_reset_token is now null when reset 2014-02-06 00:22:01 +04:00
Alexander Makarov
d13ed43212 Fixed signup/restore password flow 2014-02-06 00:14:23 +04:00
Alexander Makarov
9da28421ee Use fileTransport for email in debug mode by default 2014-02-06 00:14:01 +04:00
Qiang Xue
2dc341f893 not sending csrf header in ajax response. 2014-02-05 14:29:29 -05:00
Alexander Makarov
6cac7c61e5 Removed Yii::$app->getParam usage 2014-02-05 23:21:57 +04:00
Alexander Makarov
97917e6580 Revert "Added yii\base\Module::getParam($name, $defaultValue = null) to conveniently work with application parameters" 
This reverts commit 3b95aa9cd1.
 2014-02-05 23:18:36 +04:00
Alexander Makarov
9c0572bff9 Fixed $model->load($data) returned true if $data and formName were empty 2014-02-05 22:08:47 +04:00
Alexander Makarov
6a39cc654b Removed password_reset_token field size to be enough for timestamp 2014-02-05 21:58:12 +04:00
Florian Fackler
ac2434a004 Updated elasiticsearch changelog 2014-02-05 17:38:38 +01:00
Antonio Ramirez
333630ae3a fix formatting 2014-02-05 17:35:30 +01:00
Antonio Ramirez
b659d8736c fix formatting 2014-02-05 17:33:18 +01:00
Antonio Ramirez
b98d116ae0 refactored to add function on gii.js 2014-02-05 17:30:03 +01:00
Alexander Makarov
e51eae1951 Changelog for #2327 2014-02-05 20:29:06 +04:00
Alexander Makarov
04d8ed3176 Merge pull request #2327 from thiagotalma/master 
Improvements in exhibition of the changed files in Gii.
 2014-02-05 19:26:11 +03:00
Thiago Talma
7ddb6e8d6e Spaces added 2014-02-05 14:20:22 -02:00
Antonio Ramirez
65c740e91f remove tabs for spaces in js 2014-02-05 17:06:37 +01:00
Antonio Ramirez
5e9d3a8f80 fix js formatting 2014-02-05 17:03:19 +01:00
Antonio Ramirez
ca7723e871 update CHANGELOG.md to its correspondent location 2014-02-05 16:48:36 +01:00
Tobias Munk
bbb0a22246 fixed home icon display 2014-02-05 16:21:47 +01:00
Tobias Munk
646ed1515a readded phpinfo links and separator, now opens in a new tab 2014-02-05 16:21:18 +01:00
pzaremba
6c8ebc82b3 Ignoring composer.lock in all subdirectories 2014-02-05 15:48:15 +01:00
pzaremba
ff824d905f fixing the file name to be adjusted in "getting started" 2014-02-05 15:40:27 +01:00
Alexander Makarov
b8235c717d Added password reset token expiration 2014-02-05 18:23:59 +04:00
Alexander Makarov
3b95aa9cd1 Added yii\base\Module::getParam($name, $defaultValue = null) to conveniently work with application parameters 2014-02-05 18:20:21 +04:00
Alexander Makarov
3e347d0efe Merge pull request #2244 from yiisoft/advanced-application-forms 
Moved most of the user-related logic into form models
 2014-02-05 16:45:30 +03:00
Alexander Makarov
a1497ca01c Removed extra \models\forms namespace, moved all models to just \models 2014-02-05 17:41:47 +04:00
Antonio Ramirez
dc53a2b1e3 update CHANGELOG.md 2014-02-05 14:39:54 +01:00
Antonio Ramirez
8135e1adf9 update typeahead plugin initialization js code 2014-02-05 14:38:22 +01:00
Antonio Ramirez
0960664f26 update typeahead.js to latest version 2014-02-05 14:36:09 +01:00