Commit Graph

3647 Commits

Author SHA1 Message Date
Alexander Makarov
615dbd9802 used strcmp instead of complex comparison, code formatting 2013-06-12 22:24:26 +04:00
Alexander Makarov
c902d50424 fixes #2554 2013-06-12 14:57:10 +04:00
Alexander Makarov
35474c1def Merge pull request #2551 from creocoder/cwebuser-login-ajax-correct-logic
[READY] Correct CWebUser::loginRequired() ajax logic
2013-06-09 13:49:53 -07:00
Alexander Kochetov
2576534b2a CHANGELOG 2013-06-10 00:47:54 +04:00
Alexander Kochetov
3a487d410d Correct CWebUser::loginRequired() ajax logic 2013-06-09 23:19:45 +04:00
softark
1eea9e2e43 messages/ja/zii.php updated 2013-06-08 22:21:57 +09:00
resurtm
c15128b5fd Better #1990 fix. 2013-06-08 02:07:48 +06:00
resurtm
6e632c74b4 Fixes #1990. Wrong week number returned by CDateFormatter::formatWeekInMonth(). 2013-06-08 01:38:44 +06:00
resurtm
40f16aa787 Fixes #1732. Fixed bug related to JS console object in MSIE 8 and 9. 2013-06-06 21:11:59 +06:00
resurtm
050af02cdd Change log adjusted. is_string replaced by is_callable. 2013-06-06 20:10:49 +06:00
resurtm
6aec98a6f0 Merge branch 'master' of github.com:yiisoft/yii into 1391-cdetailview-value-closure
Conflicts:
	framework/zii/widgets/CDetailView.php
2013-06-06 20:07:07 +06:00
Maurizio Domba (mdwork)
60b7f2824e Fixes #2516 CGridView problem with customtemplates 2013-06-05 13:49:49 +02:00
Alexander Makarov
dea0487f81 There was unnecessary echo in CRUD views generated by Gii 2013-06-04 23:56:56 +04:00
Alexander Kochetov
ab4d0ed83d BELONGS_TO through eager loading fix 2013-06-04 04:36:43 +04:00
Alexander Makarov
26ee9e0285 fixes #2531: Upgraded jquery masked input to 1.3.1 2013-06-04 00:35:53 +04:00
Jani Mikkonen
b91e84f383 Localized views 2013-06-03 15:22:04 +03:00
Jani Mikkonen
94e950c63f Update finnish translation 2013-06-03 14:10:47 +03:00
Carsten Brandt
426209eb8a Merge branch 'belongs-to-through' of https://github.com/creocoder/yii into creocoder-belongs-to-through
* 'belongs-to-through' of https://github.com/creocoder/yii:
  CHANGELOG
  BELONGS_TO through
2013-06-03 07:47:48 +02:00
Alexander Kochetov
9f6162f3a9 BELONGS_TO through 2013-06-02 20:06:59 +04:00
Carsten Brandt
da290bad73 Merge PR #2514 branch '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii
* '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii:
  Issue #2508 has been added to CHANGELOG.
  "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified.

Conflicts:
	CHANGELOG
2013-06-01 21:55:52 +02:00
resurtm
583355d067 CS fixes. 2013-06-02 00:07:23 +06:00
resurtm
1be4536fd8 COciSchema::checkIntegrity(): better name quoting. 2013-06-01 23:48:30 +06:00
resurtm
e927a28fff COciSchema::checkIntegrity(): proper default value behavior. 2013-06-01 23:44:31 +06:00
resurtm
69ff293e68 Fixes #315: integrity check for Oracle RDBMS can now be toggled. 2013-06-01 23:21:00 +06:00
resurtm
b7a1d14d3b Merge branch 'master' of github.com:yiisoft/yii 2013-05-31 21:39:13 +06:00
resurtm
5e0bcd5081 Fixes #1065 and #1685: CJuiSliderInput supports max value when using without model. 2013-05-31 21:38:01 +06:00
resurtm
e258247330 Fixed incorrect HTTPS detection. 2013-05-31 09:41:35 +06:00
resurtm
0b41782f03 Fixes #2241: resetSequence() inconsistency. 2013-05-30 21:38:51 +06:00
resurtm
7b72148d43 Fixes #1725: CFileHelper::removeDirectory() has been added. 2013-05-30 20:01:25 +06:00
resurtm
78d2ab67a2 CDateFormatter proper Unicode datetime formats link. 2013-05-30 16:27:50 +06:00
buakos
280b98396b Changes for #2516 2013-05-29 17:07:43 +02:00
softark
de7c6eda11 framework/messages/ja/yii.php updated 2013-05-29 19:50:47 +09:00
Paul Klimov
e9e929aa09 "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified. 2013-05-29 12:40:46 +03:00
resurtm
975a368429 Fixes #1924: CLogFilter::$dumper added. 2013-05-29 14:46:33 +06:00
resurtm
0bb122f92d Merge pull request #2444 from resurtm/fixes-2435-CFileCache-enhancements
Fixes #2435: CFileCache entry expiration time could now be embedded into the cache file.
2013-05-28 09:45:05 -07:00
resurtm
c1161ad73e Merge branch 'master' of github.com:yiisoft/yii into fixes-2336
Conflicts:
	CHANGELOG
	tests/framework/db/ar/CActiveRecord2Test.php
2013-05-28 21:06:37 +06:00
resurtm
60c9057963 PHPDoc fixes and better $embedExpiry property naming. 2013-05-28 20:01:52 +06:00
resurtm
3fa125ce3c Merge branch 'master' of github.com:yiisoft/yii into fixes-2435-CFileCache-enhancements
Conflicts:
	CHANGELOG
2013-05-28 19:44:29 +06:00
lubosdz
f04c42b6f4 [SK] Updated locales 2013-05-28 09:49:31 +02:00
Carsten Brandt
6d95f32388 Merge pull request #2506 from ThePepster/master
Update doc block for getRelated method in CActiveRecord class.
[ci skip]
2013-05-27 14:16:17 -07:00
ThePepster
3bac41e6c3 Update doc block for getRelated method in CActiveRecord class. 2013-05-27 13:23:36 -06:00
ThePepster
71f1eb132d Update doc block for getRelated method in CActiveRecord class. 2013-05-27 13:15:27 -06:00
nsanden
03209eb23c Merge branch 'master' of git://github.com/yiisoft/yii into 2448-CHtml-ajax-doc-fix 2013-05-27 11:25:44 -07:00
nsanden
7a22710e17 CHtml ajax doc fix 2013-05-27 11:24:49 -07:00
resurtm
869901d5ec Merge branch 'master' of github.com:yiisoft/yii 2013-05-27 23:45:28 +06:00
resurtm
27899cc320 Fixes #1916: CMssqlSchema::findColumns() issues an "invalid object name" error. 2013-05-27 23:44:44 +06:00
Alexander Makarov
072a1745ab Merge branch 'master' of github.com:lubosdz/yii into lubosdz-master
Conflicts:
	CHANGELOG
2013-05-27 21:32:41 +04:00
Alexander Makarov
62eca227bf Fixes #2461: Upgraded jquery star rating to 4.11 2013-05-27 18:37:00 +04:00
Alexander Makarov
5606bd18d7 Merge branch 'origin/master' 2013-05-27 15:07:33 +04:00
Alexander Makarov
8feff3b27e Updated Russian docs and messages 2013-05-27 15:06:47 +04:00