ソースを参照

Merge pull request #37 from wenzhixin/master

Update my repo
Dennis Hernández 10 年 前
コミット
76db49c398
6 ファイル変更547 行追加383 行削除
  1. 202 0
      CONTRIBUTING.md
  2. 0 374
      CONTRIBUTORS.md
  3. 16 3
      Gruntfile.js
  4. 9 6
      README.md
  5. 319 0
      docs/LICENSE
  6. 1 0
      package.json

+ 202 - 0
CONTRIBUTING.md

@@ -0,0 +1,202 @@
+# Contributing to Bootstrap Table
+
+Looking to contribute something to Bootstrap Table? **Here's how you can help.**
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The [issue tracker](https://github.com/wenzhixin/bootstrap-table/issues) is
+the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
+and [submitting pull requests](#pull-requests), but please respect the following
+restrictions:
+
+* Please **do not** use the issue tracker for personal support requests.  Stack
+  Overflow ([`bootstrap-table`](http://stackoverflow.com/questions/tagged/bootstrap-table) tag is better place to get help.
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+* Please **do not** open issues or pull requests regarding the code in [`bootstrap-table-examples`](https://github.com/wenzhixin/bootstrap-table-examples) and [`extensions plugin dependence`](https://github.com/wenzhixin/bootstrap-table/tree/master/src/extensions) (open them in their respective repositories), the dependence list:
+    * Table Editable: [x-editable](https://github.com/vitalets/x-editable)
+    * Table Export: [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jquery.plugin)
+    * Table Filter: [bootstrap-table-filter](https://github.com/lukaskral/bootstrap-table-filter)
+    * Table flatJSON: [bootstrap-table-flatJSON](https://github.com/djhvscf/bootstrap-table-flatJSON)
+    * Table Reorder: [jquery-ui](https://code.jquery.com/ui/) and [dragTable](https://github.com/akottr/dragtable/)
+    * Table Resizable: [colResizable](https://github.com/alvaro-prieto/colResizable)
+
+## Issues and labels
+
+Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
+
+- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browser's own bug tracker.
+- `confirmed` - Issues that have been confirmed with a reduced test case and identify a bug in Bootstrap Table.
+- `css` - Issues stemming from our compiled CSS or source CSS files.
+- `docs` - Issues for improving or updating our documentation.
+- `extension` - Issues for adding or updating our extension.
+- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified.
+- `grunt` - Issues with our included JavaScript-based Gruntfile, which is used to run all our tests, concatenate and compile source files, and more.
+- `help wanted` - Issues we need or would love help from the community to resolve.
+- `js` - Issues stemming from our compiled or source JavaScript files.
+- `resource` - Issues with helpful resources to improve Bootstrap Table.
+
+For a complete look at our labels, see the [project labels page](https://github.com/wenzhixin/bootstrap-table/labels).
+
+
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful, so thanks!
+
+Guidelines for bug reports:
+
+0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu)
+   and [lint your HTML](https://github.com/twbs/bootlint) to ensure your
+   problem isn't caused by a simple error in your own code.
+
+1. **Use the GitHub issue search** — check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** — try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** — ideally create a live example.
+   [This jsfiddle](http://jsfiddle.net/) is a helpful tools. Consider to use these templates:
+    * [Table from html](http://jsfiddle.net/wenyi/e3nk137y/11/light/)
+    * [Table from data](http://jsfiddle.net/wenyi/e3nk137y/13/light/)
+    * [Table from url](http://jsfiddle.net/wenyi/e3nk137y/14/light/)
+
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What browser(s) and OS
+experience the problem? Do other browsers show the bug differently? What
+would you expect to be the outcome? All these details will help people to fix
+any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+## Pull requests
+
+Good pull requests—patches, improvements, new features—are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the [coding guidelines](#code-guidelines) used throughout the
+project (indentation, accurate comments, etc.) and any other requirements
+(such as test coverage).
+
+**Do not edit files of `dist` directly!** Those files are automatically generated. You should edit the
+source files in [`/src/`](https://github.com/wenzhixin/bootstrap-table/tree/master/src) instead.
+
+Similarly, when contributing to Bootstrap's documentation, you should edit the
+documentation source files in
+[the `/docs/` directory of the `master` branch](https://github.com/wenzhixin/bootstrap-table/tree/master/docs).
+
+Adhering to the following process is the best way to get your work
+included in the project:
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/bootstrap-table.git
+   # Navigate to the newly cloned directory
+   cd bootstrap-table
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/wenzhixin/bootstrap-table.git
+   ```
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout master
+   git pull upstream master
+   ```
+
+3. Create a new topic branch (off the main project development branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream master
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+    with a clear title and description against the `master` branch.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
+license your work under the terms of the [MIT License](LICENSE) (if it
+includes code changes) and under the terms of the
+[Creative Commons Attribution 3.0 Unported License](docs/LICENSE)
+(if it includes documentation changes).
+
+
+## Code guidelines
+
+- Readability
+- Need semicolons
+- 4 spaces (no tabs)
+- strict mode
+- "Attractive"
+
+
+## License
+
+By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
+By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE).

+ 0 - 374
CONTRIBUTORS.md

@@ -1,374 +0,0 @@
-## Contributors
-
-bootstrap-table is due to the excellent work of the following contributors:
-
-<table>
-<tr>
-<th>Author</th>
-<th>Github</th>
-<th>Location</th>
-<th>Blog</th>
-<th>Commits</th>
-</tr>
-
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2117018?v=3" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
-<td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
-<td>Guangzhou, China</td>
-<td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
-<td>608</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/4496763?v=3" width="32" height="32"> <a href="mailto:dennishernandezvargas@gmail.com">Dennis Hernández</a></td>
-<td><a href="https://github.com/djhvscf">djhvscf</a></td>
-<td>Costa Rica</td>
-<td><a href="http://djhvscf.github.io/Blog/">http://djhvscf.github.io/Blog/</a></td>
-<td>29</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2921893?v=3" width="32" height="32"> <a href="mailto:ice50505050@hotmail.com">Kamonwat Sangudsub</a></td>
-<td><a href="https://github.com/ice5050">ice5050</a></td>
-<td>Chiang Mai, Thailand</td>
-<td><a href="http://www.kamonwat.ninja">http://www.kamonwat.ninja</a></td>
-<td>9</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/553292?v=3" width="32" height="32"> D0d0</td>
-<td><a href="https://github.com/D0d0">D0d0</a></td>
-<td></td>
-<td></td>
-<td>7</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2520829?v=3" width="32" height="32"> Timmy72</td>
-<td><a href="https://github.com/Timmy72">Timmy72</a></td>
-<td></td>
-<td></td>
-<td>7</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2130852?v=3" width="32" height="32"> kula1922</td>
-<td><a href="https://github.com/kula1922">kula1922</a></td>
-<td></td>
-<td></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/6866443?v=3" width="32" height="32"> janborup</td>
-<td><a href="https://github.com/janborup">janborup</a></td>
-<td></td>
-<td></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/8710090?v=3" width="32" height="32"> Joseph Reiter</td>
-<td><a href="https://github.com/thx2001r">thx2001r</a></td>
-<td>United States</td>
-<td></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1455662?v=3" width="32" height="32"> arifemre</td>
-<td><a href="https://github.com/arifemre">arifemre</a></td>
-<td></td>
-<td></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5487021?v=3" width="32" height="32"> Julien Bisconti</td>
-<td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
-<td>Belgium</td>
-<td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1874318?v=3" width="32" height="32"> <a href="mailto:tristanlee85@gmail.com">Tristan Lee</a></td>
-<td><a href="https://github.com/tristanlee85">tristanlee85</a></td>
-<td></td>
-<td></td>
-<td>3</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/8644915?v=3" width="32" height="32"> @mcspx</td>
-<td><a href="https://github.com/mcspx">mcspx</a></td>
-<td></td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1476232?v=3" width="32" height="32"> <a href="mailto:mikepenz@gmail.com">Mike Penz</a></td>
-<td><a href="https://github.com/mikepenz">mikepenz</a></td>
-<td>Freistadt</td>
-<td><a href="http://mikepenz.com">http://mikepenz.com</a></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/775601?v=3" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
-<td><a href="https://github.com/Muzical84">Muzical84</a></td>
-<td>Midwest</td>
-<td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/59292?v=3" width="32" height="32"> nikolas</td>
-<td><a href="https://github.com/nikolas">nikolas</a></td>
-<td>New York, NY</td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5313150?v=3" width="32" height="32"> Dunaevsky Maxim</td>
-<td><a href="https://github.com/dunmaksim">dunmaksim</a></td>
-<td>Russia, Lipetsk</td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1710772?v=3" width="32" height="32"> cokert</td>
-<td><a href="https://github.com/cokert">cokert</a></td>
-<td></td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2326627?v=3" width="32" height="32"> burnspirit</td>
-<td><a href="https://github.com/burnspirit">burnspirit</a></td>
-<td></td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2863538?v=3" width="32" height="32"> azamshul</td>
-<td><a href="https://github.com/azamshul">azamshul</a></td>
-<td></td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/9211672?v=3" width="32" height="32"> Bert Hankes</td>
-<td><a href="https://github.com/BertHankes">BertHankes</a></td>
-<td>Utrecht</td>
-<td><a href="http://www.a2hankes.nl">http://www.a2hankes.nl</a></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5970450?v=3" width="32" height="32"> <a href="mailto:davide.renzi@gmail.com">Davide Renzi</a></td>
-<td><a href="https://github.com/didaxRedux">didaxRedux</a></td>
-<td>Rome, IT</td>
-<td><a href="http://www.pantomedia.it">http://www.pantomedia.it</a></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/8870312?v=3" width="32" height="32"> <a href="mailto:duc.pham@enclave.vn">Duc N. PHAM</a></td>
-<td><a href="https://github.com/ducnpham">ducnpham</a></td>
-<td></td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/385731?v=3" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
-<td><a href="https://github.com/wodka">wodka</a></td>
-<td>Vienna</td>
-<td></td>
-<td>2</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/9944172?v=3" width="32" height="32"> <a href="mailto:tidalf@tidalf.fr">Tidalf</a></td>
-<td><a href="https://github.com/TidalfFR">TidalfFR</a></td>
-<td>France</td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1202596?v=3" width="32" height="32"> <a href="mailto:github@sopamo.de">Paul Mohr</a></td>
-<td><a href="https://github.com/Sopamo">Sopamo</a></td>
-<td>Germany</td>
-<td><a href="www.sopamo.de">www.sopamo.de</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1369261?v=3" width="32" height="32"> Tomislav Simić</td>
-<td><a href="https://github.com/petougao">petougao</a></td>
-<td>Serbia, Europe</td>
-<td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/9339703?v=3" width="32" height="32"> JSON-OBJECT</td>
-<td><a href="https://github.com/JSON-OBJECT">JSON-OBJECT</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/3691490?v=3" width="32" height="32"> Peter Dave Hello</td>
-<td><a href="https://github.com/PeterDaveHello">PeterDaveHello</a></td>
-<td>Taiwan ROC</td>
-<td><a href="https://www.peterdavehello.org/">https://www.peterdavehello.org/</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1701102?v=3" width="32" height="32"> egcerqueira</td>
-<td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2017998?v=3" width="32" height="32"> <a href="mailto:jmello@hotmail.com.br">João Mello</a></td>
-<td><a href="https://github.com/multiarts">multiarts</a></td>
-<td>Salvador</td>
-<td><a href="joao.winserv.net.br">joao.winserv.net.br</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/2442098?v=3" width="32" height="32"> ltcszk</td>
-<td><a href="https://github.com/ltcszk">ltcszk</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5148536?v=3" width="32" height="32"> Emin Şen</td>
-<td><a href="https://github.com/emnsen">emnsen</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/4281333?v=3" width="32" height="32"> jmarceli</td>
-<td><a href="https://github.com/jmarceli">jmarceli</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/7952803?v=3" width="32" height="32"> <a href="mailto:git@adtime.at">DominikAngerer</a></td>
-<td><a href="https://github.com/DominikAngerer">DominikAngerer</a></td>
-<td>Austria</td>
-<td><a href="http://www.adtime.at">http://www.adtime.at</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/79682?v=3" width="32" height="32"> l0pez</td>
-<td><a href="https://github.com/l0pez">l0pez</a></td>
-<td>Poland, Poznań</td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/9149445?v=3" width="32" height="32"> gianndall</td>
-<td><a href="https://github.com/gianndall">gianndall</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1460006?v=3" width="32" height="32"> Paul Cothenet</td>
-<td><a href="https://github.com/pcothenet">pcothenet</a></td>
-<td>Mountain View, CA</td>
-<td><a href="http://attackwithnumbers.com">http://attackwithnumbers.com</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1542297?v=3" width="32" height="32"> <a href="mailto:mengyou658@163.com">mengyou</a></td>
-<td><a href="https://github.com/mengyou658">mengyou658</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5520402?v=3" width="32" height="32"> rml1997</td>
-<td><a href="https://github.com/rml1997">rml1997</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/3645565?v=3" width="32" height="32"> <a href="mailto:github@coyle.dk">Jan Borup Coyle</a></td>
-<td><a href="https://github.com/JanCoyle">JanCoyle</a></td>
-<td>Odense, Denmark</td>
-<td><a href="http://www.coyle.dk">http://www.coyle.dk</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/10198214?v=3" width="32" height="32"> f0u</td>
-<td><a href="https://github.com/f0u">f0u</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/61626?v=3" width="32" height="32"> <a href="mailto:srcnckr@gmail.com">Sercan Çakır</a></td>
-<td><a href="https://github.com/mayoz">mayoz</a></td>
-<td>Turkey</td>
-<td><a href="http://www.sercancakir.com">http://www.sercancakir.com</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/171167?v=3" width="32" height="32"> Michał Zagdan</td>
-<td><a href="https://github.com/zergu">zergu</a></td>
-<td></td>
-<td><a href="http://code42.pl/">http://code42.pl/</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/128070?v=3" width="32" height="32"> <a href="mailto:smgladkovskiy@gmail.com">Sergey Gladkovskiy</a></td>
-<td><a href="https://github.com/smgladkovskiy">smgladkovskiy</a></td>
-<td>Russia/Moscow</td>
-<td><a href="http://uniglad.ru">http://uniglad.ru</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/3030334?v=3" width="32" height="32"> Him You Ten</td>
-<td><a href="https://github.com/himyouten">himyouten</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/971893?v=3" width="32" height="32"> odannyboy000</td>
-<td><a href="https://github.com/odannyboy000">odannyboy000</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/5407898?v=3" width="32" height="32"> Malik Rizwan</td>
-<td><a href="https://github.com/rams0b">rams0b</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/1829789?v=3" width="32" height="32"> yonjah</td>
-<td><a href="https://github.com/yonjah">yonjah</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/8653173?v=3" width="32" height="32"> Cravid</td>
-<td><a href="https://github.com/Cravid">Cravid</a></td>
-<td></td>
-<td></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/4995734?v=3" width="32" height="32"> <a href="mailto:info@nagygergely.eu">Gergely Nagy</a></td>
-<td><a href="https://github.com/chpdesign">chpdesign</a></td>
-<td>Hungary, Miskolc</td>
-<td><a href="http://nagygergely.eu">http://nagygergely.eu</a></td>
-<td>1</td>
-<tr>
-<tr>
-<td><img src="https://avatars.githubusercontent.com/u/188236?v=3" width="32" height="32"> gnhaku</td>
-<td><a href="https://github.com/gnhaku">gnhaku</a></td>
-<td>Moscow, Russia</td>
-<td><a href="http://gnhaku.me">http://gnhaku.me</a></td>
-<td>1</td>
-<tr>
-
-</table>
-
-Update date: 2015-02-02, created with https://github.com/wenzhixin/github-contributors

+ 16 - 3
Gruntfile.js

@@ -14,13 +14,25 @@ module.exports = function(grunt) {
                 '*/\n',
         // Task configuration.
         clean: ['dist', 'docs/dist'],
+        concat: {
+            basic_target: {
+                src: ['src/<%= pkg.name %>.js', 'src/extensions/**/*.js'],
+                dest: 'dist/<%= pkg.name %>-all.js'
+            },
+            locale_target: {
+                src: ['src/locale/**/*.js'],
+                dest: 'dist/<%= pkg.name %>-locale-all.js'
+            }
+        },
         uglify: {
             options: {
                 banner: '<%= banner %>'
             },
-            my_target: {
+            basic_target: {
                 files: {
-                    'dist/<%= pkg.name %>.min.js': ['src/<%=pkg.name %>.js']
+                    'dist/<%= pkg.name %>.min.js': ['src/<%=pkg.name %>.js'],
+                    'dist/<%= pkg.name %>-all.min.js': ['dist/<%=pkg.name %>-all.js'],
+                    'dist/<%= pkg.name %>-locale-all.min.js': ['dist/<%=pkg.name %>-locale-all.js']
                 }
             },
             locale_target: {
@@ -69,9 +81,10 @@ module.exports = function(grunt) {
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-copy');
 
-    grunt.registerTask('default', ['clean', 'uglify', 'cssmin', 'copy']);
+    grunt.registerTask('default', ['clean', 'concat', 'uglify', 'cssmin', 'copy']);
 };

+ 9 - 6
README.md

@@ -3,16 +3,20 @@
 [![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.png)](https://travis-ci.org/wenzhixin/bootstrap-table) 
 [![GitHub version](https://badge.fury.io/gh/wenzhixin%2Fbootstrap-table.png)](http://badge.fury.io/gh/wenzhixin%2Fbootstrap-table)
 [![Bower version](https://badge.fury.io/bo/bootstrap-table.svg)](http://badge.fury.io/bo/bootstrap-table)
-[![Gratipay](https://img.shields.io/gratipay/wenzhixin.svg)](https://gratipay.com/wenzhixin/)
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZDHP676FQDUT6)
 
-An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.
+An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
 
-To get started, check out http://bootstrap-table.wenzhixin.net.cn!
+To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples) and [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed)!
 
-More examples: https://github.com/wenzhixin/bootstrap-table-examples
 
-Resource issues: https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed
+**List of donators**
+
+* Richard C Jordan - $35
+* Janet Moery - $5
+* Rene Halskov - $10
+* Angel Arambula Garcia - $5
+* David Graham - $5
 
 ## LICENSE
 
@@ -86,4 +90,3 @@ grunt build
 ```
 
 Result will appear in `dist` directory.
-

+ 319 - 0
docs/LICENSE

@@ -0,0 +1,319 @@
+Creative Commons Legal Code
+
+Attribution 3.0 Unported
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined above) for the purposes of this
+    License.
+ c. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ d. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ e. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ f. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ g. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ h. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ i. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor waives the
+        exclusive right to collect such royalties for any exercise by You
+        of the rights granted under this License; and,
+   iii. Voluntary License Schemes. The Licensor waives the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(b), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(b), as requested.
+ b. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
+    a credit identifying the use of the Work in the Adaptation (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by
+    this Section 4 (b) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at
+    a minimum such credit will appear, if a credit for all contributing
+    authors of the Adaptation or Collection appears, then as part of these
+    credits and in a manner at least as prominent as the credits for the
+    other contributing authors. For the avoidance of doubt, You may only
+    use the credit required by this Section for the purpose of attribution
+    in the manner set out above and, by exercising Your rights under this
+    License, You may not implicitly or explicitly assert or imply any
+    connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
+    use of the Work, without the separate, express prior written
+    permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ c. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+
+
+Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of this License.
+
+    Creative Commons may be contacted at http://creativecommons.org/.

+ 1 - 0
package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "grunt-contrib-copy": "^0.8.0",
+    "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-cssmin": "^0.12.2",
     "grunt-contrib-uglify": "^0.8.0",