summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Use real AS object by passing it through the requesterLuke Barnard2016-10-201-7/+7
* Merge pull request #1157 from Rugvip/nolimitErik Johnston2016-10-111-4/+3
|\
| * storage/appservice: make appservice methods only relying on the cache synchro...Patrik Oldsberg2016-10-061-4/+3
* | api/auth: fix for not being allowed to set your own state_keyPatrik Oldsberg2016-09-301-10/+0
|/
* Update commentsErik Johnston2016-09-221-2/+3
* Add commentsErik Johnston2016-09-221-0/+3
* Shuffle things around to make unit tests workErik Johnston2016-09-221-14/+15
* Allow invites via 3pid to bypass sender sig checkErik Johnston2016-09-221-1/+16
* Add helper function for getting access_tokens from requestsMark Haines2016-09-091-7/+51
* Handle the fact that workers can't generate state groupsErik Johnston2016-08-311-2/+4
* Correctly handle the difference between prev and current stateErik Johnston2016-08-311-2/+2
* Cache check_host_in_roomErik Johnston2016-08-261-14/+6
* Add measure on check_host_in_roomErik Johnston2016-08-261-11/+12
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_idsErik Johnston2016-08-262-1/+5
|\
| * Move ThirdPartyEntityKind into api.constants so the expectation becomes that ...Paul "LeoNerd" Evans2016-08-251-0/+5
| * APP_SERVICE_PREFIX is never used; don't botherPaul "LeoNerd" Evans2016-08-251-1/+0
* | Pull out full state lessErik Johnston2016-08-251-6/+7
* | Replace context.current_state with context.current_state_idsErik Johnston2016-08-251-24/+44
|/
* Fix login with m.login.tokenRichard van der Hoff2016-08-081-15/+30
* Merge pull request #952 from matrix-org/markjh/more_fixesMark Haines2016-07-261-0/+4
|\
| * Check if the user is banned when handling 3pid invitesMark Haines2016-07-261-0/+4
* | Add `create_requester` functionRichard van der Hoff2016-07-261-13/+11
|/
* Record device_id in client_ipsRichard van der Hoff2016-07-201-6/+23
* More doc-commentsRichard van der Hoff2016-07-201-3/+2
* Merge pull request #922 from matrix-org/erikj/file_api2Erik Johnston2016-07-201-3/+20
|\
| * Add 'contains_url' to filterErik Johnston2016-07-141-3/+20
* | Fix 500 ISE when sending alias event without a state_keyMark Haines2016-07-151-0/+5
* | Merge pull request #919 from matrix-org/erikj/auth_fixErik Johnston2016-07-151-1/+25
|\ \
| * | Check sender signed eventErik Johnston2016-07-141-2/+8
| * | Check if alias event's state_key matches sender's domainErik Johnston2016-07-131-0/+11
| * | Check creation event's room_id domain matches sender'sErik Johnston2016-07-131-0/+7
* | | Merge pull request #918 from negzi/bugfix_for_token_expiryErik Johnston2016-07-141-0/+3
|\ \ \ | |_|/ |/| |
| * | Bug fix: expire invalid access tokensNegar Fazeli2016-07-131-0/+3
| |/
* / Implement https://github.com/matrix-org/matrix-doc/pull/346/filesDavid Baker2016-07-081-0/+1
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-07-081-5/+10
|\
| * Fix bug where we did not correctly explode when multiple user_ids were set in...Erik Johnston2016-07-071-5/+10
* | requestToken updateDavid Baker2016-06-301-1/+2
|/
* Working unsubscribe links going straight to the HSDavid Baker2016-06-021-0/+7
* Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-021-0/+18
|\
| * special case m.room.third_party_invite event auth to match invites, otherwise...Matthew Hodgson2016-06-011-0/+18
* | WIP on unsubscribing email notifs without logging inDavid Baker2016-06-011-9/+16
|/
* Spell "domain" correctlyMark Haines2016-05-161-8/+8
* Create user with expiryNegi Fazeli2016-05-131-1/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-091-8/+8
|\
| * Add and use get_domian_from_idErik Johnston2016-05-091-8/+8
* | Implement basic ignore userErik Johnston2016-05-041-3/+5
|/
* Measure Auth.checkErik Johnston2016-04-131-47/+50
* Don't auto log failed auth checksErik Johnston2016-04-131-53/+45
* Add published room list edit APIErik Johnston2016-03-211-4/+50
* Send the user ID matching the guest access token, since there is no Matrix AP...David Baker2016-03-071-2/+2
* Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-231-21/+36
* Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-191-1/+0
|\
| * Check presence state is a valid oneErik Johnston2016-02-181-1/+0
* | api/filtering: don't assume that event content will always be a dictPatrik Oldsberg2016-02-171-1/+4
|/
* Revert "Merge two of the room join codepaths"Daniel Wagner-Hall2016-02-121-5/+0
* Merge two of the room join codepathsDaniel Wagner-Hall2016-02-121-0/+5
* Fix up logcontextsErik Johnston2016-02-081-1/+3
* Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-051-1/+2
* Log more diagnostics for unrecognised access tokensDaniel Wagner-Hall2016-02-021-0/+2
* Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-021-1/+1
* Fix testErik Johnston2016-01-281-0/+5
* Fix testsErik Johnston2016-01-251-1/+1
* Move logic from rest/ to handlers/Erik Johnston2016-01-251-12/+10
* Sanitize filtersErik Johnston2016-01-221-21/+27
* Don't error on AS non-ghost user useDaniel Wagner-Hall2016-01-181-0/+2
* Pull out app service user lookupDaniel Wagner-Hall2016-01-181-31/+28
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-0/+1
* M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-151-1/+1
* Add specific error code for invalid user names.David Baker2016-01-141-0/+1
* Require AS users to be registered before useDaniel Wagner-Hall2016-01-131-0/+5
* Introduce a Requester objectDaniel Wagner-Hall2016-01-111-3/+5
* copyrightsMatthew Hodgson2016-01-076-6/+6
* Guest users must be joined to a room to see it in /syncMark Haines2016-01-062-28/+0
* Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-051-3/+3
* Include the list of bad room ids in the errorMark Haines2015-12-221-0/+16
* Merge remote-tracking branch 'origin/develop' into markjh/guest_accessMark Haines2015-12-221-0/+5
|\
| * Add top level filters for filtering by room idMark Haines2015-12-221-33/+35
* | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-221-0/+12
* | Add top level filtering by room idMark Haines2015-12-211-33/+30
|/
* Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-171-1/+1
* Only include the archived rooms if a include_leave flag in set in the filterMark Haines2015-12-041-0/+4
* Add API for setting account_data globaly or on a per room basisMark Haines2015-12-011-1/+8
* Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
* Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-192-13/+22
|\
| * Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-191-5/+5
| |\
| | * s/private_user_data/account_data/Mark Haines2015-11-181-5/+5
| * | Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-191-8/+17
| |/
* / Allow users to forget roomsDaniel Wagner-Hall2015-11-171-0/+7
|/
* Always check guest = true in macaroonsSteven Hammerton2015-11-171-1/+2
* Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-171-0/+1
|\
| * Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-101-0/+1
* | Share more code between macaroon validationSteven Hammerton2015-11-111-9/+10
|/
* Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-35/+38
* Merge pull request #347 from matrix-org/markjh/check_filterMark Haines2015-11-051-18/+2
|\
| * Remove fields that are both unspecified and unused from the filter checks, ch...Mark Haines2015-11-041-18/+2
* | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-042-41/+55
|/
* Include room tags in v2 /syncMark Haines2015-11-021-0/+7
* Merge pull request #323 from matrix-org/daniel/sizelimitsDaniel Wagner-Hall2015-10-232-1/+30
|\
| * Reject events which are too largeDaniel Wagner-Hall2015-10-222-1/+30
* | Merge pull request #325 from matrix-org/markjh/filter_dictsMark Haines2015-10-221-3/+22
|\ \
| * | Don't assume that the event has a room_id or senderMark Haines2015-10-221-2/+2
| * | Support filtering events represented as dicts.Mark Haines2015-10-221-3/+22
* | | Filter room ids before hitting the databaseErik Johnston2015-10-211-0/+20
|/ /
* | DocstringErik Johnston2015-10-201-0/+5
* | Refactor api.filtering to have a Filter APIErik Johnston2015-10-201-98/+55
|/
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-1/+5
* Stuff signed data in a standalone objectDaniel Wagner-Hall2015-10-161-7/+14
* Add signing host and keyname to signaturesDaniel Wagner-Hall2015-10-161-5/+9
* Verify third party ID server certificatesDaniel Wagner-Hall2015-10-161-0/+11
* Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-151-18/+44
|\
| * Update the v2 filters to support filtering presence and remove support for pu...Mark Haines2015-10-131-18/+44
* | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-131-3/+3
* | Add some docstringDaniel Wagner-Hall2015-10-131-0/+15
* | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-9/+12
* | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+0
|\|
| * Remove log line that was generated whenever an error was created. We are now ...Mark Haines2015-10-061-1/+0
* | Add third party invites to auth_events for joinsDaniel Wagner-Hall2015-10-061-0/+5
* | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-052-1/+25
|\|
| * Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-021-0/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-023-19/+140
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-141-8/+27
| |\ \
| * | | Also check the domains for membership state_keysErik Johnston2015-09-011-0/+9
| * | | Merge branch 'erikj/check_room_exists' into erikj/unfederatableErik Johnston2015-09-011-0/+8
| |\ \ \
| * | | | Check against sender rather than event_idErik Johnston2015-09-011-3/+3
| * | | | Add flag which disables federation of the roomErik Johnston2015-09-011-1/+15
* | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-012-1/+33
| |_|_|/ |/| | |
* | | | synapse/api/errors.py:RoomError was unusedMark Haines2015-09-221-5/+0
* | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-11/+51
|\ \ \ \
| * | | | Clarify which event is returned by check_user_was_in_roomMark Haines2015-09-211-2/+3
| * | | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-091-11/+0
| * | | | Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-091-1/+2
| * | | | Allow room initialSync for users that have left the room, returning a snapsho...Mark Haines2015-09-091-0/+49
* | | | | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-141-3/+89
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-011-10/+10
| * | | | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-261-9/+95
| | |/ / | |/| |
* | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-141-0/+8
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix testsErik Johnston2015-09-011-1/+1
| * | Check room exists when authenticating an event, by asserting they reference a...Erik Johnston2015-09-011-0/+8
| |/
* | Check domain of events properlyDaniel Wagner-Hall2015-09-011-1/+3
* | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-281-8/+25
|/
* Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-251-3/+1
* Re-wrap lineDaniel Wagner-Hall2015-08-251-3/+1
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-251-10/+7
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-202-0/+3
|\
| * Add m.room.avatar to default power levels. Change default required power leve...Erik Johnston2015-08-201-0/+1
| * Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-201-0/+1
| |\
| | * Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| * | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+1
| |\ \ | | |/ | |/|
| | * Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-0/+1
* | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-201-3/+3
|/ /
* | Set request.authenticated_entity for application servicesErik Johnston2015-08-181-0/+3
* | Add missing space because linterDaniel Wagner-Hall2015-08-111-1/+1
* | Minor docs cleanupDaniel Wagner-Hall2015-08-111-2/+7
* | Remove redundant if-guardDaniel Wagner-Hall2015-08-111-13/+12
|/
* Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-161-0/+5
|\
| * Capitalize contantsErik Johnston2015-07-141-2/+2
| * Implement presets at room creationErik Johnston2015-07-131-0/+5
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_leve...Erik Johnston2015-07-132-1/+4
|\|
| * Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-061-0/+1
| * Add m.room.history_visibility to list of auth eventsErik Johnston2015-07-031-1/+1
| * Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-021-0/+2
* | Sanitize power level checksErik Johnston2015-07-101-15/+21
* | You shouldn't be able to ban/kick users with higher power levelsErik Johnston2015-07-101-2/+5
|/
* Log more when we have processed the requestErik Johnston2015-06-151-0/+2
* TypoErik Johnston2015-05-011-1/+1
* Remove some run_on_reactorsErik Johnston2015-05-011-3/+0
* Don't log all auth events every time we call auth.checkErik Johnston2015-05-011-1/+4
* Don't wait for storage of access_tokenErik Johnston2015-05-011-1/+1
* Merge branch 'develop' into key_distributionMark Haines2015-04-293-19/+40
|\
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-283-19/+32
| |\
| | * Merge branch 'develop' into csauthDavid Baker2015-04-242-60/+32
| | |\
| | * | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-231-0/+1
| | * | Add an error code to 'missing token' response.David Baker2015-04-232-1/+3
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-171-14/+11
| | |\ \
| | * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-151-0/+1
| | * | | Add app service auth back in to v2 registerDavid Baker2015-04-021-3/+1
| | * | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-021-1/+3
| | * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-301-0/+2
| | * | | unused importDavid Baker2015-03-241-1/+1
| | * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-241-18/+25
| * | | | Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-272-38/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Also remember to check 'invite' level for changesPaul "LeoNerd" Evans2015-04-211-0/+1
| * | | | Initial implementation of an 'invite' power_levelPaul "LeoNerd" Evans2015-04-211-0/+7
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-242-60/+32
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | No commas here, otherwise our error string constants become tuples.David Baker2015-04-241-2/+2
| * | | | Neater fetching of user's auth level in a room - squash to int() at access ti...Paul "LeoNerd" Evans2015-04-221-35/+12
| * | | | Appease pep8Paul "LeoNerd" Evans2015-04-221-1/+0
| |/ / /
| * | | Much neater fetching of defined powerlevels from m.room.power_levels state eventPaul "LeoNerd" Evans2015-04-211-31/+21
| * | | Remove debugging print statement accidentally committedPaul "LeoNerd" Evans2015-04-211-1/+0
| * | | Sanitise a user's powerlevel to an int() before numerical comparison, because...Paul "LeoNerd" Evans2015-04-211-0/+7
| | |/ | |/|
* | | Merge branch 'develop' into key_distributionMark Haines2015-04-201-13/+10
|\| |
| * | Neater implementation of membership change auth checks, ensuring we can't for...Paul "LeoNerd" Evans2015-04-151-18/+10
| * | Ensure that non-room-members cannot ban others, even if they do have enough p...Paul "LeoNerd" Evans2015-04-151-0/+5
* | | Add a version 2 of the key server apiMark Haines2015-04-141-0/+1
|/ /
* / Fix a bug which causes a send event level of 0 to not be honoured.Kegan Dougal2015-04-071-1/+1
|/
* Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-181-0/+1
|\
| * Implement registering with shared secret.Erik Johnston2015-03-131-0/+1
* | @cached() annotate get_user_by_token() - achieves a minor DB performance impr...Paul "LeoNerd" Evans2015-03-171-1/+1
* | Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-161-6/+0
* | Make context.auth_events grap auth events from current state. Otherwise auth ...Erik Johnston2015-03-161-1/+7
* | Respect ban membershipErik Johnston2015-03-161-5/+17
|/
* Add RegisterFallbackResource to /_matrix/static/client/registerKegan Dougal2015-02-231-0/+1
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-111-7/+14
|\
| * During room intial sync, only calculate current state once.Erik Johnston2015-02-091-7/+14
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-091-18/+16
* | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-062-1/+14
* | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-0/+1
* | Fix unit tests.Kegan Dougal2015-02-051-0/+6
* | Add CS extension for masquerading as users within the namespaces specified by...Kegan Dougal2015-02-051-0/+23
* | Merge branch 'develop' into application-servicesKegan Dougal2015-02-052-9/+13
|\|
| * Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...Erik Johnston2015-02-041-6/+6
| |\
| | * Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-041-6/+6
| * | Apply sanity to the transport client interface. Convert 'make_join' and 'send...Erik Johnston2015-02-041-1/+7
| |/
| * Keep around the old (buggy) version of the prune_event function so that we ca...Erik Johnston2015-02-031-2/+0
* | Merge branch 'develop' into application-servicesKegan Dougal2015-02-024-20/+297
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-301-0/+229
| |\
| | * Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-301-6/+2
| | * Unused importMark Haines2015-01-301-2/+0
| | * Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-112/+108
| | * Merge branch 'develop' into client_v2_filterMark Haines2015-01-291-0/+1
| | |\
| | * | Fix code-styleMark Haines2015-01-291-13/+6
| | * | Merge changes from developMark Haines2015-01-292-3/+38
| | |\ \
| | * | | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-291-4/+7
| | * | | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-291-0/+49
| | * | | Add filtering public API; outline filtering algorithm.Kegan Dougal2015-01-291-8/+52
| | * | | Add filtering.filter_events function, with stub passes_filter function.Kegan Dougal2015-01-291-0/+15
| | * | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-4/+105
| | * | | Move storage of user filters into real datastore layer; now have to mock it o...Paul "LeoNerd" Evans2015-01-271-23/+4
| | * | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-2/+14
| | * | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-271-0/+41
| * | | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-301-0/+2
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-303-3/+40
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Code style fixes.Mark Haines2015-01-291-0/+1
| | | |/ | | |/|
| | * | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-281-3/+8
| | |\ \
| | | * | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ...Mark Haines2015-01-281-2/+2
| | | * | Add a : to the doc string after the type of the return valueMark Haines2015-01-281-1/+1
| | | * | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-281-3/+5
| | | * | Return the device_id from get_auth_by_reqMark Haines2015-01-281-2/+5
| | | |/
| | * | Merge branch 'develop' into pushersDavid Baker2015-01-282-4/+6
| | |\|
| | * | Add slightly pedantic trailing slash error.David Baker2015-01-231-1/+6
| | * | right super() paramDavid Baker2015-01-231-1/+1
| | * | As yet fairly untested GET API for push rulesDavid Baker2015-01-221-1/+13
| | * | Oops: second part of commit dc938606David Baker2015-01-221-0/+12
| | * | Merge branch 'develop' into pushersDavid Baker2015-01-136-6/+6
| | |\ \
| | * \ \ Merge branch 'develop' into pushersDavid Baker2014-12-189-632/+73
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into pushersDavid Baker2014-12-022-73/+78
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into pushersDavid Baker2014-11-204-4/+9
| | |\ \ \ \ \
| | * | | | | | Start creating a module to do generic notifications (just prints them to stdo...David Baker2014-11-191-0/+1
| * | | | | | | Start implementing auth conflict resErik Johnston2015-01-282-17/+27
* | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-271-0/+1
| |_|_|_|_|_|/ |/| | | | | |