Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated version to 2.0.0, contribution policy and changed license to …

…BSD.

Most of the code is BSD, anyway.
  • Loading branch information...
commit 3aa61aecae100e5fa29cda64d255ff4523b8e50c 1 parent 2bd36bf
@hijarian hijarian authored
View
13 CONTRIBUTING.md
@@ -1,6 +1,9 @@
# How to contribute to this repository
-All current work on the YiiBooster happens in the branches which are named like `N.N.N-wip`, where `N`s are numbers. So, you should not normally contribute to master branch, but only to current `*-wip` branch instead.
+All ongoing work is happening in `master` branch, as usual. All PRs should go there.
+
+**NOTE THAT PREVIOUSLY THERE WAS `-wip` BRANCHES**, but they're no more.
+Contribute everything to master, as usual.
Common work process is as follows:
@@ -11,16 +14,16 @@ Common work process is as follows:
`git remote add ct git://github.com/clevertech/YiiBooster.git`
Note that I named new remote as `ct` in this example. Remember it.
-3. **Pull latest `\*-wip` branch from Clevertech's repo**.
+3. **Pull latest `master` branch from Clevertech's repo**.
`git pull ct`
When you run just `git pull` you pull from the `origin` remote.
This way you explicitly requires Git to pull from Clevertech's repository.
4. **Make a new branch** named after the feature you're fixing/adding.
`git checkout -b myfeature`
- Step 3 ensures you that you're branching from most latest `*-wip`, this will save you a lot of pain when you'll be pull-requesting.
+ Step 3 ensures you that you're branching from most latest `master`, this will save you a lot of pain when you'll be pull-requesting.
-5. **Commit everything to this branch** and not to master.
+5. **Commit everything to this feature branch** and not to master.
Easiest way is to run `git branch` before commit and look if the asterisk is before the name of your desired branch.
6. After you've done with the feature under question, **open the `CHANGELOG.md` and append the line to it in the following format:**
@@ -35,7 +38,7 @@ Common work process is as follows:
`git push origin myfeature`
Note that you use the remote named `origin` here. It points to _your_ _fork_ of the YiiBooster.
-8. After this, go to [clevertech/YiiBooster](https://github.com/clevertech/YiiBooster), hit **"Pull Request"** and choose your branch at your fork as a source and desired `*-wip` branch as a receiver of pull request.
+8. After this, go to [clevertech/YiiBooster](https://github.com/clevertech/YiiBooster), hit **"Pull Request"** and choose your branch at your fork as a source and `master` branch as a receiver of pull request.
Please, do not forget to reference the original issue as '#'+issue-number in the description of your pull request. It's _very_ important, it'll help admins to quickly find what issues can be closed with this pull request.
View
13 LICENSE
@@ -1,9 +1,10 @@
-The MIT License (MIT)
+Copyright (c) 2013, Clevertech.
+All rights reserved.
-Copyright (c) 2012 Clevertech
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
39 README.md
@@ -1,4 +1,4 @@
-YiiBooster v1.1.0
+YiiBooster v2.0.0
==========
YiiBooster is a widget toolkit for [Yii web framework](http://www.yiiframework.com).
@@ -13,18 +13,22 @@ YiiBooster is an end result of this effort.
## Widgets at a glance
Overall, the following is included in YiiBooster:
-* All of most current [Twitter Bootstrap][twitter-bootstrap] goodness we were able to integrate with.
-* [FontAwesome icons pack](http://fortawesome.github.io/Font-Awesome/) for Twitter Bootstrap.
-* [jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) widget for fancy file uploads.
-* [jQueryUI/Bootstrap](http://addyosmani.github.io/jquery-ui-bootstrap/) integration.
-* [Select2](http://ivaynberg.github.io/select2/) widget for fancy selectors.
-* [X-Editable](http://vitalets.github.io/x-editable/) plugin for in-place editing of table cells values.
-* Absolutely crazy custom grid views called [TbExtendedGridView](http://yii-booster.clevertech.biz/extended-grid.html)
-and [TbJsonGridView](http://yii-booster.clevertech.biz/json-grid.html), packed with features to the brim.
-* *Four* different WYSIWYG editors for you to choose: [wysihtml5](https://github.com/xing/wysihtml5) [with Bootstrap integration](https://github.com/jhollingworth/bootstrap-wysihtml5),
-[jQuery Markdown](https://github.com/arhpreston/jquery-markdown), [CKEditor](http://ckeditor.com/) and [Redactor](http://imperavi.com/redactor/).
-And don't be afraid to use Redactor, because Yii community bought an ORM license for it.
-* And several other little and not-so-little widgets for you to use.
+* All of most current [Twitter Bootstrap][twitter-bootstrap] goodness we were able to integrate with.
+* [FontAwesome icons pack](http://fortawesome.github.io/Font-Awesome/) for Twitter Bootstrap.
+* [jQuery File Upload](https://github.com/blueimp/jQuery-File-Upload) widget for fancy file uploads.
+* [jQueryUI/Bootstrap](http://addyosmani.github.io/jquery-ui-bootstrap/) integration.
+* [Select2](http://ivaynberg.github.io/select2/) widget for fancy selectors.
+* [X-Editable](http://vitalets.github.io/x-editable/) plugin for in-place editing of table cells values.
+* Absolutely crazy custom grid views called [TbExtendedGridView](http://yii-booster.clevertech.biz/extended-grid.html) and [TbJsonGridView](http://yii-booster.clevertech.biz/json-grid.html), packed with features to the brim.
+* *Four* different WYSIWYG editors for you to choose:
+
+ * [wysihtml5](https://github.com/xing/wysihtml5) [with Bootstrap integration](https://github.com/jhollingworth/bootstrap-wysihtml5),
+ * [jQuery Markdown](https://github.com/arhpreston/jquery-markdown),
+ * [CKEditor](http://ckeditor.com/) and
+ * [Redactor](http://imperavi.com/redactor/).
+
+ And don't be afraid to use Redactor, because Yii community bought an ORM license for it.
+* And several other little and not-so-little widgets for you to use.
## Quick Start
@@ -38,14 +42,14 @@ After that, consult the [YiiBooster documentation website][booster-docs] or the
Check out [YiiBooster documentation website][booster-docs].
## Contributing
-Please submit all pull requests against `*-wip` branches.
-All details are explained in the [wiki page describing how to properly contribute to this repository](https://github.com/clevertech/YiiBooster/wiki/How-to-contribute-to-this-repository)
+Long story short: make pull requests from separate branches dedicated for individual features to `master`.
+Please see the [wiki page about how to contribute to YiiBooster](https://github.com/clevertech/YiiBooster/wiki/How-to-contribute-to-this-repository) for details.
## Bug tracker
-If you find any bugs, please create an issue at [issue tracker for project Github repository](https://github.com/clevertech/YiiBooster/issues).
+If you find any bugs, please create an issue at [issue tracker for project Github repository][booster-issues].
## License
-This work is licensed under a MIT license. Full text is included in the `LICENSE` file in the root of codebase.
+This work as a whole is licensed under a BSD license. Full text is included in the `LICENSE` file in the root of codebase.
[![Clevertech](http://clevertech.biz/images/slir/w54-h36-c54:36/images/site/index/home/clevertech-logo.png)](http://www.clevertech.biz)
@@ -55,3 +59,4 @@ Well-built beautifully designed web applications.
[twitter-bootstrap]: http://twitter.github.com/bootstrap/
[booster-docs]: http://yii-booster.clevertech.biz/
+[booster-issues]: https://github.com/clevertech/YiiBooster/issues
View
2  build.properties
@@ -15,5 +15,5 @@ path.reports=./reports
# Current version under which project will be distributed.
# Versioning is being made according to Semantic Versioning specification at http://semver.org/
-project.version=1.1.0
+project.version=2.0.0
View
2  src/components/Bootstrap.php
@@ -418,7 +418,7 @@ private function tryGetInfoForPlugin($name, $key)
*/
public function getVersion()
{
- return '1.1.0';
+ return '2.0.0';
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.