58 Commits

Author SHA1 Message Date
348dfa78eb Merge pull request #2676 from yiisoft/url-helper
#2630: `yii\heplers\Html::url` moved to new `yii\helpers\Url::create`
2014-03-11 01:36:05 +03:00
5d6c314d4e Adjusted URL helper, fixed usage 2014-03-10 15:25:15 +04:00
edc3d2b11a fixed some urls in guide; moved elasticsearch png file to proper location, to be seen by apidoc generator 2014-03-09 23:28:11 +01:00
92b381795b Adjusted Url helper methods 2014-03-10 01:34:05 +04:00
3400eb5215 #2630: yii\heplers\Html::url moved to new yii\helpers\Url::create 2014-03-09 16:41:55 +04:00
269d1303a9 Code style fixes 2014-03-08 20:47:04 -03:00
1b7e1cd027 Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style
* 'feature' of https://github.com/mongosoft/yii2:
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/models/Context.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/bootstrap/views/index.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/views/index.php
	extensions/apidoc/templates/offline/views/offline.php
	extensions/apidoc/templates/online/views/index.php
	extensions/elasticsearch/Connection.php
	extensions/redis/ActiveQuery.php
	framework/base/ErrorException.php
	framework/helpers/BaseFileHelper.php
	tests/unit/framework/helpers/FileHelperTest.php
2014-03-07 21:54:44 +01:00
1982efbdfe many phpcs fixes 2014-03-05 00:22:55 +02:00
95ea1c20bb code style. FOREACH 2014-03-03 21:47:47 +03:00
a7a1bd8da0 Merge pull request #2578 from schmunk42/feature/update-composer-keywords
replaced keyword "yii" with "yii2" in composer.json files (fixes #2557)
2014-03-03 21:39:41 +03:00
c7e8d8b900 @param, @var, @property and @return must declare types as boolean, integer, string, array or null 2014-03-03 20:50:44 +03:00
8c7eb97175 apidoc style and typo 2014-02-28 18:36:27 +01:00
ebe972f36d fixed links in elasticsearch README 2014-02-28 18:17:28 +01:00
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
5ee50a8454 Merge pull request #2497 from yiisoft/merge-query-and-relation2
WIP merge ActiveRelation into ActiveQuery
2014-02-21 19:00:45 +01:00
505762d49c updated docs about active relation 2014-02-21 18:53:28 +01:00
cb8237c1b7 merged ActiveQueryInterface and ActiveRelatioInterface 2014-02-20 16:15:10 +01:00
098567ce16 fixed phpdoc errors and updated properties 2014-02-20 13:42:30 +01:00
3b40d44909 made createQuery() config param optional 2014-02-20 05:54:47 +01:00
1708a36d95 WIP merge ActiveRelation into ActiveQuery
allow extending only one class to add scopes, fixes #2146

TODO:

- [ ] adjust guide docs
- [ ] adjust README files of extensions
- [ ] finish work and fix test breaks
2014-02-20 05:53:36 +01:00
8af941fb53 added note about usage to AR::instantiate()
fixes #2370
2014-02-10 10:51:16 +01:00
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
16e1aff41b renamed ActiveRecord::create() to populateRecord()
- refactored elasticsearch AR to make type and index available in
  instantiate(), issue #1313

fixes #2281
2014-02-03 14:07:12 +01:00
9fb8843130 Removed unnecessary variable 2014-02-01 01:11:59 +04:00
21ae27b306 updated phpdoc properties 2014-01-28 00:11:18 +01:00
f6dd6fa2e9 Renamed ActiveRecordInterface::createActiveRelation() to createRelation() 2014-01-24 14:46:53 -05:00
48712c71f2 added notes about default limit set by elasticsearch
fixes #1864
2014-01-22 15:11:11 +01:00
7d33a5d3b5 Some Code style fixes 2014-01-19 13:35:36 -03:00
796284cba1 reworked fix for #1993 2014-01-16 11:05:26 +01:00
81d23332df afterFind event in AR is now called after relations have been populated
fixes #1993
2014-01-16 10:28:58 +01:00
da9d544c54 psr-4 change. 2014-01-10 21:06:25 -05:00
41685a2409 moved extensions under yii. 2013-12-09 23:51:49 -05:00
e2b4708bbd added support for updateCounters to elasticsearch
issue #1313
2013-12-09 14:42:28 +01:00
24ebc9fc3d better error reporting for db exceptions 2013-12-05 15:39:34 +01:00
59d6d0be7d elasticsearch phpdoc and command api cleanup 2013-12-05 15:38:35 +01:00
26767735dc Renamed byte methods, moved path methods back to StringHelper 2013-12-04 14:26:47 +01:00
5f2a612c78 Moved file and path related methods from StringHelper to FileHelper, renamed StringHelper byte methods not to be misused as string methods 2013-12-04 09:48:01 +01:00
b68c9f1d40 added image to readme 2013-12-01 22:30:04 +01:00
5a3dba60be created debug panel for elasticsearch
this panel shows all logged elasticsearch queries and allows to execute
them to see the results.
2013-12-01 22:21:22 +01:00
4565df9313 added debug panel for elasticsearch 2013-12-01 14:17:56 +01:00
73442fb12a doc fix. 2013-11-30 15:51:20 -05:00
ff52f28d0a adjusted elasticsearch and redis AR to use BaseAR 2013-11-30 01:30:31 +01:00
a5e3c00d75 replaced inheritdoc tags. 2013-11-29 12:49:07 -05:00
83527e85ca made Model::attributes() non static again
- allows to have dynamic definition of attributes depended on the
  instance
- there was no real need for it to be static. Places that used it static
  have been refactored.

fixes #1318
2013-11-28 01:01:48 +01:00
be583a7a22 fixed problem with sorting by id in elasticsearch
issue #1317
2013-11-27 23:27:47 +01:00
91998d03a7 fixed typo in README 2013-11-26 16:58:20 +01:00
16739ec3f0 Merge pull request #1321 from pmoust/inheritdoc-fix
fixed PhpDoc by swapping to {@inheritdoc}
2013-11-25 18:29:59 -08:00
80de4e6e65 more docs on elasticsearch 2013-11-26 03:27:32 +01:00
2ff8ac3d61 fixed PhpDoc by swapping to {@inheritdoc} 2013-11-26 04:24:20 +02:00
143addab4d improved logging and error handling 2013-11-25 23:59:27 +01:00