Commit graph

221 commits

Author SHA1 Message Date
Vladimir Osintsev
c7fd00a0f3 Redirect to unread view after mark as read 2016-08-13 23:46:04 +03:00
Yang.Y
dca99e959e Bump version 1.2 2016-06-17 11:19:47 +08:00
Zhongyuan
9f3e0105c2 Merge pull request #137 from zhang-z/master
Return updated count in QuerySet
2016-06-02 22:20:06 +08:00
zzy
4b03e572d7 Return updated count in QuerySet 2016-06-02 22:18:33 +08:00
Zhongyuan
cf15b651b7 Merge pull request #136 from zhang-z/fix/issue-135
Fix issue #135
2016-05-16 16:29:27 +08:00
Zhongyuan
69e9346464 Fix issue #135 2016-05-16 16:25:31 +08:00
Yang.Y
c73232cb28 Merge pull request #132 from marcgibbons/master
Add missing migration
2016-05-05 08:50:05 +08:00
Marc Gibbons
e98018075b Add missing migration 2016-05-04 12:56:20 -04:00
Yang.Y
754fb5a567 Merge pull request #131 from ikkebr/patch-2
Fixed parameter name error in README.rst
2016-04-16 10:14:42 +08:00
Yang.Y
74ff1bf55c Merge pull request #130 from ikkebr/patch-1
Django 1.9 template tag compatibility
2016-04-16 10:13:00 +08:00
Henrique Pereira
f7a8fc8501 Fixed parameter name error in README.rst
There is no to_fetch parameter. The correct name is fetch.
2016-04-15 15:01:58 -03:00
Henrique Pereira
345dd56522 Django 1.9 template tag compatibility
Due to register.simple_tag automatically espacing unsafe_html in Django 1.9, it is now needed to use mark_safe or format_html. I have chosen the later because it is the recommended solution.
2016-04-15 13:38:11 -03:00
Yang.Y
81c1f87286 Bump version 1.1 2016-03-29 09:06:22 +08:00
Yang.Y
b3861cb520 Merge pull request #121 from LegoStormtroopr/master
Checks logged in state when accessing notify API
2016-03-27 10:48:48 +08:00
Zhongyuan
87dcf2e8ce Merge pull request #127 from zhang-z/fix/issue-126
Fix issue #126: Mark All As read fails if soft-deleted
2016-03-23 22:54:26 +08:00
Zhongyuan
15885033fd Fix: Mark All As read fails if soft-deleted #126 2016-03-22 16:34:18 +08:00
Samuel Spencer
1b85a996df catchup 2016-02-08 03:57:02 +00:00
Samuel Spencer
d55762edd3 Added sentinals for unauthenticated users, preventing a 500 error
also fix spelling mistake in README
2016-02-08 03:54:35 +00:00
Yang.Y
1d53771247 Merge pull request #115 from yangyubo/master
Bump version 1.0
2016-01-04 11:32:23 +08:00
Yang.Y
0e8954a61a Bump 1.0 2016-01-04 11:26:06 +08:00
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