Hopiu/django-notifications
1
0
Fork 0
mirror of https://github.com/Hopiu/django-notifications.git synced 2026-04-15 02:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
201 commits 7 branches 17 tags 7.5 MiB
Commit graph

201 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yang.Y
dfeeec5e2e Tests no more depend on 'six' (refer to #105) 2016-01-04 11:15:48 +08:00
Yang.Y
2906001944 Django recommends pytz, and uses it internally 2016-01-04 11:11:21 +08:00
Yang.Y
d37d073b4a Merge pull request #114 from yangyubo/master 
Custom now() invocation got overlooked by PR #113
 2016-01-03 12:01:33 +08:00
Yang.Y
5007afaae2 Custom now() invocation got overlooked by PR #113 2016-01-03 11:58:06 +08:00
Zhongyuan
bfeb533754 Merge pull request #113 from funkybob/feature/now 
Remove custom now() function
 2016-01-01 14:26:09 +08:00
Curtis Maloney
5944862a5f Remove custom now() function, since django.utils.timezone.now does the same thing 2016-01-01 17:08:05 +11:00
Zhongyuan
7dc21ef556 Merge pull request #112 from funkybob/feature/cleanup 
Tidy with flake8
 2016-01-01 13:06:57 +08:00
Curtis Maloney
6668474c65 Tidy with flake8 2016-01-01 13:59:51 +11:00
Zhongyuan
055b607525 Merge pull request #111 from zhang-z/master 
Fix a typo in README (issue #110)
 2015-12-30 16:31:32 +08:00
Zhongyuan
85a4d7f283 Fix a typo in README (issue #110) 2015-12-30 16:28:43 +08:00
Yang.Y
3da99ca328 Update README.rst 
"recipient" can also be a Group
 2015-12-21 13:01:44 +08:00
Yang.Y
34f9698659 Merge pull request #107 from Evidlo/master 
notify.send() accepts User or Group
 2015-12-21 12:58:04 +08:00
ieee
f19c8e7a3e fixed opt problem, added test for Group 2015-12-19 18:26:15 -05:00
Yang.Y
71ca543632 Merge pull request #105 from funkybob/feature/no-six 
Use Django's vendored copy of six
 2015-12-18 11:12:50 +08:00
ieee
5f05955563 notify.send() accepts User or Group 
squash! notify.send() accepts User or Group
 2015-12-17 17:50:08 -05:00
Curtis Maloney
46c5a1e6b3 Use Django's vendored copy of six 2015-12-18 09:05:33 +11:00
Zhongyuan
acc3098ae0 Merge pull request #104 from zhang-z/master 
Add app_name in urls.py
 2015-12-17 18:24:25 +08:00
Zhongyuan
1ddf085612 Add app_name in urls.py 2015-12-17 18:10:08 +08:00
Yang.Y
c29345f5fa Merge pull request #101 from zhang-z/master 
Merge branch drop-support-django1.6
 2015-12-17 10:35:59 +08:00
Zhongyuan
72a610551c Merge branch 'drop-support-django1.6' 
Conflicts:
	notifications/__init__.py
	notifications/templatetags/notifications_tags.py
	notifications/tests/settings.py
	notifications/tests/urls.py
	setup.py
 2015-12-14 16:02:02 +08:00
Zhongyuan
f5b7fc8741 Merge pull request #99 from areski/fix-doc 
fix doc import signals
 2015-12-14 15:26:10 +08:00
Yang.Y
5c3f67b9b7 Bump version 0.8.0 2015-12-14 11:34:43 +08:00
Yang.Y
fa3902d391 Merge pull request #100 from yangyubo/master 
Fix versioning: import __version__ at setup.py directly is error-pron…
 2015-12-14 10:58:46 +08:00
Yang.Y
d375fc1a0f Make travis-ci happy 2015-12-14 10:56:13 +08:00
Yang.Y
762f0973ac Fix versioning: import __version__ at setup.py directly is error-prone, and use a standalone version.py outside package source also not a good idea. 2015-12-14 10:01:43 +08:00
areski
5323079489 fix doc import signals 2015-12-12 11:33:46 +01:00
Samuel Spencer
ce7f115db8 Merge pull request #98 from LegoStormtroopr/master 
fixes #82
 2015-12-12 20:55:15 +11:00
Samuel Spencer
551be1e910 fixes #82 2015-12-12 09:53:47 +00:00
Samuel Spencer
75744a713f Merge pull request #83 from LegoStormtroopr/master 
Fix live updating notifications
 2015-12-12 20:43:45 +11:00
Samuel Spencer
0aa46f7567 fix merge 2015-12-12 09:41:12 +00:00
Samuel Spencer
20548d195f added live tester page. Confirmed all works. 2015-12-12 07:09:20 +00:00
Zhongyuan
8ee79fbd8b Merge pull request #97 from areski/fix-pep-setup 
Fix pep8 & use setuptools
 2015-12-11 23:37:34 +08:00
areski
7634dff290 Fix Pep8 & use setuptools 2015-12-11 14:32:20 +01:00
Zhongyuan
7109663f11 Merge pull request #95 from zhang-z/drop-support-django1.6 
Fix a RemovedInDjango110Warning in unittest
 2015-12-10 10:53:26 +08:00
Zhongyuan
e094c15e97 Fix a RemovedInDjango110Warning in unittest 2015-12-10 10:50:03 +08:00
Zhongyuan
e79639fc6c Merge pull request #94 from illing2005/drop-support-django1.6 
Django 1.9 compability
 2015-12-10 10:41:03 +08:00
Sebastian Illing
917f2f8831 removed old code 2015-12-09 14:41:16 +01:00
Sebastian Illing
243738662b exclude python3.3,Django1.9 2015-12-09 14:39:07 +01:00
Sebastian Illing
888a59240f Update README.rst 2015-12-09 14:36:16 +01:00
Sebastian Illing
2b38959246 django1.9 passing tests again 2015-12-09 14:30:34 +01:00
Zhongyuan
fdc0a26252 Merge pull request #91 from zhang-z/drop-support-django1.6 
Drop support for Django 1.6 and below (Django 1.9 not supported yet)
 2015-12-09 10:22:15 +08:00
Zhongyuan
1f0405f701 Fix code that incompatible with Django1.8+Python3.5 2015-12-07 17:34:20 +08:00
Zhongyuan
8f2aeaa5b6 Django1.7 doesn't support Python3.5 2015-12-07 16:12:42 +08:00
Zhongyuan
30a3708bf9 Temporarily remove Django1.9 from travis, there are still some bugs 2015-12-07 15:54:07 +08:00
Zhongyuan
c5208f154c Remove --use-mirrors from travis, as pip7 doesn't support it 2015-12-07 15:15:54 +08:00
Zhongyuan
3e6861a6cc Remove support for Python 3.2 as coverage 4 is not supporting it (http://coverage.readthedocs.org/en/coverage-4.0.3/changes.html#version-4-0-20-september-2015) 2015-12-07 15:13:38 +08:00
Zhongyuan
f0b4830890 Remove Python 2.6 & Django 1.6 from travis testing; add Python 3.2, 3.5, Django 1.9 2015-12-07 11:24:42 +08:00
Zhongyuan
d297017eb1 Drop support for Django 1.6 and below 2015-12-07 11:17:37 +08:00
Yang.Y
6d368fb717 Merge pull request #88 from zhang-z/master 
Update model-utils version for compatibility issue
 2015-12-04 09:14:21 +08:00
zhangz
7f63fcf315 Update model-utils version for compatibility issue 2015-12-03 16:49:53 +08:00