Commit Graph

388 Commits

Author SHA1 Message Date
Thomas Schreiber a9df6ad390 convert to unix filetype
Conflicts:
	django_select2/widgets.py
2014-09-11 22:58:02 +02:00
Thomas Schreiber a563c62d33 Add django_select2 to the global space.
When javascript output is wrapped django_select2 can not be found,
adding it to the window instead of a var fixes this:
https://django-pipeline.readthedocs.org/en/latest/configuration.html#wrapped-javascript-output
2014-09-11 22:55:04 +02:00
AppleGrew 0456982d22 Merge pull request #117 from bogdal/master
Make static files visible for the collectstatic
2014-07-17 14:46:20 +05:30
Adam Bogdal f9992c934f Don't build package as an egg 2014-07-16 22:00:06 +02:00
AppleGrew 4f8fbb5f93 Merge pull request #115 from fjcapdevila/master
Fix typos
2014-06-12 08:55:04 +05:30
fjcapdevila fd87d86344 typo 2014-06-11 12:34:43 -03:00
fjcapdevila c7561ecde1 Typo 2014-06-11 12:25:21 -03:00
fjcapdevila 73d9e6cb90 Typo 2014-06-11 12:16:48 -03:00
AppleGrew 3f968c1532 Merge pull request #114 from fjcapdevila/master
Minor changes in doc-strings
2014-06-11 02:16:34 +05:30
fjcapdevila 3b8ba099a3 Minor format typo 2014-06-10 12:43:59 -03:00
fjcapdevila 5004b79c85 Typo
Little type
2014-06-10 12:23:24 -03:00
AppleGrew 40b2b9dbfc Merge pull request #113 from fjcapdevila/master
Fix another typos
2014-06-10 11:00:12 +05:30
fjcapdevila d8a62ddb5e Merge pull request #2 from fjcapdevila/fix_another_typos
Fix another typos
2014-06-09 18:22:13 -03:00
fjcapdevila 4edeff61af Fix another typo
FIx another typo in a doc-string
2014-06-09 18:15:31 -03:00
AppleGrew 89c4f07643 Merge pull request #111 from jdotjdot/master
added '.distinct()' to result query on ModelJsonMixin
2014-06-10 02:28:52 +05:30
AppleGrew 42201cdc76 Merge pull request #112 from fjcapdevila/master
Fix typo
2014-06-10 02:28:04 +05:30
fjcapdevila f354e54f91 Fix typo
Fix typo in a doc-string
2014-06-09 17:55:55 -03:00
fjcapdevila 2643ca41b8 Merge pull request #1 from fjcapdevila/fix_typo
Fix typo
2014-06-09 17:36:12 -03:00
fjcapdevila 26f9deaf90 Fix typo
Fix typo in a doc-string.
2014-06-09 17:33:43 -03:00
JJ d27f04dec4 added '.distinct()' to result query on ModelJsonMixin to prevent duplicates 2014-06-09 16:00:41 -04:00
AppleGrew c7c736d4a8 Merge pull request #110 from bhaskar8088/master
Updated select2.js with latest version 3.4.2 to 3.4.8:
2014-06-10 00:35:49 +05:30
Bhaskar 6d1746cd21 Updated select2.js with latest version 3.4.2 to 3.4.8:
- When any of the duplicated options are selected, the values are not being cleared(in 3.4.2) after removing them, working in 3.4.8
2014-06-09 23:33:18 +05:30
AppleGrew 878520e56d Merge pull request #104 from johnraz/patch-1
Documentation improvement.
2014-04-24 15:48:02 +05:30
Jonathan Liuti 7721d6aeb5 Documentation improvement.
I have just been bitten by this.

While it's really related to select2, due to the fact that django-select2 adds his bits of abstraction on top of select2, I wasted quite some time making sure nothing was wrong with django-select2 in the first place...

Hope it can help others, or help me if I happen to forget about it ;)
2014-04-24 11:24:31 +02:00
AppleGrew e1186229eb Merge pull request #101 from bobisme/patch-1
Fix 1.4, 1.5 support in render_texts_for_value
2014-04-08 22:50:55 +05:30
Bob 21e80ac2d6 Fix 1.4, 1.5 support in render_texts_for_value
Django 1.6 introduces field.empty_values.  This makes it compatible.
2014-04-08 12:49:27 -04:00
AppleGrew 35b82dd55b Merge pull request #91 from vinograd19/patch-1
typo
2014-01-10 11:02:56 -08:00
Pavel 400b5bde39 typo 2014-01-10 21:53:59 +03:00
AppleGrew d11c127747 Merge pull request #76 from crccheck/fix-typos
Fix typos in the documentation
2013-11-19 19:52:07 -08:00
AppleGrew a5c383a979 Merge pull request #75 from apalazon/master
Fix issue #74: Change MULTISEPARATOR value from String.fromCharCode(0) t...
2013-11-19 19:40:11 -08:00
crccheck 3d800e6868 update capitalization of proper nouns
I usually spell ajax as AJAX, but after doing some reasearch, it seems
like Ajax is more commonly used.
2013-11-19 19:09:19 -06:00
crccheck 66a0ebfe99 fix random typos found while reading the project 2013-11-19 19:00:58 -06:00
apalazon 3f13e0cab4 Fix issue #74: Regen heavy_data.min.js 2013-11-19 19:25:56 +01:00
apalazon c4fe791508 Fix issue #74: Change MULTISEPARATOR value from String.fromCharCode(0) to String.fromCharCode(31) to solve a problem with Internet Explorer 2013-11-19 19:03:43 +01:00
AppleGrew d00ba18db1 Merge pull request #72 from 7wonders/master
Adds bootstrap 3 support to make select2 look a little nicer
2013-11-11 20:02:48 -08:00
7wonders a1d2206260 Added the new minified bootstrap css 2013-11-12 00:14:41 +01:00
AppleGrew (applegrew) 4bfcdc6ef5 Issue 76 testing 2013-11-09 10:00:43 +05:30
7wonders 6322a26e7f Added built in minify script changes so that select2-bootstrap is minified for production 2013-11-08 04:53:35 +01:00
7wonders 3be6962993 Adds bootstrap 3 support to make select2 look a little nicer 2013-11-08 03:34:03 +01:00
AppleGrew (applegrew) 7d66164e65 Bumping to v4.2.2. 2013-11-05 21:28:05 +05:30
AppleGrew 32b49c4cca Merge pull request #69 from apalazon/master
Fixed test case for issue #66 with solution
2013-10-29 03:21:39 -07:00
apalazon 8f81544f83 Restored test.db to old one 2013-10-29 10:45:26 +01:00
apalazon c1de491f53 Restore the code to use GET - again. The example works with GET and POST. 2013-10-29 10:42:40 +01:00
apalazon 9c249ae5e7 Resuelto el problema con la limpiexa de la búsqueda 2013-10-29 10:27:10 +01:00
apalazon e2cc63e69f Fix issue #66 on my own example, implementing get_val_txt(self, value) on my overriden field. 2013-10-29 10:23:26 +01:00
AppleGrew e96a79833e Merge pull request #68 from apalazon/master
Test case for issue #66 AutoSelect2MultipleField does not bind GET value
2013-10-25 00:11:43 -07:00
apalazon 3805f12717 Test case for issue #66 AutoSelect2MultipleField does not bind GET value on page render 2013-10-22 13:53:31 +02:00
AppleGrew 1c67a47ceb Update widgets.py 2013-10-10 01:13:37 +05:30
AppleGrew d01b0d2e87 Merge pull request #64 from emorozov/master
Do not assume that jQuery is bound to $ variable.
2013-10-07 22:38:19 -07:00
Eugene Morozov c939010007 Use fully qualified jQuery name to avoid conflict with other js frameworks. 2013-10-07 22:35:38 +05:30