07c28a8a10
Merge pull request #213 from Mozilla-GitHub-Standards/master
...
Add Mozilla Code of Conduct
2019-03-28 08:33:41 -04:00
b22fd24974
Add Mozilla Code of Conduct file
...
Fixes #212 .
_(Message COC002)_
2019-03-27 20:46:40 -07:00
7e6c420c2f
Merge pull request #210 from mythmon/django-18
...
Replace render_to_response with render for better Django 1.8 compatibility.
2016-02-12 15:25:06 -08:00
78611eb479
Don't run Travis with Python 2.7 and Django 1.7 or Django 1.8
2016-02-03 15:04:52 -08:00
8e7ebf3bad
Update Travis config to run with a bigger matrix.
2016-02-03 12:55:48 -08:00
f345c16106
Replace render_to_response with render for better Django 1.8 compatibility.
...
This makes Badger work with new style non-default templating engines. (like django-jinja)
2016-02-03 12:53:12 -08:00
cc52b8336d
Merge pull request #209 from willkg/remove-env
...
Remove env import which wasn't being used
2016-01-11 09:57:15 -05:00
27dc6067d2
Remove env import which wasn't being used
2016-01-11 09:50:41 -05:00
bddc55e283
Merge pull request #205 from martinsam/patch-1
...
Correction for getting_started.rst
2015-03-30 10:49:23 -04:00
a716c42c06
Update getting_started.rst
2015-03-30 16:37:47 +02:00
3e9fded1a5
Merge pull request #204 from rlr/django-17
...
Django 1.7 support
2015-03-18 16:47:18 -04:00
a8ad97abf5
Remove comment about django_nose before south.
2015-03-18 16:04:03 -04:00
9dc1e723ec
Add support for Django 1.7
2015-03-18 15:27:36 -04:00
2cb7b3bd95
Add django 1.6 to tox.ini matrix.
2015-03-18 12:50:48 -04:00
653c32e4dc
Switch to Pillow.
...
`pip install PIL==1.1.7` no worky.
2015-03-18 12:50:34 -04:00
1a41701179
Merge pull request #198 from lmorchard/fix-update-badges-error
...
Fix update_badges misuse of model.save()
2014-02-03 13:20:16 -08:00
fe6e970a0f
Fix update_badges misuse of model.save()
2014-02-03 16:06:03 -05:00
c04372aa76
Merge pull request #190 from l-hedgehog/invalid_assertion
...
issued_on should be "an ISO 8601 Date
2013-11-01 12:47:29 -07:00
cda67c5d61
Merge pull request #191 from willkg/l10n-fix
...
This fixes gettext-ified strings to be unicodes
2013-11-01 07:58:13 -07:00
ff5af989df
This fixes gettext-ified strings to be unicodes
2013-11-01 10:43:51 -04:00
71a7570ef5
issued_on should be "an ISO 8601 date
...
... or a standard 10-digit Unix timestamp." per
https://github.com/mozilla/openbadges/wiki/Assertions#wiki-date-time
2013-11-01 13:54:56 +08:00
da8c540352
Merge pull request #189 from willkg/test-fixes
...
Fix travis and tox config to always use latest django
2013-10-29 17:29:54 -07:00
7464cbe781
Fix travis and tox config to always use latest django
2013-10-29 16:31:00 -04:00
aa2bf37aa2
Add irc notification to travis.yml
2013-09-24 20:47:21 -04:00
dfd3b517ee
Update Django versions in travis.yml
2013-09-24 20:45:38 -04:00
90148a42f1
Tweak versions so they always use latest Django
2013-09-24 20:44:33 -04:00
01d976e235
De-l10nize admin stuff
...
I did this in a fit of stupidity. This fixes that.
2013-09-11 11:09:05 -04:00
a387b0a01f
Merge pull request #184 from willkg/rgba-fix
...
Fix badge image conversion issues
2013-09-11 07:40:08 -07:00
270895fa44
Fix badge image conversion issues
...
This fixes the problem where if you try to create a badge with a PNG
image that has an alpha channel, django-badger takes that alpha channel
out back and shoots it in the face with fire changing it to charcoal
black.
2013-09-11 10:00:23 -04:00
b74fbc3a03
Fix one more except
...
Missed this one, too, in the last pass. This is goofy, but I got them
all this time for realz
2013-08-24 11:26:17 -04:00
1e21bb14d2
Fix one more except
...
Missed this one in the last pass. Oops.
2013-08-24 11:25:02 -04:00
fa3ea14d8e
Fix exception handling
...
This updates exception syntax to the modern one plus fixes some empty
excepts.
2013-08-24 11:24:10 -04:00
26bad15091
A bunch of l10n cleanup
...
I did a few things:
* convert %s to {name} because the latter is easier on localizers and
gives more context regarding what the data is
plus it allows the localizer to change the order of the variables
which is really important in strings that have more than one variable
* add gettext calls around strings that should have them
* convert " to ' in a bunch of places
* fix some indentation where my editor (Emacs) fixed it
* add a few TODO items for things that I'm pretty sure don't fly
l10n-wise
The ramification of these changes is that any project that has these
strings translated will now have to retranslate a bunch of them because
I changed the variable format. Sorry about that.
2013-08-24 10:18:52 -04:00
b5e3dd95dc
Delete commented out urlparams code
...
@lmorchard said it was ok to nuke this from orbit. Done.
2013-08-23 23:38:04 -04:00
ee84179dca
Add ToxicWar to CONTRIBUTORS
2013-08-23 23:26:46 -04:00
a35acc3715
Fix issues with url tag and email subject
...
The url tag changed in Django 1.5. I fixed the code so that it should
work in both Django 1.4 and 1.5. When we drop support for 1.4, we can
ditch all the
{% load url from future %}
stuff.
The email subject for deferred awards is a template which is fine but
when we render the template, it's likely to end up with newlines. So I
added a call to strip() which will remove whitespace at the beginning
and end. It fixes the test, but there might be other things we could do
better here. For example, maybe use gettext instead of putting it in a
template?
2013-08-23 23:20:40 -04:00
ffdbb5fcbd
Improve BadgesListView
2013-08-23 22:50:55 -04:00
0a675697a4
Fix kwargs.get problem (kwargs -> self.kwargs)
...
Improve AwardsListView
Conflicts:
badger/views.py
2013-08-23 22:44:23 -04:00
12a871622d
Remove direct_to_template
2013-08-23 22:37:48 -04:00
4c7707a03f
PEP8
2013-08-23 22:28:38 -04:00
b77cbeb4fb
Update badges_list and awards_list(support Django 1.5)
...
Fix extra spaces
Conflicts:
badger/views.py
2013-08-23 22:20:02 -04:00
36f086e22a
Add missing docs/ files
2013-08-23 21:10:18 -04:00
9d86677ebc
Add CHANGELOG and CONTRIBUTORS; fix MANIFEST.in
2013-08-23 21:09:52 -04:00
fa10287d2e
Add note about tox to docs
2013-08-22 15:44:01 -04:00
8b0a9ea0bc
Merge pull request #170 from askvictor/7bbb30eca1c0b8679b9797d302538213d2d5da16
...
Fix erroneous time format string in OBI assertion
2013-08-22 11:27:52 -07:00
8e8e8bda7c
Add .tox to ignored list
2013-08-22 11:55:08 -04:00
c1de602802
Add tox.ini
...
This tests python 2.6 and 2.7 with Django 1.4 and 1.5.
The tests all pass fine with django 1.4, but they fail with django
1.5.
NB: I'm "faking" the python 2.6 tests on my system since I don't
have python 2.6 available. But travis is running 2.6 and 2.7, so
there you go.
2013-08-22 11:14:56 -04:00
1eb2e9cb30
Add docstring to _document_django_model
...
You could say it's ironic that function had no docstring.
2013-08-22 09:14:39 -04:00
c58a0e5898
Fix travis to test multiple environments
...
We want to test Python 2.6 and 2.7 for Django 1.4.6 and 1.5.2.
2013-08-21 22:47:01 -04:00
4a9805242e
Fix deprecation errors
2013-08-21 22:04:55 -04:00
Will Kahn-Greene
Mozilla-GitHub-Standards
Mike Cooper
Mike Cooper
Will Kahn-Greene
Samuel Martin
Ricky Rosario
Les Orchard
Hector Zhao
ToxicWar