Commit Graph
81 Commits
Author SHA1 Message Date
Robert Kolner dc6cb32cb4 Updated .gitignore file 2013-09-25 14:05:56 +02:00
Robert Kolner 609ed03b75 t pushMerge branch 'master' of git.neuf.no:dusken
* 'master' of git.neuf.no:dusken:
  Refactors group tests
  Adds test and changes and adds post helper
  Implements first membership tests
2013-09-18 20:53:54 +02:00
Robert Kolner 9a5376173a Membership endpoint no longer returns 400 on PATCH requests. 2013-09-18 20:53:49 +02:00
Robert Kolner 3a2cbc3d11 Added is_active-flag to PaymentType and MembershipType. 2013-09-18 19:25:52 +02:00
Robert Kolner 8fea26a1cd Added membership/type. 2013-09-11 22:31:24 +02:00
Robert Kolner 5e076a9bf6 Fixed tests. 2013-09-11 20:18:58 +02:00
Robert Kolner 11f0949337 Merge branch 'master' of git.neuf.no:dusken
* 'master' of git.neuf.no:dusken:
  Moves save address into separate function
2013-09-11 19:51:41 +02:00
Robert Kolner 96c3a6faba Not working version of tests. I fail english. 2013-09-11 19:51:30 +02:00
Robert Kolner d7d4e10995 More consistent naming. 2013-08-28 20:13:04 +02:00
Robert Kolner 2c2585fe5b Added check for registering of existing members. 2013-08-28 20:04:41 +02:00
Robert Kolner f5bfcea72e Fixed crashes when PATCHing user and not providing address. 2013-08-28 19:41:00 +02:00
Robert Kolner 752a2a3b36 Tests didn't work because of hardcoded member_id=1 and address_id=1. The solution is not beautiful, but more probable to work. 2013-08-28 19:33:23 +02:00
Robert Kolner 2c37da6240 Added more fields to admin. 2013-08-21 22:37:13 +02:00
Robert Kolner ed50ea3c7d Customize admin-interface for member-class. 2013-08-21 22:18:39 +02:00
Robert Kolner 6051d61a4a Merge branch 'master' of git.neuf.no:dusken 2013-08-21 21:29:05 +02:00
Robert Kolner 27ed4a5fb1 Oops. 2013-08-21 21:28:57 +02:00
Robert Kolner 86ef0c31ef Merge branch 'master' of git.neuf.no:dusken 2013-08-21 21:07:28 +02:00
Robert Kolner 0d13ec21f2 Improving User-view in admin interface. 2013-08-21 21:05:18 +02:00
Robert Kolner 2c22c992dd Added __unicode__ functions to most models. 2013-08-21 20:42:07 +02:00
Robert Kolner 5b8aaae7a8 Removed Django User-model from admin interface and included its fields in Member-model 2013-08-21 20:18:13 +02:00
Robert Kolner 3e2601f84e Added /group/<id>/members/(<id>)? endpoints and updated tests somewhat. 2013-07-20 22:27:44 +02:00
Robert Kolner 2c50b83c7c Oops. 2013-07-20 15:17:48 +02:00
Robert Kolner 93c07ebb1d Merge branch 'master' of git.neuf.no:dusken 2013-07-20 15:14:52 +02:00
Robert Kolner 08532d4b0a Fixed password setting for members. 2013-07-20 15:14:37 +02:00
Robert Kolner bf7783b16e Abstraction <3 2013-07-15 15:28:19 +02:00
Robert Kolner 6451b45c91 Slightly updated member test. 2013-07-15 15:13:43 +02:00
Robert Kolner 3ead7ee016 Fixed DELETE requests for /member/<id>/group/<id>/ 2013-07-15 15:01:20 +02:00
Robert Kolner 56cbf16ac2 Fixed creation of relationships with POST-requests for /member/<id>/groups/<id>/ 2013-07-15 14:55:26 +02:00
Robert Kolner 2d997156b9 Better handling of GET request for /member/<id>/group/<id>/ - changed format somewhat and made code more tastypieish. 2013-07-15 14:42:34 +02:00
Robert Kolner ecd1bdcd9f Add address to /member/ 2013-07-15 14:12:17 +02:00
Robert Kolner fda43b31d3 It was so long ago I can't remember, but it looks important. 2013-07-15 13:53:52 +02:00
Robert Kolner b782322911 Ooops 2013-06-26 18:58:58 +02:00
Robert Kolner 3f2b364df5 Added Sphinx. 2013-06-26 18:55:18 +02:00
Robert Kolner b47abde067 New stuff 2013-06-26 18:17:54 +02:00
Robert Kolner 9943fb1165 Fancier docs. 2013-06-07 15:31:28 +02:00
Robert Kolner 6e5c3a89c7 Added Sphinx-based docs. 2013-06-05 20:00:51 +02:00
Robert Kolner cc384c4409 Delete in memberresource returns 204: No Content. 2013-06-05 19:59:38 +02:00
Robert Kolner 3e809931c3 Updates to member class 2013-06-05 19:46:20 +02:00
Robert Kolner d0dc823274 Some things, I think. Not sure what, but it's probably important enough to commit. 2013-05-29 20:02:05 +02:00
Robert Kolner 4929b14bcf Added few tests to membersbygroup and added possibility of checking if a user belongs to a given group. 2013-05-22 21:09:24 +02:00
Robert Kolner 65bb15ee32 Replaced tabs with spaces. 2013-05-22 19:39:46 +02:00
Robert Kolner fb9f02f995 Removed last references to old directory structure. 2013-05-22 19:22:54 +02:00
Robert Kolner 1f7976ade5 Merge branch 'master' of git.neuf.no:dusken 2013-05-22 19:01:33 +02:00
Robert Kolner 07a0b703b8 Added few non-functional tests to members by groups. 2013-05-22 19:01:00 +02:00
Robert Kolner 371a26c62c Removed fixtures. Who needs them anyway? 2013-04-17 21:53:15 +02:00
Robert Kolner 3f9f13d462 Added members by group. No tests. Yet. 2013-04-17 21:00:27 +02:00
Robert Kolner d0fb2c3c0a Added resource for gettings all groups a member is part of. TODO: No tests yet. 2013-04-17 20:48:53 +02:00
Robert Kolner 5b45af2850 Style. 2013-04-10 18:22:04 +02:00
Robert Kolner eb45d7aa00 Member class now extends User (new in Django 1.5). Fixed all other files to work with this change. 2013-03-21 14:00:44 +01:00
Robert Kolner 48ae4107c5 Updated requirements: django to 1.5 and tastypie to 0.9.14. Removed unused tests which didn't work. 2013-03-21 13:15:37 +01:00
Robert Kolner c69349c081 models.Group extends default Django Group class instead of being a normal model. Adjusted the testdata and the api to accomodate for those changes. 2013-03-21 13:02:18 +01:00
Robert Kolner 14614cca57 Updated testdata with natural keys and some indenting. 2013-03-20 19:58:52 +01:00
Robert Kolner 2974e84c51 Basic admin interface improvement. 2013-03-20 19:53:08 +01:00
Robert Kolner 07d4c45ca9 Member: Added functions called when creating user/changing password. 2013-02-22 14:35:05 +01:00
Robert Kolner 71c5140743 More detailed request types in member 2013-02-22 14:19:38 +01:00
Robert Kolner ed0897a9ec Added more detailed test for request types. 2013-02-22 14:19:13 +01:00
Robert Kolner 657cb634e8 Added tests for changing users. 2013-02-22 00:32:34 +01:00
Robert Kolner b092e04a63 Added PATCH-request type to Member class, to allow changing of existing Members and Users. 2013-02-22 00:31:17 +01:00
Robert Kolner 5c48d08449 Created test for creating Members through POST-requests. 2013-02-21 18:37:30 +01:00
Robert Kolner f907292af2 Create User when creating Member. 2013-02-21 18:36:30 +01:00
Robert Kolner d49f74b806 More exhaustive get_members test. 2013-02-21 14:54:52 +01:00
Robert Kolner 6ae201c71c Fixed implementation to match tests. 2013-02-21 14:36:57 +01:00
Robert Kolner 59b0efc84a Fixed tests to match testdata. 2013-02-21 14:36:48 +01:00
Robert Kolner 16c5274d3d Updated testdata. 2013-02-21 14:36:11 +01:00
Robert Kolner 3c5f4dbacf Added .bak files to .gitignore 2013-02-21 12:40:22 +01:00
Robert Kolner d7e19545c0 Integrated Member with User class builtin in Django. Breaks tests due to old fixture-file. 2013-02-21 12:31:44 +01:00
Robert Kolner e661d8b16c Removed password from returened fields in member. 2013-02-21 00:09:57 +01:00
Robert Kolner d4524c9b13 Fixed key errors in membership test. 2013-02-20 23:01:57 +01:00
Robert Kolner c9dd5418d1 Added groupmembership resource. 2013-02-20 22:52:52 +01:00
Robert Kolner 72a8e4b81b Updated tests. 2013-02-20 22:52:33 +01:00
Robert Kolner 45a170f619 Return member id instead of member url. 2013-02-20 22:19:12 +01:00
Robert Kolner 7015d7c6af Added expiration date. 2013-02-20 21:33:28 +01:00
Robert Kolner c244ab5545 Added stub for membership resource/tests. 2013-02-20 20:29:18 +01:00
Robert Kolner 4cea50ae6c Merge in my changes. 2013-02-03 14:27:28 +01:00
Robert Kolner f1a1093593 Added endpoint and test stub for groups. 2013-02-02 09:39:02 +01:00
Robert Kolner 83bc9e75bf Changed name of file to be more consistane with the naming scheme. 2013-02-02 09:23:24 +01:00
Robert Kolner 79e08bbb8e Slightly improved some of existing tests. Added stubs for two new tests. 2013-02-02 09:21:08 +01:00
Robert Kolner a518ec81d3 Added test data for new models, adjusted tests. 2013-02-01 18:06:38 +01:00
Robert Kolner 520e8f8872 Moved api to an own module. Improved member-tests. 2013-02-01 13:43:38 +01:00
Robert Kolner c4da4f4393 Added an uncomplete test for getting all members. 2013-01-29 00:18:04 +01:00
Robert Kolner 25b4ba1252 Moved tests to an own module. Added fixtures. Added simple (working) test for fetching a member using the api. 2013-01-28 22:44:43 +01:00