Commit Graph

Select branches

Hide Pull Requests

master

nikolark

Mono Color

• 2397558921 Adds reference to Dropbox webhook api master nikolark 2014-06-05 22:45:48 +02:00
• 8905777381 Creation of a stub for documentation of authentication required to access our creation, followed by a realization that I used the word 'creation' twice in this short summation. Robert Kolner 2014-02-12 22:34:48 +01:00
• 010b3cffe7 README update nikolark 2014-01-26 23:55:52 +01:00
• e3af284598 Allow null values in /me nikolark 2014-01-26 18:50:36 +01:00
• 025c26997a Minor nikolark 2014-01-26 17:29:31 +01:00
• 63e3ac208c We don't use apikey. Robert Kolner 2014-01-23 21:05:39 +01:00
• 6922e9d858 Minor nikolark 2014-01-23 19:44:59 +01:00
• 3128fdfc06 Merge branch 'master' of git.neuf.no:dusken nikolark 2013-12-27 22:55:59 +01:00
• 9bc68f15df MeResource: cleanups and fixes nikolark 2013-12-27 22:55:55 +01:00
• f1835df34b Multiple inheritance win nikolark 2013-12-27 14:13:53 +01:00
• 945f3ac607 Starts MeResource, groupprofile, misc nikolark 2013-12-26 02:14:55 +01:00
• e9002dc035 Removes authentication view nikolark 2013-12-25 17:27:30 +01:00
• 325ec39570 Minor nikolark 2013-12-22 02:21:06 +01:00
• ab8fc5cd08 Django 1.6 simplified settings file nikolark 2013-12-13 15:58:29 +01:00
• bea04d5e4f Bump to django and tastypie version nikolark 2013-12-13 15:48:34 +01:00
• abed9bfc46 Minor nikolark 2013-12-13 15:37:46 +01:00
• 16db46e496 Implement the oauth2 auth with tests nikolark 2013-12-12 23:30:30 +01:00
• ec91fb6903 I think OAuth2 access token fetching might actually kind of almost work. Robert Kolner 2013-12-11 20:03:27 +01:00
• 63894a93ff Work on MemberCreateResource, cleanups, README updates, misc nikolark 2013-12-08 23:51:17 +01:00
• 36dd948e8e Partial commit nikolark 2013-12-08 12:50:26 +01:00
• 01f2b15649 Updated tests. Robert Kolner 2013-12-07 18:25:50 +01:00
• d312c6538f Return 403 instead of 400 if resource exists nikolark 2013-12-07 18:25:27 +01:00
• 8cff258d2c Put member register under member/register. Robert Kolner 2013-12-07 18:23:47 +01:00
• 12f17d8d9f Fixes group fixtures nikolark 2013-12-04 22:14:34 +01:00
• 5d327aaa8b Removes site app nikolark 2013-11-30 12:51:27 +01:00
• c8ff48a496 Enable Foreign Key support on sqlite nikolark 2013-11-30 12:47:17 +01:00
• aca11a7381 Friendly CORS defaults nikolark 2013-11-30 12:09:41 +01:00
• 267bcbf54a settings-sample update nikolark 2013-11-29 00:10:31 +01:00
• b008bb134b TODO authorization nikolark 2013-11-28 10:35:58 +01:00
• 9db15e6efa Filter /member by email nikolark 2013-11-27 00:04:52 +01:00
• d898288b41 Use Django methods for user data nikolark 2013-11-25 11:47:42 +01:00
• 7bba5770e8 Moves create member to separate resource. nikolark 2013-11-24 01:52:17 +01:00
• cacc1b1b94 Refactors some of the test stuff and re-started on group tests Mark Polak 2013-11-06 20:26:32 +01:00
• 9a017217af The user should be able to get his api key nikolark 2013-10-27 21:22:03 +01:00
• 3b2cfcc2c2 Make Travis CI less chatty nikolark 2013-10-21 15:53:55 +02:00
• afbea17f62 README upd nikolark 2013-10-21 15:51:20 +02:00
• 7b09f0e237 README updates nikolark 2013-10-21 15:36:26 +02:00
• b03bbd7552 Link to our docs nikolark 2013-10-20 19:06:50 +02:00
• 358ba55d79 README updates nikolark 2013-10-20 16:35:11 +02:00
• 0c54be7d84 Adds services stubs, minor cleanups nikolark 2013-10-20 15:34:15 +02:00
• da81adc2e0 Move end_date attr to Membership nikolark 2013-10-20 00:24:55 +02:00
• 99cf7cd1bb Membership: Permissions, cleanups, green tests nikolark 2013-10-20 00:18:00 +02:00
• 9961cea151 Change member.phone_number to string nikolark 2013-10-18 02:37:51 +02:00
• badd9b4698 Give Tastypie python-mimeparse nikolark 2013-10-18 02:17:08 +02:00
• 4e35307501 Use Member as the Django User model, auth fixes nikolark nikolark 2013-10-18 02:03:07 +02:00
• 42e83727dd Nikolais ninja workbranch nikolark 2013-10-17 14:51:44 +02:00
• d7659c4a17 Travis nikolark 2013-10-17 14:49:37 +02:00
• 320e10dbbb Travis CI postgresql nikolark 2013-10-17 10:46:07 +02:00
• 8d03acdf4f Merge branch 'master' of git.neuf.no:dusken Mark Polak 2013-10-16 20:58:45 +02:00
• 08ffe4b2f3 Tests working as intended, it seems the failing tests actually fail Mark Polak 2013-10-16 20:58:23 +02:00
• 1801968fba Adds travis file nikolark 2013-10-16 20:40:32 +02:00
• ff13f00c2b Adds groups fixture and adds it to recreate script Mark Polak 2013-10-16 19:21:46 +02:00
• e6571ec6fd Salt updates nikolark 2013-10-15 21:45:52 +02:00
• 2c17e1f4d5 Organizes models.py, adds ISO 3166-1 contry code nikolark 2013-10-15 21:44:39 +02:00
• b084ac3634 Nothing important. Robert Kolner 2013-10-08 14:18:27 +02:00
• ab0bdcb189 Fixed obj_update function signature. Robert Kolner 2013-09-25 14:06:12 +02:00
• dc6cb32cb4 Updated .gitignore file Robert Kolner 2013-09-25 14:05:56 +02:00
• 609ed03b75 t pushMerge branch 'master' of git.neuf.no:dusken Robert Kolner 2013-09-18 20:53:54 +02:00
• 9a5376173a Membership endpoint no longer returns 400 on PATCH requests. Robert Kolner 2013-09-18 20:53:49 +02:00
• 439131f95c Refactors group tests Mark Polak 2013-09-18 20:22:39 +02:00
• 24446f10f0 Adds test and changes and adds post helper Mark Polak 2013-09-18 19:58:34 +02:00
• cbbe0df4c5 Merge branch 'membership' Mark Polak 2013-09-18 19:29:15 +02:00
• 4f40389e47 Implements first membership tests Mark Polak 2013-09-18 19:28:36 +02:00
• 3a2cbc3d11 Added is_active-flag to PaymentType and MembershipType. Robert Kolner 2013-09-18 19:25:52 +02:00
• 8fea26a1cd Added membership/type. Robert Kolner 2013-09-11 22:31:24 +02:00
• 9686821aa7 Adds new fixtures and started on membership tests Mark Polak 2013-09-11 22:12:38 +02:00
• c256c8d522 Removes unused fixtures call Mark Polak 2013-09-11 20:25:28 +02:00
• 3bcb4819cb Removes PDB Mark Polak 2013-09-11 20:21:34 +02:00
• 5e076a9bf6 Fixed tests. Robert Kolner 2013-09-11 20:18:58 +02:00
• 11f0949337 Merge branch 'master' of git.neuf.no:dusken Robert Kolner 2013-09-11 19:51:41 +02:00
• 96c3a6faba Not working version of tests. I fail english. Robert Kolner 2013-09-11 19:51:30 +02:00
• 6a24b3a173 Moves save address into separate function Mark Polak 2013-09-11 18:42:02 +02:00
• d7d4e10995 More consistent naming. Robert Kolner 2013-08-28 20:13:04 +02:00
• 2c2585fe5b Added check for registering of existing members. Robert Kolner 2013-08-28 20:04:41 +02:00
• f5bfcea72e Fixed crashes when PATCHing user and not providing address. Robert Kolner 2013-08-28 19:41:00 +02:00
• 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. Robert Kolner 2013-08-28 19:33:23 +02:00
• 48ae9537ea Adds Json as the default response type to the sample settings file Mark Polak 2013-08-22 00:54:58 +02:00
• de4effaadb Merges working branch into master Mark Polak 2013-08-22 00:46:33 +02:00
• 2078d323ed Adds tests and production code for updating an address though the member api, additionally adds fixtures and functions to load them Mark Polak 2013-08-22 00:43:49 +02:00
• 2c37da6240 Added more fields to admin. Robert Kolner 2013-08-21 22:37:13 +02:00
• ed50ea3c7d Customize admin-interface for member-class. Robert Kolner 2013-08-21 22:18:39 +02:00
• 32ed0c17e7 Adds fixtures and (re)create database script for sqlite Mark Polak 2013-08-21 21:55:55 +02:00
• 6051d61a4a Merge branch 'master' of git.neuf.no:dusken Robert Kolner 2013-08-21 21:29:05 +02:00
• 27ed4a5fb1 Oops. Robert Kolner 2013-08-21 21:28:57 +02:00
• 6276b540a2 Merges working branch into master Mark Polak 2013-08-21 21:23:30 +02:00
• 323eed5bee Adds models to admin and adds plural name to models Mark Polak 2013-08-21 21:22:07 +02:00
• 86ef0c31ef Merge branch 'master' of git.neuf.no:dusken Robert Kolner 2013-08-21 21:07:28 +02:00
• 0d13ec21f2 Improving User-view in admin interface. Robert Kolner 2013-08-21 21:05:18 +02:00
• 630bc1d404 Small refactoring of the member test classes Mark Polak 2013-08-21 20:53:24 +02:00
• 2c22c992dd Added __unicode__ functions to most models. Robert Kolner 2013-08-21 20:42:07 +02:00
• 522dcc65a9 Merge branch 'master' of git://git.neuf.no/dusken Mark Polak 2013-08-21 20:19:33 +02:00
• 5b8aaae7a8 Removed Django User-model from admin interface and included its fields in Member-model Robert Kolner 2013-08-21 20:18:13 +02:00
• 1354e7ec7b Removed obsolete tests and removes MySQL-python from requirements file Mark Polak 2013-08-21 20:16:51 +02:00
• 1e6af11d64 Partial salt-based developer environment nikolark 2013-08-21 15:38:41 +02:00
• 3e2601f84e Added /group/<id>/members/(<id>)? endpoints and updated tests somewhat. Robert Kolner 2013-07-20 22:27:44 +02:00
• 2c50b83c7c Oops. Robert Kolner 2013-07-20 15:17:48 +02:00
• 93c07ebb1d Merge branch 'master' of git.neuf.no:dusken Robert Kolner 2013-07-20 15:14:52 +02:00
• 08532d4b0a Fixed password setting for members. Robert Kolner 2013-07-20 15:14:37 +02:00
• fb924eaffd Remove reference ti refactored endpoints. Fix depr warning nikolark 2013-07-20 14:00:38 +02:00
• bf7783b16e Abstraction <3 Robert Kolner 2013-07-15 15:28:19 +02:00