Commit graph

122 commits

Author SHA1 Message Date
Yang.Y
8efaea86e7 Merge pull request #68 from Geeknux/master
bugfix for wrong user unread notification count
2015-07-06 23:00:07 +08:00
geeknux
072a56a870 bugfix for wrong user unread notification count 2015-07-06 19:12:31 +04:30
Yang.Y
b8806e07bb Merge pull request #61 from philroche/master
Add __str__ to Notification Model to support Python 3
2015-05-17 20:58:26 +08:00
Philip Roche
2b70687344 Add __str__ to Notification Model to support Python 3 2015-05-17 12:43:31 +01:00
Yang.Y
00c3bd14e8 Merge pull request #57 from ashokfernandez/master
Fixes deprecation notice in Django 1.8
2015-04-28 20:58:00 +08:00
Ashok Fernandez
2f0f50aa49 Fixes deprecation notice in Django 1.8 2015-04-28 14:10:49 +02:00
Yang.Y
4353c68cb6 Merge pull request #56 from arthurmaire/master
Add possibility to send level when adding new notification
2015-04-27 09:05:04 +08:00
Arthur
0ceddf4310 Add possibility to pass level when adding notification 2015-04-26 13:23:40 +02:00
Yang.Y
211ac8e1db Merge pull request #55 from MiguelSR/master
Added note on documentation to prevent possible error when running migrations
2015-04-22 21:47:14 +08:00
MiguelSR
549b03b82f Fixing link 2015-04-22 12:16:22 +02:00
MiguelSR
3e76c51193 Adding note to prevent possible error of users runnning notifications
migrations before its custom user model ones
2015-04-22 12:14:40 +02:00
Yang.Y
24bfc6ec07 Update README.rst
Change author name "zhang-z" to "Zhongyuan Zhang"
2015-04-21 10:39:58 +08:00
Yang.Y
503b65ce8a Update README.rst
State difference between django-notifications and django-activity-stream
2015-04-21 10:37:24 +08:00
Yang.Y
9e91cd965b Bump version 0.7.0 2015-04-21 10:25:52 +08:00
Yang.Y
56298d508e Update README, CHANGELOG and AUTHORS 2015-04-21 09:53:28 +08:00
Yang.Y
2e8fbe44ce Merge pull request #54 from LegoStormtroopr/master
vanity adding myself to Author to nudge TravisCI
2015-04-11 14:47:48 +08:00
theodore.therone@gmail.com
b6113fbfff vanity adding myself to Author to nudge TravisCI 2015-04-11 05:52:00 +00:00
zzy
191c1250df Add option "NOTIFICATIONS_SOFT_DELETE", fix issue #52 2015-04-11 13:28:52 +08:00
zzy
c8647ce302 Rename "NOTIFY_USE_JSONFIELD" to "NOTIFICATIONS_USE_JSONFIELD", as app name is "notifications". "NOTIFY..." is reserved for backward compatibility 2015-04-11 11:51:33 +08:00
zzy
cccade4c34 Remove deprecated "request.REQUEST" and "future.url" 2015-04-11 09:44:33 +08:00
Yang.Y
dbd04dd0f4 Merge pull request #51 from LegoStormtroopr/master
extra tests and coverage
2015-04-09 16:23:16 +08:00
theodore.therone@gmail.com
c01d1c5f49 Django1.6 test fixes, adding Django1.8 to test suite 2015-04-09 04:57:36 +00:00
theodore.therone@gmail.com
bc617498fa long no longer in py3, adding workaround 2015-04-09 04:43:47 +00:00
theodore.therone@gmail.com
ce0f1fc0ec extra tests and coverage
Small tweaks to views -  to  to prevent collision with python keyword.
2015-04-09 04:36:15 +00:00
Samuel Spencer
6822b6f002 Merge pull request #49 from LegoStormtroopr/master
Pulling in Travis-CI and coverage automated checks.
2015-03-29 18:05:17 +11:00
theodore.therone@gmail.com
8a91c008c9 corrected badge 2015-03-29 07:00:59 +00:00
theodore.therone@gmail.com
a7b858fbba we don't like 3.2 2015-03-29 06:46:38 +00:00
theodore.therone@gmail.com
8820f6e86e added exclusion to prevent failure 2015-03-29 06:45:07 +00:00
theodore.therone@gmail.com
b24237c676 minor tweaks for travis 2015-03-29 06:37:27 +00:00
theodore.therone@gmail.com
9a1698dcd4 adding badge (forcing a pull for Travis) 2015-03-29 05:07:51 +00:00
Yang.Y
d277f9803d Merge pull request #47 from LegoStormtroopr/master
Expanded tests for notifications
2015-03-28 21:05:59 +08:00
theodore.therone@gmail.com
970b958741 corrected travis 2015-03-28 08:50:39 +00:00
theodore.therone@gmail.com
41200818b9 Merge branch 'master' of https://github.com/LegoStormtroopr/django-notifications 2015-03-28 08:32:25 +00:00
theodore.therone@gmail.com
22bbd8d96b add .coverage to ignore 2015-03-28 08:32:07 +00:00
Samuel Spencer
dc90340f7f Delete .coverage 2015-03-28 19:31:15 +11:00
theodore.therone@gmail.com
9608ee8a6e Added tests, confirmed works for python2/3
Also added .travis.yml
2015-03-28 08:25:56 +00:00
zzy
e244ba3ec0 Add 'data' field into Notification model 2015-03-20 19:03:41 +08:00
Yang.Y
a2cd0a8726 Merge pull request #45 from cubicuboctahedron/master
Added south_migration to the setup.py package list
2015-03-09 09:04:44 +08:00
Ilya Grishkov
060d49f898 Added south_migration to the setup.py package list 2015-03-08 22:30:33 +01:00
Yang.Y
8f02e30be5 Merge pull request #44 from zhang-z/master
Migration support for Django 1.7 and two new fields in Notification model
2015-02-27 10:45:01 +08:00
zzy
f351e92223 Add 'deleted' and 'emailed' field 2015-02-24 19:40:21 +08:00
zzy
736615dd77 Add migration support for Django 1.7 2015-02-24 19:25:50 +08:00
Yang.Y
44ef50eabd Merge pull request #42 from steppinstonez/master
Python3 compatibility (using six).
2015-02-04 23:37:37 +08:00
Ivan
8c7cc0d3c1 Python3 compatibility (using six). 2015-02-04 15:25:20 +00:00
Yang.Y
799f476a74 Merge pull request #39 from LegoStormtroopr/master
Adds urls and views to delete notifications, fixes #37
2014-10-14 10:14:36 +08:00
theodore.therone@gmail.com
2b81726dec Adds delete option, fixes #37 2014-10-14 01:31:53 +00:00
Brant.Y
e0c7c75349 Merge pull request #34 from Axelio/master
Adding filters and displays to model admin
2014-05-25 08:05:26 -05:00
Axel Díaz
3dae324d5e Adding filters and displays to model admin 2014-05-25 06:03:55 +00:00
Brant.Y
38f9b16997 Update README.rst 2014-05-08 20:46:40 +08:00
Brant.Y
644f304acb Merge pull request #33 from ContinuumBridge/master
Make initial migration compatible with custom user models
2014-05-08 09:23:20 +08:00