Commit Graph

4221 Commits

Author SHA1 Message Date
Carsten Brandt
bd589620d8 Merge branch 'master' into elasticsearch
* master: (59 commits)
  Refactored hasMany and hasOne so that they support cross-DBMS relationship.
  removed unused asset.php files
  fixed composer.json autoload pathes
  fixed c&p error
  allow installing yii2-dev and get the Yii.php file in the same place
  updated dev composer.json dependencies
  added composer.json for yii2-dev package
  fixed broken UniqueValidator
  removed call to nonexistsend property
  cleanup redis AR
  refactored Model and redis AR to allow drop of RecordSchema
  refactored redis AR to relect the latest changes
  "yii\swiftmailer\Mailer::createSwiftObject()" simplified.
  fixed empty result in findByPk list
  fixed problem with not closed transaction in deleteAll()
  fixed broken test
  apply changes to db\AR -> redis\AR
  added dependency in db\AR -> redis\AR needs to be refactored later
  redis AR cleanup
  ensure atomicity of operations
  ...

Conflicts:
	tests/unit/data/config.php
2013-11-23 03:02:35 +01:00
Qiang Xue
a07facf434 Refactored hasMany and hasOne so that they support cross-DBMS relationship. 2013-11-22 20:47:39 -05:00
Carsten Brandt
e0fcecf222 implemented base index and data manipulation api 2013-11-23 02:27:00 +01:00
Qiang Xue
a95d54ccb7 Merge pull request #905 from yiisoft/redis
[WIP] Redis ActiveRecord
2013-11-22 17:26:19 -08:00
Carsten Brandt
863f523896 removed unused asset.php files 2013-11-23 02:16:19 +01:00
Carsten Brandt
0d0f1c2b5d fixed composer.json autoload pathes 2013-11-23 01:49:53 +01:00
Carsten Brandt
d8dbe5a4d3 fixed c&p error 2013-11-23 00:31:12 +01:00
Carsten Brandt
999b42555d allow installing yii2-dev and get the Yii.php file in the same place 2013-11-22 22:48:37 +01:00
Carsten Brandt
898bbf3311 updated dev composer.json dependencies
also removed composer plugin and added it to requirements
this way the plugin is recognized by composer. would not work otherwise.

setting the repo type to yii2-extension also allows us to run composer
plugin and let it handle the extensions in this package
2013-11-22 21:28:58 +01:00
Carsten Brandt
29d02d623c added composer.json for yii2-dev package 2013-11-22 20:53:39 +01:00
Carsten Brandt
8341a59717 Merge branch 'master' into elasticsearch
* master: (587 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/composer.json
	tests/unit/data/config.php
2013-11-22 20:19:49 +01:00
Carsten Brandt
ed98df5cd8 fixed broken UniqueValidator 2013-11-22 19:20:46 +01:00
Carsten Brandt
6995e8ddd0 removed call to nonexistsend property 2013-11-22 19:02:27 +01:00
Carsten Brandt
4459cb4f2b cleanup redis AR 2013-11-22 19:01:33 +01:00
Carsten Brandt
cb4504a10f refactored Model and redis AR to allow drop of RecordSchema 2013-11-22 18:44:22 +01:00
Carsten Brandt
8542448f20 refactored redis AR to relect the latest changes
- make use of traits
- short array
- better implementation of query findByPk
2013-11-22 17:29:05 +01:00
Paul Klimov
b20e57688a "yii\swiftmailer\Mailer::createSwiftObject()" simplified. 2013-11-22 16:46:31 +02:00
Carsten Brandt
bc4324c041 Merge branch 'master' into redis
* master: (613 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
	tests/unit/data/config.php
2013-11-22 15:04:08 +01:00
Alexander Makarov
704f9105f4 fixed typo 2013-11-22 16:19:51 +04:00
Alexander Makarov
75aa665930 Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput 2013-11-22 16:08:24 +04:00
Paul Klimov
400b5310ca Docs for Sphinx extension updated. 2013-11-22 14:06:32 +02:00
Paul Klimov
01c269a912 Redundant typecast removed from yii\sphinx\ActiveRecord::create() 2013-11-22 13:37:43 +02:00
Paul Klimov
c1b5946d40 yii\sphinx\Command reworked to extend yii\db\Command.
yii\sphinx\DataReader removed.
2013-11-22 13:26:42 +02:00
Paul Klimov
433ffb2e48 Merge branch 'master' of github.com:yiisoft/yii2 into sphinx 2013-11-22 13:02:06 +02:00
Alexander Makarov
22439d3378 Merge pull request #1291 from kartik-v/patch-3
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
2013-11-22 02:39:43 -08:00
Kartik Visweswaran
998d0f71fa Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Removed edited author ref.
2013-11-22 16:06:27 +05:30
Kartik Visweswaran
158db15587 Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Updated tabs
2013-11-22 16:03:27 +05:30
Kartik Visweswaran
1c2c7ca250 Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
Corrected the example and doc to highlight allowed dropdown support in Bootstrap 3.
2013-11-22 15:35:25 +05:30
Carsten Brandt
257c4fcb55 Added example for dividers to bootstrap Nav
fixes #1284
2013-11-22 00:38:07 +01:00
Carsten Brandt
28131d099c Merge pull request #1283 from zeeke/master
Checkboxlist documentation fix
2013-11-21 13:58:12 -08:00
Andrea Panattoni
4941db1eee Checkboxlist documentation fix
"Item" parameter keys are the values of the checkbox list,
while the values are the checkbox labels.
2013-11-21 22:37:03 +01:00
Alexander Makarov
576d4e8dda Added "Using controller action to render errors" 2013-11-22 00:13:12 +04:00
Paul Klimov
2e459092f5 Merge pull request #1279 from sergon/patch-7
Fix doc
2013-11-21 06:44:32 -08:00
Sergey Gonimar
ff92af3f0b Fix doc 2013-11-21 19:43:10 +05:00
Qiang Xue
e3784e4532 Merge pull request #1277 from cebe/grid-detail-view-consistency
Renamed DetailView attribute "type" to "format"
2013-11-21 06:30:46 -08:00
Carsten Brandt
c7ef701d8a Renamed DetailView attribute type to format
for consistency with GridViews DataColumn where the same property is
also named format
2013-11-21 15:18:06 +01:00
Carsten Brandt
f3ab5d999b encode email in Formatter
avoid XSS with emails in format  "Carsten Brandt <mail@cebe.cc>"
2013-11-21 14:45:27 +01:00
Qiang Xue
248e0cb916 Added default status code setting. 2013-11-21 08:41:04 -05:00
Paul Klimov
02c0bfcb56 "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins. 2013-11-21 14:46:04 +02:00
Paul Klimov
18af6984fc Merge branch 'sphinx' of github.com:klimov-paul/yii2 into sphinx 2013-11-21 13:43:11 +02:00
Paul Klimov
765d47d00d Sphinx Active Record updated to be compatible with ActiveDataProvider. 2013-11-21 13:41:35 +02:00
Carsten Brandt
1c54089423 Merge pull request #1272 from sergebezborodov/fix-rbac-select
fix rbac select statement
2013-11-21 03:01:52 -08:00
Serge Bezborodov
1259b0dac6 fix rbac select statement 2013-11-21 12:53:00 +02:00
Alexander Makarov
c26ebed13f Merge pull request #1250 from kartik-v/patch-1
Update Alert.php to display multiple flash messages for the session.
2013-11-21 02:20:44 -08:00
Kartik Visweswaran
817cbc175a Comments cleanup.
Cleaned up a few comments ... hope its not my OCD again... :-)
2013-11-21 15:42:52 +05:30
Kartik Visweswaran
b979d3b024 Reverted closeButton
Reverted name to ```closeButton``` to be in sync with the bootstrap ```Alert``` widget.
2013-11-21 15:36:43 +05:30
Kartik Visweswaran
62493188a2 Nomenclature and code realignment.
1. Renamed closeButton to closeButtonOptions. 
2. Generate unique id for each alert box.
3. Moved parent init to the top.
2013-11-21 15:32:07 +05:30
Carsten Brandt
58bac36fbc better nginx config 2013-11-21 10:55:49 +01:00
Carsten Brandt
dc4e06169e Merge pull request #1269 from Bethrezen/master
Include Schema in new migrations by default
2013-11-21 01:02:51 -08:00
Carsten Brandt
7c7ef6000a guide about using bootstrap less files 2013-11-21 10:00:26 +01:00