683 Commits

Author SHA1 Message Date
8d18d722b2 Merge branch 'stringhelper-truncate' of github.com:Alex-Code/yii2 into Alex-Code-stringhelper-truncate
Conflicts:
	framework/CHANGELOG.md
2014-04-29 18:03:44 +04:00
4fcd5003de Fixes #2906: Added support for using conditional comments for js and css files registered through asset bundles and Html helper 2014-04-26 20:25:48 -04:00
4f9e4e2c78 ensure assetmanager and baseurl to handle relative urls correctly 2014-04-25 04:06:07 +02:00
78a8694eb5 file helper did not preserve relative paths 2014-04-25 04:06:07 +02:00
119f0f0172 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Refactored filter error display for GridView.
  Fixes #3008: Added `Html::errorSummary()`
2014-04-23 03:25:44 +02:00
91965fd391 phpdoc formatting issues 2014-04-23 02:55:17 +02:00
c15aceb094 Refactored filter error display for GridView. 2014-04-22 20:46:23 -04:00
7ca1be3504 Fixes #3008: Added Html::errorSummary() 2014-04-22 19:55:13 -04:00
ca6583a045 Update BaseStringHelper.php 2014-04-22 10:01:03 +01:00
ab218addda Fixes #2563: Theming is not working if the path map of the theme contains ".." or "." in the paths 2014-04-18 15:13:50 -04:00
c7c708d454 Removed unused imports 2014-04-17 15:35:09 +04:00
c1445871f4 Correction of many errors code inspection.
Adjustments code according to the standards.
Adding missing PHPDoc comment.
2014-04-16 19:29:07 -03:00
b1f4d5d4bf allow . in input name 2014-04-11 13:37:31 +02:00
c6e1a2f02f Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2: (79 commits)
  Refactored app bootstrap logic.
  Update authorization.md
  Fixes #3052: Fixed the issue that cache dependency data is not reused when `reusable` is set true
  start debug logging only if debug runs when bootstrap.
  Update finnish translation
  Add ODBC support to yii\db\Connection
  updated error handler and requirement checker links.
  fixed broken API links [skip ci]
  added more doc [skip ci]
  update class map.
  Fixes #2034: Added `ContentNegotiator` to support response format and language negotiation
  renamed attributes to attributeNames in model
  updated phpdoc
  Removed `Application::preload` in favor of `Application::bootstrap`
  Update module-debug.md
  Update model.md
  Fixes
  Update basics.md
  typo fix [skip ci]
  Added `HtmlResponseFormatter` and `JsonResponseFormatter`
  ...
2014-04-10 22:22:36 +02:00
3c400dbca8 fixed file PHPdoc
issue #3026
2014-04-10 22:10:59 +02:00
0b29c9607d fixed broken API links [skip ci] 2014-04-09 22:22:49 -04:00
0e143338d7 Finished refactoring find() . 2014-04-07 16:29:12 -04:00
b7d6f6141a Added isAssociative() and isIndexed() to yii\helpers\ArrayHelper 2014-04-07 16:02:55 -04:00
4bec5fe748 Update BaseStringHelper.php 2014-04-07 09:29:38 +01:00
164459f90a Fixed test break and JSON MIME type. Fixes issue #2978. 2014-04-04 13:54:04 +02:00
50efd32322 Update BaseStringHelper.php
Updated to use mb_* functions
2014-04-01 13:04:16 +01:00
57a948e755 Update BaseStringHelper.php
Length check.
2014-04-01 12:26:26 +01:00
ad039e125a New truncate and truncateWords methods
New truncate and truncateWords methods, https://github.com/yiisoft/yii2/issues/2941
2014-04-01 10:14:43 +01:00
27659d1776 fixed FileHelper private method static call 2014-03-26 17:51:52 +01:00
67dd874e0c renamed console controller optoins param $id to $actionId 2014-03-26 17:51:52 +01:00
0b2aafc780 fixed private / self in helpers
fixes #2886
2014-03-26 16:03:42 +01:00
d774e7f127 fixed recursive call of ArrayHelper::toArray() 2014-03-26 15:13:26 +01:00
b6b7a8f235 removed srand() 2014-03-23 18:47:18 -04:00
94fb8672d1 fixed url helper to not prepend to relative URLs 2014-03-23 21:32:42 +01:00
bf3c75147d reverted breaking PHPdoc codestyle changes
issue #2852
2014-03-23 20:51:09 +01:00
6e8c460273 Fixes #2724: consistent use of absolute and relative routes. 2014-03-22 20:17:31 -04:00
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
ed5007e44b more reference fixes 2014-03-12 12:47:16 +03:00
d5df12039f fixed another reference 2014-03-12 12:45:16 +03:00
3b1d558942 fixed refences 2014-03-12 12:44:18 +03:00
6fff5662df better use @see for See in phpdoc 2014-03-11 05:38:35 +01:00
c94a40e90d added a large amount of missing documentation 2014-03-11 05:38:35 +01:00
252f49b97a doc fixes. 2014-03-10 21:31:06 -04:00
842e7eb573 Added tests, final Url helper adjustments 2014-03-11 02:12:13 +04:00
bddad5280c Combined $schema and $absolute into $schema 2014-03-10 20:29:24 +04:00
577f8a5c50 Added separate schema and absolute parameters 2014-03-10 20:11:06 +04:00
2b842ecc57 Moded URL management methods from controller to Url helper, updated docs 2014-03-10 19:40:32 +04:00
1276970ce5 Made $url default consistent 2014-03-10 17:57:24 +04:00
aeb25c39e1 Further adjustments for Url helper 2014-03-10 17:52:03 +04:00
338bc86e6d Fixed absolute URLs in Url::to 2014-03-10 15:54:25 +04:00
67af6bc84a Fixed inconsistent usage of getters 2014-03-10 15:50:43 +04:00
cb5a889621 Fixed recursion 2014-03-10 15:39:31 +04:00
5d6c314d4e Adjusted URL helper, fixed usage 2014-03-10 15:25:15 +04:00
92b381795b Adjusted Url helper methods 2014-03-10 01:34:05 +04:00
73b7e03ec3 Argument for Url::base is now optional 2014-03-09 19:09:03 +04:00