Commit Graph
94 Commits
Author SHA1 Message Date
Mark Polak de4effaadb Merges working branch into master 2013-08-22 00:46:33 +02:00
Mark Polak 2078d323ed Adds tests and production code for updating an address though the member api, additionally adds fixtures and functions to load them 2013-08-22 00:43:49 +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
Mark Polak 32ed0c17e7 Adds fixtures and (re)create database script for sqlite 2013-08-21 21:55:55 +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
Mark Polak 6276b540a2 Merges working branch into master 2013-08-21 21:23:30 +02:00
Mark Polak 323eed5bee Adds models to admin and adds plural name to models 2013-08-21 21:22:07 +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
Mark Polak 630bc1d404 Small refactoring of the member test classes 2013-08-21 20:53:24 +02:00
Robert Kolner 2c22c992dd Added __unicode__ functions to most models. 2013-08-21 20:42:07 +02:00
Mark Polak 522dcc65a9 Merge branch 'master' of git://git.neuf.no/dusken
* 'master' of git://git.neuf.no/dusken:
  Removed Django User-model from admin interface and included its fields in Member-model
2013-08-21 20:19:33 +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
Mark Polak 1354e7ec7b Removed obsolete tests and removes MySQL-python from requirements file 2013-08-21 20:16:51 +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
nikolark fb924eaffd Remove reference ti refactored endpoints. Fix depr warning 2013-07-20 14:00:38 +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
misund 6c02b6d9ab Merge branch 'master' of git.neuf.no:dusken 2013-06-26 23:26:22 +02:00
misund cfc737e002 Merging changes to membership and institution docs. 2013-06-26 23:25:42 +02:00
ponas 03a81e65b6 Small changes in README and settings-sample.py 2013-06-26 23:22:52 +02:00
misund ff8e98b681 Documenting memberships. 2013-06-26 23:22:48 +02:00
Paal Braathen 68c80722e9 Added __unicode__ to model classes 2013-06-26 22:00:27 +02:00
Paal Braathen 41435ed077 Added institution endpoint 2013-06-26 19:37:39 +02:00
Robert Kolner 9943fb1165 Fancier docs. 2013-06-07 15:31:28 +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
nikolark b4abda4f43 Saner directory structure 2013-05-19 16:19:03 +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