diff --git a/MANIFEST b/MANIFEST index 780f94e88..0a1a3b680 100644 --- a/MANIFEST +++ b/MANIFEST @@ -5,4 +5,3 @@ include setup.cfg include requirements.txt include model_chart_wiki.pdf recursive-include wiki *.html *.txt *.png *.js *.css *.gif *.less *.mo *.po *.otf *.svg *.woff *.eot *.ttf -recursive-include django_notify *.html *.txt *.png *.js *.css *.gif *.mo *.po diff --git a/django_notify/COPYING b/django_notify/COPYING deleted file mode 100644 index ee882461e..000000000 --- a/django_notify/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - django-wiki Copyright (C) 2012 Benjamin Bach - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/django_notify/README.md b/django_notify/README.md deleted file mode 100644 index b98720ad5..000000000 --- a/django_notify/README.md +++ /dev/null @@ -1,129 +0,0 @@ -django_notify -============= - -NB! This application is not the same as the PyPi project by the very same name, -nor is an integral part of django-wiki, it's a standalone project. -That PyPi project by the same name has been long dead (but seemed nice), -and we will try to get the keys for their PyPi repo or something... but meanwhile! - -django_notify does this: - -```python -from django_notify import notify - -EVENT_KEY = "my_key" -notify(_("OMG! Something happened"), EVENT_KEY) -``` - -All users subscribing to `EVENT_KEY` will have a notification created in their -stack. If you have emails enabled, they may get a summary of notifications at an -interval of their choice. - -Why should you do this? ------------------------ - -Users need an cleverly sifted stream of events. Ensure that they have the -possibility of customizing what they deem fit for their stream. - -What do you need to do? ------------------------ - -You need to do a lot. Firstly, you need to write some javascript that will -fetch the latest notifications and display them in some area of the screen. -Upon clicking that icon, the latest notifications are displayed. Something like -this: - -![Javascript drop-down](./docs/misc/screenshot_dropdown.png) - -Here is a snippet example to get you started, but you need to get ui.js from [django-wiki/plugins/notifications](https://github.com/benjaoming/django-wiki/tree/master/wiki/plugins/notifications/static/wiki/plugins/notifications/js) -which is a couple of utility functions that use JQuery to get notifications from -a JSON view and display them in the right DOM element. - -```html -

Notifications:

- - - -``` - -Usage ------ - - -### Adding a notification - -```python - from django_notify import notify - - EVENT_KEY = "my_key" - notify(_("OMG! Something happened"), EVENT_KEY) -``` - -### Adding a notification with a certain target object - -The Notification model has a GenericForeignKey which can link it to any other -object. This is nice, because you might have an intention to go the other way -around and ask "for this object, are there any notifications?" - -```python - notify(_("OMG! Something happened"), EVENT_KEY, target_object=my_model_instance) -``` - -### Excluding certain recepients - -By setting the kwarg `filter_exclude` to a dictionary of lookup fields for -`models.Subscription`, you may exclude certain users from getting a notification. -For instance, if a notification is solely for staff members: - -```python - notify( - _("OMG! Something happened"), EVENT_KEY, - filter_exclude={'settings__user__is_staff': True} - ) -``` - -### Disabling notifications - -Use `decorators.disable_notify` to ensure that all notifications within a function are disabled. - -For instance: - -```python - from django_notify.decorators import disable_notify - @disable_notify - def my_view(request): - ... -``` - -*This is a work in progress* ----------------------------- - -This application should live outside django-wiki. -It will! But only as soon as there's time to package it separately... - -TODO: - - * Missing email functionality - * Functions to easily retrive notifications and mark them as read - * Some easy-to-use template tags and templates to override. - * Examples of how to extend diff --git a/django_notify/__init__.py b/django_notify/__init__.py deleted file mode 100644 index 8fbb66ee0..000000000 --- a/django_notify/__init__.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -# This package and all its sub-packages are part of django_notify, -# except where otherwise stated. -# -# django_notify is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# django_notify is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with django_notify. If not, see . - -# Unused feature, atm. everything is bundled with django-wiki -from __future__ import unicode_literals - -VERSION = "0.0.4" - -from django.contrib.contenttypes.models import ContentType -from django.db.models import Model -from django.utils.translation import ugettext as _ - -from . import models - -_disable_notifications = False - -def notify(message, key, target_object=None, url=None, filter_exclude={}): - """ - Notify subscribing users of a new event. Key can be any kind of string, - just make sure to reuse it where applicable! Object_id is some identifier - of an object, for instance if a user subscribes to a specific comment thread, - you could write: - - notify("there was a response to your comment", "comment_response", - target_object=PostersObject, - url=reverse('comments:view', args=(PostersObject.id,))) - - The below example notifies everyone subscribing to the "new_comments" key - with the message "New comment posted". - - notify("New comment posted", "new_comments") - - filter_exclude: a dictionary to exclude special elements of subscriptions - in the queryset, for instance filter_exclude={''} - - """ - - if _disable_notifications: - return 0 - - if target_object: - if not isinstance(target_object, Model): - raise TypeError(_("You supplied a target_object that's not an instance of a django Model.")) - object_id = target_object.id - else: - object_id = None - - objects = models.Notification.create_notifications( - key, - object_id=object_id, - message=message, - url=url, - filter_exclude=filter_exclude, - ) - return len(objects) - diff --git a/django_notify/admin.py b/django_notify/admin.py deleted file mode 100644 index 8929a681c..000000000 --- a/django_notify/admin.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.contrib import admin - -from django_notify import models -from django_notify import settings - -if settings.ENABLE_ADMIN: - admin.site.register(models.NotificationType) - admin.site.register(models.Notification) - admin.site.register(models.Settings) - admin.site.register(models.Subscription) \ No newline at end of file diff --git a/django_notify/decorators.py b/django_notify/decorators.py deleted file mode 100644 index f1d5771d2..000000000 --- a/django_notify/decorators.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -from django.utils import simplejson as json -from django.http import HttpResponse -from django.contrib.auth.decorators import login_required - -import django_notify - -def disable_notify(func): - """Disable notifications. Example: - - @disable_notify - def your_function(): - notify("no one will be notified", ...) - """ - def wrap(request, *args, **kwargs): - django_notify._disable_notifications = True - response = func(request, *args, **kwargs) - django_notify._disable_notifications = False - return response - return wrap - -def login_required_ajax(func): - """Similar to login_required. But if the request is an ajax request, then - it returns an error in json with a 403 status code.""" - - def wrap(request, *args, **kwargs): - if request.is_ajax(): - if not request.user or not request.user.is_authenticated(): - return json_view(lambda *a, **kw: {'error': 'not logged in'})(request, status=403) - return func(request, *args, **kwargs) - else: - return login_required(func)(request, *args, **kwargs) - return wrap - -def json_view(func): - def wrap(request, *args, **kwargs): - obj = func(request, *args, **kwargs) - data = json.dumps(obj, ensure_ascii=False) - status = kwargs.get('status', 200) - response = HttpResponse(mimetype='application/json', status=status) - response.write(data) - return response - return wrap - diff --git a/django_notify/docs/misc/screenshot_dropdown.png b/django_notify/docs/misc/screenshot_dropdown.png deleted file mode 100644 index 0c2eb7935..000000000 Binary files a/django_notify/docs/misc/screenshot_dropdown.png and /dev/null differ diff --git a/django_notify/locale/de/LC_MESSAGES/django.mo b/django_notify/locale/de/LC_MESSAGES/django.mo deleted file mode 100644 index 29fa388a4..000000000 Binary files a/django_notify/locale/de/LC_MESSAGES/django.mo and /dev/null differ diff --git a/django_notify/locale/de/LC_MESSAGES/django.po b/django_notify/locale/de/LC_MESSAGES/django.po deleted file mode 100644 index 132fdb550..000000000 --- a/django_notify/locale/de/LC_MESSAGES/django.po +++ /dev/null @@ -1,136 +0,0 @@ -# THE GERMAN TRANSLATION OF DJANGO-NOTIFY. -# Copyright (C) 2013 THOMAS LOTTERMANN -# This file is distributed under the same license as the DJANGO-WIKI package. -# THOMAS LOTTERMANN , 2013. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-06 20:37+0200\n" -"Last-Translator: Thomas Lottermann \n" -"Language-Team: \n" -"Language: German\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: __init__.py:52 -msgid "You supplied a target_object that's not an instance of a django Model." -msgstr "Das gegebene \"target_object\" ist keine Instanz eines Django Models." - -#: models.py:14 -msgid "unique key" -msgstr "eindeutiger Schlüssel" - -#: models.py:16 -msgid "verbose name" -msgstr "sprechender Name" - -#: models.py:25 -msgid "type" -msgstr "Typ" - -#: models.py:26 -msgid "types" -msgstr "Typen" - -#: models.py:31 -msgid "interval" -msgstr "Interval" - -#: models.py:35 -#, python-format -msgid "Settings for %s" -msgstr "Einstellungen für %s" - -#: models.py:40 models.py:41 -msgid "settings" -msgstr "Einstellungen" - -#: models.py:48 -msgid "Leave this blank to subscribe to any kind of object" -msgstr "Leerlassen um beliebiges Object zu abonnieren" - -#: models.py:53 -#, python-format -msgid "Subscription for: %s" -msgstr "Abonnement von: %s" - -#: models.py:58 -msgid "subscription" -msgstr "Abonnement" - -#: models.py:59 -msgid "subscriptions" -msgstr "Abonnements" - -#: models.py:65 -msgid "link for notification" -msgstr "Link zur Benachrichtigung" - -#: models.py:71 -msgid "occurrences" -msgstr "Häufigkeit" - -#: models.py:72 -msgid "" -"If the same notification was fired multiple times with no intermediate " -"notifications" -msgstr "" -"Wenn die gleiche Benachrichtigung öfter aufgetreten ist ohne " -"zwischenzeitiges senden" - -#: models.py:125 -msgid "notification" -msgstr "Benachrichtigung" - -#: models.py:126 -msgid "notifications" -msgstr "Benachrichtigungen" - -#: settings.py:19 -msgid "You have new notifications" -msgstr "Du hast neue Benachrichtigungen" - -#: settings.py:38 -msgid "instant" -msgstr "sofort" - -#: settings.py:39 -msgid "daily" -msgstr "täglich" - -#: settings.py:40 -msgid "weekly" -msgstr "wöchentlich" - -#: views.py:32 -#, python-format -msgid "%d times" -msgstr "%d mal" - -#: templates/emails/notification_email_message.txt:2 -#, python-format -msgid "Dear %(username)s," -msgstr "Hallo %(username)s," - -#: templates/emails/notification_email_message.txt:4 -#, python-format -msgid " These are the %(digest)s notifications from %(site)s." -msgstr " Dies sind die %(digest)s versendeten Benachrichtigungen von %(site)s." - -#: templates/emails/notification_email_message.txt:10 -msgid "Thanks for using our site!" -msgstr "Danke, dass du unsere Seite nutzt!" - -#: templates/emails/notification_email_message.txt:12 -msgid "Sincerely" -msgstr "Viele Grüße" - -#: templates/emails/notification_email_subject.txt:2 -#, python-format -msgid " %(digest)s Notifications %(site)s." -msgstr " Benachrichtigungen von %(site)s (%(digest)s versendet)." diff --git a/django_notify/locale/ru/LC_MESSAGES/django.mo b/django_notify/locale/ru/LC_MESSAGES/django.mo deleted file mode 100644 index 3ad3d260a..000000000 Binary files a/django_notify/locale/ru/LC_MESSAGES/django.mo and /dev/null differ diff --git a/django_notify/locale/ru/LC_MESSAGES/django.po b/django_notify/locale/ru/LC_MESSAGES/django.po deleted file mode 100644 index 47e6507bf..000000000 --- a/django_notify/locale/ru/LC_MESSAGES/django.po +++ /dev/null @@ -1,137 +0,0 @@ -# THE RUSSIAN TRANSLATION OF DJANGO-NOTIFY. -# Copyright (C) 2013 ROSTISLAV GRIGORIEV -# This file is distributed under the same license as the DJANGO-WIKI package. -# Rostislav Grigoriev , 2013. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.18\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-25 15:45+0400\n" -"PO-Revision-Date: 2013-03-17 19:30+CET\n" -"Last-Translator: Rostislav Grigoriev \n" -"Language-Team: \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: __init__.py:55 -msgid "You supplied a target_object that's not an instance of a django Model." -msgstr "Указанный вами target_object не экземляр django-модели" - -#: models.py:18 -msgid "unique key" -msgstr "уникальный ключ" - -#: models.py:23 -msgid "verbose name" -msgstr "наименование" - -#: models.py:34 -msgid "type" -msgstr "тип" - -#: models.py:35 -msgid "types" -msgstr "типы" - -#: models.py:47 -msgid "interval" -msgstr "интервал" - -#: models.py:52 -#, python-format -msgid "Settings for %s" -msgstr "Настройки для %s" - -#: models.py:57 models.py:58 -msgid "settings" -msgstr "настройки" - -#: models.py:68 -msgid "Leave this blank to subscribe to any kind of object" -msgstr "Оставьте это поле пустым, чтобы подписаться на любой объект" - -#: models.py:78 -#, python-format -msgid "Subscription for: %s" -msgstr "Подписка для: %s" - -#: models.py:83 -msgid "subscription" -msgstr "подписка" - -#: models.py:84 -msgid "subscriptions" -msgstr "подписки" - -#: models.py:96 -msgid "link for notification" -msgstr "ссылка уведомления" - -#: models.py:106 -msgid "occurrences" -msgstr "вхождения" - -#: models.py:108 -msgid "" -"If the same notification was fired multiple times with no intermediate " -"notifications" -msgstr "" -"Если уведомление было вызвано несколько раз без промежуточного уведомления." - -#: models.py:170 -msgid "notification" -msgstr "уведомление" - -#: models.py:171 -msgid "notifications" -msgstr "уведомления" - -#: settings.py:19 -msgid "You have new notifications" -msgstr "Нет новых уведомлений" - -#: settings.py:38 -msgid "instantly" -msgstr "немедленно" - -#: settings.py:39 -msgid "daily" -msgstr "раз в день" - -#: settings.py:40 -msgid "weekly" -msgstr "раз в неделю" - -#: views.py:32 -#, python-format -msgid "%d times" -msgstr "%d раз" - -#: templates/emails/notification_email_message.txt:1 -#, python-format -msgid "Dear %(username)s," -msgstr "Дорогой %(username)s," - -#: templates/emails/notification_email_message.txt:3 -#, python-format -msgid "These are the %(digest)s notifications from %(site)s." -msgstr " Для вас %(digest)s уведомлений от %(site)s." - -#: templates/emails/notification_email_message.txt:9 -msgid "Thanks for using our site!" -msgstr "Спасибо, что пользуетесь сайтом!" - -#: templates/emails/notification_email_message.txt:11 -msgid "Sincerely" -msgstr "Искренне" - -#: templates/emails/notification_email_subject.txt:2 -#, python-format -msgid " %(digest)s Notifications %(site)s." -msgstr " %(digest)s уведомлений от %(site)s." diff --git a/django_notify/management/__init__.py b/django_notify/management/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/django_notify/management/commands/__init__.py b/django_notify/management/commands/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/django_notify/management/commands/notifymail.py b/django_notify/management/commands/notifymail.py deleted file mode 100644 index 714823e18..000000000 --- a/django_notify/management/commands/notifymail.py +++ /dev/null @@ -1,159 +0,0 @@ -from __future__ import print_function -from __future__ import unicode_literals -import os -import sys -import time -from datetime import datetime -from optparse import make_option - -from django_notify import settings as notify_settings - -from django.contrib.sites.models import Site -from django.core import mail -from django.core.management.base import BaseCommand -from django.template.loader import render_to_string -from django.utils.translation import ugettext as _, activate, deactivate -from django.conf import settings -from django_notify import models - -import smtplib - -import logging - - -class Command(BaseCommand): - can_import_settings = True - help = 'Sends notification emails to subscribed users taking into account the subscription interval' #@ReservedAssignment - option_list = BaseCommand.option_list + ( - make_option('--daemon','-d', - action='store_true', - dest='daemon', - default=False, - help='Go to daemon mode and exit'), - ) - - def _send_user_notifications(self, context, connection): - subject = _(notify_settings.EMAIL_SUBJECT) - message = render_to_string( - 'emails/notification_email_message.txt', - context - ) - email = mail.EmailMessage( - subject, message, notify_settings.EMAIL_SENDER, - [context['user'].email], connection=connection - ) - self.logger.info("Sending to: %s" % context['user'].email) - email.send(fail_silently=False) - - def handle(self, *args, **options): - # activate the language - activate(settings.LANGUAGE_CODE) - - daemon = options['daemon'] - - self.logger = logging.getLogger('django_notify') - - if not self.logger.handlers: - if daemon: - handler = logging.FileHandler(filename=notify_settings.NOTIFY_LOG) - else: - handler = logging.StreamHandler(self.stdout) - self.logger.addHandler(handler) - self.logger.setLevel(logging.INFO) - - self.logger.info("Starting django_notify e-mail dispatcher") - - if not notify_settings.SEND_EMAILS: - print("E-mails disabled - quitting.") - sys.exit() - - - - # Run as daemon, ie. fork the process - if daemon: - self.logger.info("Daemon mode enabled, forking") - try: - fpid = os.fork() - if fpid > 0: - # Running as daemon now. PID is fpid - self.logger.info("PID: %s" % str(fpid)) - pid_file = file(notify_settings.NOTIFY_PID, "w") - pid_file.write(str(fpid)) - pid_file.close() - sys.exit(0) - except OSError as e: - sys.stderr.write("fork failed: %d (%s)\n" % (e.errno, e.strerror)) - sys.exit(1) - - try: - self.send_loop() - except KeyboardInterrupt: - print("\nQuitting...") - - # deactivate the language - deactivate() - - def send_loop(self): - - # This could be /improved by looking up the last notified person - last_sent = None - context = {'user': None, - 'notifications': None, - 'digest': None, - 'site': Site.objects.get_current()} - - #create a connection to smtp server for reuse - try: - connection = mail.get_connection() - except: - self.logger.error("Could get a mail connection") - raise - - while True: - try: - connection.open() - except: - self.logger.error("Could not use e-mail connection") - raise - started_sending_at = datetime.now() - - self.logger.info("Starting send loop at %s" % str(started_sending_at)) - - if last_sent: - settings = models.Settings.objects.filter( - interval__lte=((started_sending_at-last_sent).seconds // 60) // 60 - ).order_by('user') - else: - settings = models.Settings.objects.all().order_by('user') - - for setting in settings: - context['user'] = setting.user - context['notifications']= [] - #get the index of the tuple corresponding to the interval and get the string name - context['digest'] = notify_settings.INTERVALS[[y[0] for y in notify_settings.INTERVALS].index(setting.interval)][1] - for subscription in setting.subscription_set.filter( - send_emails=True, - latest__is_emailed=False - ): - context['notifications'].append(subscription.latest) - if len(context['notifications']) > 0: - try: - self._send_user_notifications(context, connection) - for n in context['notifications']: - n.is_emailed=True - n.save() - except smtplib.SMTPException: - # TODO: Only quit on certain errors, retry on others. - self.logger.error("You have an error with your SMTP server connection, quitting.") - raise - - connection.close() - last_sent = datetime.now() - elapsed_seconds = (last_sent - started_sending_at).seconds - time.sleep( - max( - (min(notify_settings.INTERVALS)[0] - elapsed_seconds) * 60, - notify_settings.NOTIFY_SLEEP_TIME, - 0 - ) - ) diff --git a/django_notify/migrations/0001_initial.py b/django_notify/migrations/0001_initial.py deleted file mode 100644 index 53df95afb..000000000 --- a/django_notify/migrations/0001_initial.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'NotificationType' - db.create_table('notify_notificationtype', ( - ('key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=128, primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)), - ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'], null=True, blank=True)), - )) - db.send_create_signal('django_notify', ['NotificationType']) - - # Adding model 'Settings' - db.create_table('notify_settings', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_orm_label])), - ('interval', self.gf('django.db.models.fields.SmallIntegerField')(default=0)), - )) - db.send_create_signal('django_notify', ['Settings']) - - # Adding model 'Subscription' - db.create_table('notify_subscription', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('settings', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['django_notify.Settings'])), - ('notification_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['django_notify.NotificationType'])), - ('object_id', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)), - ('send_emails', self.gf('django.db.models.fields.BooleanField')(default=True)), - )) - db.send_create_signal('django_notify', ['Subscription']) - - # Adding model 'Notification' - db.create_table('notify_notification', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('subscription', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['django_notify.Subscription'], null=True, on_delete=models.SET_NULL, blank=True)), - ('message', self.gf('django.db.models.fields.TextField')()), - ('url', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)), - ('is_viewed', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('is_emailed', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - )) - db.send_create_signal('django_notify', ['Notification']) - - - def backwards(self, orm): - # Deleting model 'NotificationType' - db.delete_table('notify_notificationtype') - - # Deleting model 'Settings' - db.delete_table('notify_settings') - - # Deleting model 'Subscription' - db.delete_table('notify_subscription') - - # Deleting model 'Notification' - db.delete_table('notify_notification') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'django_notify.notification': { - 'Meta': {'object_name': 'Notification', 'db_table': "'notify_notification'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_emailed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_viewed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'message': ('django.db.models.fields.TextField', [], {}), - 'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Subscription']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) - }, - 'django_notify.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), - 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) - } - } - - complete_apps = ['django_notify'] diff --git a/django_notify/migrations/0002_auto__add_field_notification_occurrences.py b/django_notify/migrations/0002_auto__add_field_notification_occurrences.py deleted file mode 100644 index 25dd8073b..000000000 --- a/django_notify/migrations/0002_auto__add_field_notification_occurrences.py +++ /dev/null @@ -1,103 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Notification.occurrences' - db.add_column('notify_notification', 'occurrences', - self.gf('django.db.models.fields.PositiveIntegerField')(default=1), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Notification.occurrences' - db.delete_column('notify_notification', 'occurrences') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'django_notify.notification': { - 'Meta': {'ordering': "('-id',)", 'object_name': 'Notification', 'db_table': "'notify_notification'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_emailed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_viewed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'message': ('django.db.models.fields.TextField', [], {}), - 'occurrences': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), - 'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Subscription']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) - }, - 'django_notify.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), - 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) - } - } - - complete_apps = ['django_notify'] \ No newline at end of file diff --git a/django_notify/migrations/0003_auto__add_field_subscription_latest.py b/django_notify/migrations/0003_auto__add_field_subscription_latest.py deleted file mode 100644 index 0012ac696..000000000 --- a/django_notify/migrations/0003_auto__add_field_subscription_latest.py +++ /dev/null @@ -1,104 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Subscription.latest' - db.add_column('notify_subscription', 'latest', - self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='latest_for', null=True, to=orm['django_notify.Notification']), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Subscription.latest' - db.delete_column('notify_subscription', 'latest_id') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'django_notify.notification': { - 'Meta': {'ordering': "('-id',)", 'object_name': 'Notification', 'db_table': "'notify_notification'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_emailed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_viewed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'message': ('django.db.models.fields.TextField', [], {}), - 'occurrences': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), - 'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Subscription']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) - }, - 'django_notify.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'latest': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'latest_for'", 'null': 'True', 'to': "orm['django_notify.Notification']"}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), - 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) - } - } - - complete_apps = ['django_notify'] diff --git a/django_notify/migrations/0004_auto__chg_field_notification_url.py b/django_notify/migrations/0004_auto__chg_field_notification_url.py deleted file mode 100644 index 09f6eb186..000000000 --- a/django_notify/migrations/0004_auto__chg_field_notification_url.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Notification.url' - db.alter_column('notify_notification', 'url', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) - - def backwards(self, orm): - - # Changing field 'Notification.url' - db.alter_column('notify_notification', 'url', self.gf('django.db.models.fields.URLField')(max_length=200, null=True)) - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'django_notify.notification': { - 'Meta': {'ordering': "('-id',)", 'object_name': 'Notification', 'db_table': "'notify_notification'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_emailed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_viewed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'message': ('django.db.models.fields.TextField', [], {}), - 'occurrences': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), - 'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Subscription']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.notificationtype': { - 'Meta': {'object_name': 'NotificationType', 'db_table': "'notify_notificationtype'"}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}) - }, - 'django_notify.settings': { - 'Meta': {'object_name': 'Settings', 'db_table': "'notify_settings'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'interval': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label}) - }, - 'django_notify.subscription': { - 'Meta': {'object_name': 'Subscription', 'db_table': "'notify_subscription'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'latest': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'latest_for'", 'null': 'True', 'to': "orm['django_notify.Notification']"}), - 'notification_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.NotificationType']"}), - 'object_id': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'send_emails': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'settings': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['django_notify.Settings']"}) - } - } - - complete_apps = ['django_notify'] diff --git a/django_notify/migrations/__init__.py b/django_notify/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/django_notify/models.py b/django_notify/models.py deleted file mode 100644 index 6c29fba5b..000000000 --- a/django_notify/models.py +++ /dev/null @@ -1,173 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals -from django.db import models -from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ - -from django.contrib.contenttypes.models import ContentType - -from django_notify import settings - -class NotificationType(models.Model): - """ - Notification types are added on-the-fly by the - applications adding new notifications - """ - key = models.CharField( - max_length=128, - primary_key=True, - verbose_name=_('unique key'), - unique=True - ) - label = models.CharField( - max_length=128, - verbose_name=_('verbose name'), - blank=True, - null=True - ) - content_type = models.ForeignKey(ContentType, blank=True, null=True) - - def __unicode__(self): - return self.key - - class Meta: - db_table = settings.DB_TABLE_PREFIX + '_notificationtype' - verbose_name = _('type') - verbose_name_plural = _('types') - -class Settings(models.Model): - """ - Reusable settings object for a subscription - """ - - user = models.ForeignKey( - settings.USER_MODEL - ) - interval = models.SmallIntegerField( - choices=settings.INTERVALS, - verbose_name=_('interval'), - default=settings.INTERVALS_DEFAULT - ) - - def __unicode__(self): - obj_name = _("Settings for %s") % self.user.username - return unicode(obj_name) - - class Meta: - db_table = settings.DB_TABLE_PREFIX + '_settings' - verbose_name = _('settings') - verbose_name_plural = _('settings') - -class Subscription(models.Model): - - settings = models.ForeignKey(Settings) - notification_type = models.ForeignKey(NotificationType) - object_id = models.CharField( - max_length=64, - null=True, - blank=True, - help_text=_('Leave this blank to subscribe to any kind of object') - ) - send_emails = models.BooleanField(default=True) - latest = models.ForeignKey('Notification', - null=True, - blank=True, - related_name='latest_for' - ) - - def __unicode__(self): - obj_name = _("Subscription for: %s") % str(self.settings.user.username) - return unicode(obj_name) - - class Meta: - db_table = settings.DB_TABLE_PREFIX + '_subscription' - verbose_name = _('subscription') - verbose_name_plural = _('subscriptions') - -class Notification(models.Model): - - subscription = models.ForeignKey( - Subscription, - null=True, - blank=True, - on_delete=models.SET_NULL - ) - message = models.TextField() - url = models.CharField( - verbose_name=_('link for notification'), - blank=True, - null=True, - max_length=200 - ) - is_viewed = models.BooleanField(default=False) - is_emailed = models.BooleanField(default=False) - created = models.DateTimeField(auto_now_add=True) - occurrences = models.PositiveIntegerField( - default=1, - verbose_name=_('occurrences'), - help_text=_( - 'If the same notification was fired multiple ' - 'times with no intermediate notifications' - ) - ) - - @classmethod - def create_notifications(cls, key, **kwargs): - if not key or not isinstance(key, str): - raise KeyError('No notification key (string) specified.') - - object_id = kwargs.pop('object_id', None) - filter_exclude = kwargs.pop('filter_exclude', {}) - - objects_created = [] - subscriptions = Subscription.objects.filter( - Q(notification_type__key=key) | - Q(notification_type__key=None), - **filter_exclude - ) - if object_id: - subscriptions = subscriptions.filter( - Q(object_id=object_id) | - Q(object_id=None) - ) - - subscriptions = subscriptions.prefetch_related('latest', 'settings') - subscriptions = subscriptions.order_by('settings__user') - prev_user = None - - for subscription in subscriptions: - # Don't alert the same user several times even though overlapping - # subscriptions occur. - if subscription.settings.user == prev_user: - continue - - # Check if it's the same as the previous message - latest = subscription.latest - if latest and (latest.message == kwargs.get('message', None) and - latest.url == kwargs.get('url', None) and - latest.is_viewed == False): - # Both message and URL are the same, and it hasn't been viewed - # so just increment occurrence count. - latest.occurrences = latest.occurrences + 1 - latest.is_emailed = False - latest.save() - else: - # Insert a new notification - new_obj = cls.objects.create(subscription=subscription, **kwargs) - objects_created.append( - new_obj - ) - subscription.latest = new_obj - subscription.save() - prev_user = subscription.settings.user - - return objects_created - - def __unicode__(self): - return "%s: %s" % (str(self.subscription.settings.user), self.message) - - class Meta: - db_table = settings.DB_TABLE_PREFIX + '_notification' - verbose_name = _('notification') - verbose_name_plural = _('notifications') - ordering = ('-id',) diff --git a/django_notify/settings.py b/django_notify/settings.py deleted file mode 100644 index ad605ed19..000000000 --- a/django_notify/settings.py +++ /dev/null @@ -1,66 +0,0 @@ -from __future__ import unicode_literals -from django.conf import settings as django_settings -from django import VERSION as DJANGO_VERSION -from django.utils.translation import ugettext_lazy as _ - - -DB_TABLE_PREFIX = 'notify' - -# You need to switch this setting on, otherwise nothing will happen :) -ENABLED = getattr(django_settings, 'NOTIFY_ENABLED', True) - -# Enable django-admin registration -ENABLE_ADMIN = getattr(django_settings, 'NOTIFY_ENABLE_ADMIN', False) - -# Email notifications won't get sent unless you run -# python manage.py notifymail -SEND_EMAILS = getattr(django_settings, 'NOTIFY_SEND_EMAILS', True) - -EMAIL_SUBJECT = getattr(django_settings, - 'NOTIFY_EMAIL_SUBJECT', _("You have new notifications")) - -EMAIL_SENDER = getattr(django_settings, - 'NOTIFY_EMAIL_SENDER', "notifications@example.com") - -# Seconds to sleep between each database poll -# (leave high unless you really want to send extremely real time -# notifications) -NOTIFY_SLEEP_TIME = 120 - -# You can always make up more numbers... they simply identify which notifications -# to send when invoking the script, and the number indicates how many hours -# to minimum pass between each notification. -INSTANTLY = 0 -DAILY = (24 - 1) * 60 # Subtract 1, because the job finishes less than 24h before the next... -WEEKLY = 7 * (24 - 1) * 60 - -# List of intervals available. In minutes -INTERVALS = getattr(django_settings, 'NOTIFY_INTERVALS', - [(INSTANTLY, _('instantly')), - (DAILY, _('daily')), - (WEEKLY, _('weekly'))] -) - -INTERVALS_DEFAULT = INSTANTLY - -# Django 1.5+ -if DJANGO_VERSION >= (1,5): - USER_MODEL = getattr(django_settings, 'AUTH_USER_MODEL', 'auth.User') -else: - USER_MODEL = 'auth.User' - -#################### -# PLANNED SETTINGS # -#################### - -# Minimum logging and digital garbage! Don't save too much crap! - -# After how many days should viewed notifications be deleted? -AUTO_DELETE = getattr(django_settings, 'NOTIFY_AUTO_DELETE', 120) - -# After how many days should all types of notifications be deleted? -AUTO_DELETE_ALL = getattr(django_settings, 'NOTIFY_AUTO_DELETE_ALL', 120) - -NOTIFY_LOG = getattr(django_settings, 'NOTIFY_LOG', '/tmp/daemon_notify.log') - -NOTIFY_PID = getattr(django_settings, 'NOTIFY_PID', '/tmp/daemon_notify.pid') diff --git a/django_notify/templates/emails/notification_email_message.txt b/django_notify/templates/emails/notification_email_message.txt deleted file mode 100644 index d07f7bf26..000000000 --- a/django_notify/templates/emails/notification_email_message.txt +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %}{% autoescape off %}{% load url from future %}{% blocktrans with user.username as username %}Dear {{ username }},{% endblocktrans %} - -{% blocktrans with site.name as site %}These are the {{ digest }} notifications from {{ site }}.{% endblocktrans %} -{% for n in notifications %} - * {{ n.message }} - http://{{ site.domain }}{{n.url}} -{% endfor %} - -{% trans "Thanks for using our site!" %} - -{% trans "Sincerely" %}, -{{ site.name }} -{% endautoescape %} diff --git a/django_notify/templates/emails/notification_email_subject.txt b/django_notify/templates/emails/notification_email_subject.txt deleted file mode 100644 index 91f409be1..000000000 --- a/django_notify/templates/emails/notification_email_subject.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans with site.name as site %} {{ digest }} Notifications {{ site }}.{% endblocktrans %} diff --git a/django_notify/tests.py b/django_notify/tests.py deleted file mode 100644 index 501deb776..000000000 --- a/django_notify/tests.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) diff --git a/django_notify/urls.py b/django_notify/urls.py deleted file mode 100644 index 02a291c4f..000000000 --- a/django_notify/urls.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls import patterns, url - -urlpatterns = patterns('', - url('^json/get/$', 'django_notify.views.get_notifications', name='json_get'), - url('^json/get/(?P\d+)/$', 'django_notify.views.get_notifications', name='json_get'), - url('^json/mark-read/$', 'django_notify.views.mark_read', name='json_mark_read_base'), - url('^json/mark-read/(\d+)/$', 'django_notify.views.mark_read', name='json_mark_read'), - url('^json/mark-read/(?P\d+)/(?P\d+)/$', 'django_notify.views.mark_read', name='json_mark_read'), - url('^goto/(?P\d+)/$', 'django_notify.views.goto', name='goto'), - url('^goto/$', 'django_notify.views.goto', name='goto_base'), -) - -def get_pattern(app_name="notify", namespace="notify"): - """Every url resolution takes place as "notify:view_name". - https://docs.djangoproject.com/en/dev/topics/http/urls/#topics-http-reversing-url-namespaces - """ - return urlpatterns, app_name, namespace \ No newline at end of file diff --git a/django_notify/views.py b/django_notify/views.py deleted file mode 100644 index d251c4d49..000000000 --- a/django_notify/views.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals -from django_notify.decorators import json_view, login_required_ajax -from django_notify import models -from django.contrib.auth.decorators import login_required -from django.shortcuts import redirect, get_object_or_404 -from django.utils.translation import ugettext as _ - -@login_required_ajax -@json_view -def get_notifications(request, latest_id=None, is_viewed=False, max_results=10): - - notifications = models.Notification.objects.filter(subscription__settings__user=request.user,) - - if not is_viewed is None: - notifications = notifications.filter(is_viewed=is_viewed) - - if not latest_id is None: - notifications = notifications.filter(id__gt=latest_id) - - notifications = notifications.order_by('-id') - notifications = notifications.prefetch_related('subscription', 'subscription__notification_type') - - from django.contrib.humanize.templatetags.humanize import naturaltime - - return {'success': True, - 'total_count': notifications.count(), - 'objects': [{'pk': n.pk, - 'message': n.message, - 'url': n.url, - 'occurrences': n.occurrences, - 'occurrences_msg': _('%d times') % n.occurrences, - 'type': n.subscription.notification_type.key, - 'since': naturaltime(n.created)} for n in notifications[:max_results]]} - -@login_required -def goto(request, notification_id=None): - referer = request.META.get('HTTP_REFERER', '') - if not notification_id: - return redirect(referer) - notification = get_object_or_404(models.Notification, - subscription__settings__user=request.user, - id=notification_id) - notification.is_viewed=True - notification.save() - if not notification.url is None: - return redirect(notification.url) - return redirect(referer) - -@login_required_ajax -@json_view -def mark_read(request, id_lte, notification_type_id=None, id_gte=None): - - notifications = models.Notification.objects.filter(subscription__settings__user=request.user, - id__lte=id_lte) - - if notification_type_id: - notifications = notifications.filter(notification_type__id=notification_type_id) - - if id_gte: - notifications = notifications.filter(id__gte=id_gte) - - notifications.update(is_viewed=True) - - return {'success': True} diff --git a/docs/installation.rst b/docs/installation.rst index 2d1d888d9..1dc2b3858 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -101,7 +101,7 @@ maintain the order due to database relational constraints: 'django.contrib.sites', # django 1.6.2 'django.contrib.humanize', 'south', - 'django_notify', + 'django_nyt', 'mptt', 'sekizai', 'sorl.thumbnail', @@ -165,9 +165,9 @@ following lines at the end of your project's ``urls.py``. :: from wiki.urls import get_pattern as get_wiki_pattern - from django_notify.urls import get_pattern as get_notify_pattern + from django_nyt.urls import get_pattern as get_nyt_pattern urlpatterns += patterns('', - (r'^notify/', get_notify_pattern()), + (r'^notifications/', get_nyt_pattern()), (r'', get_wiki_pattern()) ) diff --git a/requirements.txt b/requirements.txt index c550107a1..b855f3aed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,9 @@ django>=1.4 -South Markdown>2.2.0 django-sekizai>=0.7 django-mptt>=0.5.3 -sorl-thumbnail==11.12.1b +sorl-thumbnail>=11.12.1b Pillow six +# Notification system +django-nyt>=0.9 \ No newline at end of file diff --git a/runtests.py b/runtests.py index 42540db3d..fd1eaee79 100755 --- a/runtests.py +++ b/runtests.py @@ -22,7 +22,7 @@ 'django.contrib.humanize', 'django.contrib.sites', 'south', - 'django_notify', + 'django_nyt', 'mptt', 'sekizai', 'sorl.thumbnail', diff --git a/setup.py b/setup.py index 28496ff46..c879771b4 100755 --- a/setup.py +++ b/setup.py @@ -8,19 +8,37 @@ # Used for the long_description. It's nice, because now 1) we have a top level # README file and 2) it's easier to type in the README file than to put a raw # string in below ... + + def get_path(fname): return os.path.join(os.path.dirname(__file__), fname) + def read(fname): return open(get_path(fname)).read() + +def dynamic_requirements(requirements): + + try: + from django import VERSION + if VERSION < (1, 7): + requirements.append("South>=0.8,!=0.8.3") + except ImportError: + # No django so assuming that a new one will + # get installed... + pass + return requirements + + packages = find_packages() try: import pypandoc long_description = pypandoc.convert(get_path('README.md'), 'rst') - long_description = long_description.split('')[0] + long_description = long_description.split( + '')[0] f = open(get_path('README.rst'), 'w') f.write(long_description) f.close() @@ -29,18 +47,18 @@ def read(fname): long_description = "" setup( - name = "wiki", - version = VERSION, - author = "Benjamin Bach", - author_email = "benjamin@overtag.dk", - url = "http://www.django-wiki.org", - description = "A wiki system written for the Django framework.", - license = "GPLv3", - keywords = "django wiki markdown", - packages=find_packages(exclude=["testproject","testproject.*"]), - #long_description=long_description, + name="wiki", + version=VERSION, + author="Benjamin Bach", + author_email="benjamin@overtag.dk", + url="http://www.django-wiki.org", + description="A wiki system written for the Django framework.", + license="GPLv3", + keywords="django wiki markdown", + packages=find_packages(exclude=["testproject", "testproject.*"]), + # long_description=long_description, zip_safe=False, - install_requires=read('requirements.txt').split("\n"), + install_requires=dynamic_requirements(read('requirements.txt').split("\n")), classifiers=[ 'Development Status :: 3 - Alpha', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', diff --git a/testproject/django_notify b/testproject/django_notify deleted file mode 120000 index 4451cc83c..000000000 --- a/testproject/django_notify +++ /dev/null @@ -1 +0,0 @@ -../django_notify \ No newline at end of file diff --git a/testproject/testproject/db/prepopulated-customauthuser.db b/testproject/prepopulated.db similarity index 73% rename from testproject/testproject/db/prepopulated-customauthuser.db rename to testproject/prepopulated.db index f4e6ff942..db314c44a 100644 Binary files a/testproject/testproject/db/prepopulated-customauthuser.db and b/testproject/prepopulated.db differ diff --git a/testproject/testproject/db/prepopulated.db b/testproject/testproject/db/prepopulated.db deleted file mode 100644 index ddfc30236..000000000 Binary files a/testproject/testproject/db/prepopulated.db and /dev/null differ diff --git a/testproject/testproject/settings/__init__.py b/testproject/testproject/settings/__init__.py index f2b29ff6b..30ffaa12e 100644 --- a/testproject/testproject/settings/__init__.py +++ b/testproject/testproject/settings/__init__.py @@ -14,7 +14,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': os_path.join(PROJECT_PATH, 'db', 'prepopulated.db'), # Or path to database file if using sqlite3. + 'NAME': 'prepopulated.db', # Or path to database file if using sqlite3. } } @@ -91,10 +91,9 @@ 'django.contrib.staticfiles', 'django.contrib.admin', 'django.contrib.admindocs', - 'south', 'sekizai', 'sorl.thumbnail', - 'django_notify', + 'django_nyt', 'wiki', 'wiki.plugins.macros', 'wiki.plugins.help', @@ -105,6 +104,15 @@ 'mptt', ] +from django import VERSION +if VERSION <= (1, 6): + INSTALLED_APPS.append('south') + SOUTH_MIGRATION_MODULES = { + 'django_nyt': 'django_nyt.south_migrations', + } +else: + TEST_RUNNER = 'django.test.runner.DiscoverRunner' + # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to # the site admins on every HTTP 500 error when DEBUG=False. @@ -162,4 +170,3 @@ from testproject.settings.local import * except ImportError: pass - diff --git a/testproject/testproject/urls.py b/testproject/testproject/urls.py index c9251c80b..4af75e022 100644 --- a/testproject/testproject/urls.py +++ b/testproject/testproject/urls.py @@ -19,7 +19,7 @@ ) from wiki.urls import get_pattern as get_wiki_pattern -from django_notify.urls import get_pattern as get_notify_pattern +from django_nyt.urls import get_pattern as get_notify_pattern urlpatterns += patterns('', (r'^notify/', get_notify_pattern()), (r'', get_wiki_pattern()) diff --git a/wiki/__init__.py b/wiki/__init__.py index ce250522b..7dc1e8fc2 100644 --- a/wiki/__init__.py +++ b/wiki/__init__.py @@ -15,4 +15,4 @@ # You should have received a copy of the GNU General Public License # along with django-wiki. If not, see . -VERSION = "0.0.23" +VERSION = "0.0.3" diff --git a/wiki/core/compat.py b/wiki/core/compat.py index 3a0f9ac80..fb1f9009e 100644 --- a/wiki/core/compat.py +++ b/wiki/core/compat.py @@ -4,7 +4,7 @@ from django.db import transaction from django.conf import settings as django_settings - + # Django 1.5+ if DJANGO_VERSION >= (1,5): USER_MODEL = getattr(django_settings, 'AUTH_USER_MODEL', 'auth.User') diff --git a/wiki/models/__init__.py b/wiki/models/__init__.py index 4175d6d84..21eb7148b 100644 --- a/wiki/models/__init__.py +++ b/wiki/models/__init__.py @@ -22,8 +22,8 @@ if not 'sekizai' in django_settings.INSTALLED_APPS: raise ImproperlyConfigured('django-wiki: needs sekizai in INSTALLED_APPS') -if not 'django_notify' in django_settings.INSTALLED_APPS: - raise ImproperlyConfigured('django-wiki: needs django_notify in INSTALLED_APPS') +#if not 'django_nyt' in django_settings.INSTALLED_APPS: +# raise ImproperlyConfigured('django-wiki: needs django_nyt in INSTALLED_APPS') if not 'django.contrib.humanize' in django_settings.INSTALLED_APPS: raise ImproperlyConfigured('django-wiki: needs django.contrib.humanize in INSTALLED_APPS') diff --git a/wiki/plugins/images/migrations/0001_initial.py b/wiki/plugins/images/migrations/0001_initial.py index 9d9f273eb..f08fab889 100644 --- a/wiki/plugins/images/migrations/0001_initial.py +++ b/wiki/plugins/images/migrations/0001_initial.py @@ -1,122 +1,20 @@ # -*- coding: utf-8 -*- -import datetime +from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) - - class Migration(SchemaMigration): def forwards(self, orm): - # Adding model 'Image' - db.create_table('images_image', ( - ('revisionplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wiki.RevisionPlugin'], unique=True, primary_key=True)), - ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), - ('caption', self.gf('django.db.models.fields.CharField')(max_length=2056, null=True, blank=True)), - )) - db.send_create_signal('images', ['Image']) - + pass def backwards(self, orm): - # Deleting model 'Image' - db.delete_table('images_image') - + pass models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'images.image': { - 'Meta': {'object_name': 'Image', '_ormbases': ['wiki.RevisionPlugin']}, - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'revisionplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wiki.RevisionPlugin']", 'unique': 'True', 'primary_key': 'True'}) - }, - 'wiki.article': { - 'Meta': {'object_name': 'Article'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'current_revision': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'current_set'", 'unique': 'True', 'null': 'True', 'to': "orm['wiki.ArticleRevision']"}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), - 'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'other_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'other_write': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'null': 'True', 'blank': 'True'}) - }, - 'wiki.articleplugin': { - 'Meta': {'object_name': 'ArticlePlugin'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wiki.Article']"}), - 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'wiki.articlerevision': { - 'Meta': {'ordering': "('created',)", 'unique_together': "(('article', 'revision_number'),)", 'object_name': 'ArticleRevision'}, - 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wiki.Article']"}), - 'automatic_log': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'content': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ip_address': ('django.db.models.fields.IPAddressField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), - 'locked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'previous_revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wiki.ArticleRevision']", 'null': 'True', 'blank': 'True'}), - 'redirect': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirect_set'", 'null': 'True', 'to': "orm['wiki.Article']"}), - 'revision_number': ('django.db.models.fields.IntegerField', [], {}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'null': 'True', 'blank': 'True'}), - 'user_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}) - }, - 'wiki.revisionplugin': { - 'Meta': {'object_name': 'RevisionPlugin', '_ormbases': ['wiki.ArticlePlugin']}, - 'articleplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wiki.ArticlePlugin']", 'unique': 'True', 'primary_key': 'True'}), - 'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wiki.ArticleRevision']"}) - } + } complete_apps = ['images'] \ No newline at end of file diff --git a/wiki/plugins/notifications/forms.py b/wiki/plugins/notifications/forms.py index 7d268d013..a53e3a0ca 100644 --- a/wiki/plugins/notifications/forms.py +++ b/wiki/plugins/notifications/forms.py @@ -3,8 +3,8 @@ from django.forms.models import modelformset_factory, BaseModelFormSet from django.utils.translation import ugettext as _ -from django_notify.models import Settings, NotificationType -from django_notify import settings as notify_settings +from django_nyt.models import Settings, NotificationType +from django_nyt import settings as notify_settings from django.contrib.contenttypes.models import ContentType from django.utils.safestring import mark_safe diff --git a/wiki/plugins/notifications/models.py b/wiki/plugins/notifications/models.py index e60cb9214..316db6973 100644 --- a/wiki/plugins/notifications/models.py +++ b/wiki/plugins/notifications/models.py @@ -4,8 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from django.db.models import signals -from django_notify import notify -from django_notify.models import Subscription +from django_nyt.utils import notify +from django_nyt.models import Subscription from wiki import models as wiki_models from wiki.models.pluginbase import ArticlePlugin diff --git a/wiki/plugins/notifications/settings.py b/wiki/plugins/notifications/settings.py index 6eae1be94..51bf6b18e 100644 --- a/wiki/plugins/notifications/settings.py +++ b/wiki/plugins/notifications/settings.py @@ -2,7 +2,7 @@ APP_LABEL = 'wiki' -# Key for django_notify - changing it will break any existing notifications. +# Key for django_nyt - changing it will break any existing notifications. ARTICLE_EDIT = "article_edit" SLUG = 'notifications' \ No newline at end of file diff --git a/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html b/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html index b8df40ef6..94f3ab4c1 100644 --- a/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html +++ b/wiki/plugins/notifications/templates/wiki/plugins/notifications/menubaritem.html @@ -17,9 +17,9 @@ {% addtoblock "js" %} {% endaddtoblock %} {% addtoblock "js" %}{% endaddtoblock %} diff --git a/wiki/templates/wiki/accounts/login.html b/wiki/templates/wiki/accounts/login.html index eac3dbced..9353a506d 100644 --- a/wiki/templates/wiki/accounts/login.html +++ b/wiki/templates/wiki/accounts/login.html @@ -4,23 +4,30 @@ {% block wiki_pagetitle %}wiki_pagetitle{% trans "Log in" %}{% endblock %} {% block wiki_contents %} -

{% trans "Please log in" %}

-
-{% wiki_form form %} -
-
-
- +
+
+
+

{% trans "Please log in" %}

+ + {% wiki_form form %} +
+
+
+ +
+
+ + +

+ {% trans "Don't have an account?" %} {% trans "Sign up" %} » +

+
+
- - -

- {% trans "Don't have an account?" %} {% trans "Sign up" %} » -

{% addtoblock "js" %}