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
11 years ago
704f9105f4
fixed typo
11 years ago
75aa665930
Fixes #1222 : refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
11 years ago
400b5310ca
Docs for Sphinx extension updated.
11 years ago
01c269a912
Redundant typecast removed from yii\sphinx\ActiveRecord::create()
11 years ago
c1b5946d40
yii\sphinx\Command reworked to extend yii\db\Command.
...
yii\sphinx\DataReader removed.
11 years ago
433ffb2e48
Merge branch 'master' of github.com:yiisoft/yii2 into sphinx
11 years ago
22439d3378
Merge pull request #1291 from kartik-v/patch-3
...
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
11 years ago
998d0f71fa
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
...
Removed edited author ref.
11 years ago
158db15587
Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
...
Updated tabs
11 years ago
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.
11 years ago
257c4fcb55
Added example for dividers to bootstrap Nav
...
fixes #1284
11 years ago
28131d099c
Merge pull request #1283 from zeeke/master
...
Checkboxlist documentation fix
11 years ago
4941db1eee
Checkboxlist documentation fix
...
"Item" parameter keys are the values of the checkbox list,
while the values are the checkbox labels.
11 years ago
576d4e8dda
Added "Using controller action to render errors"
11 years ago
2e459092f5
Merge pull request #1279 from sergon/patch-7
...
Fix doc
11 years ago
ff92af3f0b
Fix doc
11 years ago
e3784e4532
Merge pull request #1277 from cebe/grid-detail-view-consistency
...
Renamed DetailView attribute "type" to "format"
11 years ago
c7ef701d8a
Renamed DetailView attribute type to format
...
for consistency with GridViews DataColumn where the same property is
also named format
11 years ago
f3ab5d999b
encode email in Formatter
...
avoid XSS with emails in format "Carsten Brandt <mail@cebe.cc>"
11 years ago
248e0cb916
Added default status code setting.
11 years ago
02c0bfcb56
"yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
11 years ago
18af6984fc
Merge branch 'sphinx' of github.com:klimov-paul/yii2 into sphinx
11 years ago
765d47d00d
Sphinx Active Record updated to be compatible with ActiveDataProvider.
11 years ago
1c54089423
Merge pull request #1272 from sergebezborodov/fix-rbac-select
...
fix rbac select statement
11 years ago
1259b0dac6
fix rbac select statement
11 years ago
c26ebed13f
Merge pull request #1250 from kartik-v/patch-1
...
Update Alert.php to display multiple flash messages for the session.
11 years ago
817cbc175a
Comments cleanup.
...
Cleaned up a few comments ... hope its not my OCD again... :-)
11 years ago
b979d3b024
Reverted closeButton
...
Reverted name to ```closeButton``` to be in sync with the bootstrap ```Alert``` widget.
11 years ago
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.
11 years ago
58bac36fbc
better nginx config
11 years ago
dc4e06169e
Merge pull request #1269 from Bethrezen/master
...
Include Schema in new migrations by default
11 years ago
7c7ef6000a
guide about using bootstrap less files
11 years ago
4fcad2b347
Include Schema in new migrations by default
11 years ago
9e1fa1f7a4
Added code example.
11 years ago
423ce83798
adjusted log place.
11 years ago
33f4a142ee
fixes invalid value in controller redirect
...
fixes #1261
11 years ago
5d7807860c
linked the upgrade section to guide articles
11 years ago
e700ca0a97
more on yii basics
11 years ago
bcfb1eaf2e
updated application guide and index
11 years ago
d775814602
restructuring guide index.md and structure
...
worked though all the guide files adjusted structure and
added some missing does
11 years ago
987d9ab5f0
Added assets section to the guide
11 years ago
6c5e8e4031
Fixes #1222 : removed Slider widget from JUI extension since it's not input widget and a wrapper doesn't really add anything
11 years ago
c6ecf4f2de
Fixed public property naming.
11 years ago
fb945866c7
Fixes #1255 : typecast empty string to null for non-string DB columns.
11 years ago
c5e8aabe05
Fixes #1245 : LinkPager now renders disabled links as spans preventing these to be clickable
11 years ago
900100c29e
Merge pull request #1258 from cebe/self-static
...
Changed usage of self to static to allow extendibility
11 years ago
182dfb39dc
Added warning log when access to gii and debugger is denied due to IP restriction.
11 years ago
a82330b212
reverted duplicated fix for #1244
...
fixes #1244
11 years ago
7fa572460e
Merge branch 'master' of github.com:yiisoft/yii2 into sphinx
11 years ago
Carsten Brandt
Alexander Makarov
Paul Klimov
Kartik Visweswaran
Andrea Panattoni
Sergey Gonimar
Qiang Xue
Serge Bezborodov
bethrezen