Erik Johnston
|
87deaf1658
|
SYN-70: Fix typo
|
2014-09-24 16:15:58 +01:00 |
|
Paul "LeoNerd" Evans
|
4571cf7baa
|
Merge branch 'develop' into test-sqlite-memory
|
2014-09-17 18:27:47 +01:00 |
|
Paul "LeoNerd" Evans
|
9973298e2a
|
Print expected-vs-actual data types on typecheck failure from check_json()
|
2014-09-17 15:27:45 +01:00 |
|
Erik Johnston
|
1e4b971f95
|
Fix bug where we didn't always get 'prev_content' key
|
2014-09-15 17:43:46 +01:00 |
|
Erik Johnston
|
40d2f38abe
|
Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.
|
2014-09-15 16:55:39 +01:00 |
|
Kegan Dougal
|
14bc4ed59f
|
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
|
2014-09-15 15:27:58 +01:00 |
|
Erik Johnston
|
5bd9369a62
|
Correctly handle the 'age' key in events and pdus
|
2014-09-15 13:26:11 +01:00 |
|
Kegan Dougal
|
34878bc26a
|
Added LoginType constants. Created general structure for processing registrations.
|
2014-09-15 10:23:20 +01:00 |
|
Kegan Dougal
|
1a298aad9c
|
Added captcha support on both the HS and web client.
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
|
2014-09-05 23:32:51 -07:00 |
|
Kegan Dougal
|
1829b55bb0
|
Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
|
2014-09-05 19:18:23 -07:00 |
|
Erik Johnston
|
6d19fe1481
|
Fix generation of event ids so that they are consistent between local and remote ids
|
2014-09-06 02:48:13 +01:00 |
|
Erik Johnston
|
781ff713ba
|
When getting a state event also include the previous content
|
2014-09-06 02:23:36 +01:00 |
|
Kegan Dougal
|
0b9e1e7b56
|
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
|
2014-09-05 17:58:06 -07:00 |
|
Erik Johnston
|
480438eee6
|
Validate power levels event changes. Change error messages to be more helpful. Fix bug where we checked the wrong power levels
|
2014-09-05 21:54:16 +01:00 |
|
Erik Johnston
|
9dd4570b68
|
Generate m.room.aliases event when the HS creates a room alias
|
2014-09-05 21:35:56 +01:00 |
|
Erik Johnston
|
250ee2ea7d
|
AUth the contents of power level events
|
2014-09-05 17:13:19 +01:00 |
|
Erik Johnston
|
95037d8d9d
|
Change the default power levels to be 0, 50 and 100
|
2014-09-05 17:13:03 +01:00 |
|
Matthew Hodgson
|
8a7c1d6a00
|
fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
|
2014-09-03 17:31:57 +01:00 |
|
Kegan Dougal
|
cd0afb85c4
|
Updated feedback api docs and fixed feedback content template bug
|
2014-09-03 13:08:17 +01:00 |
|
Mark Haines
|
c6eafdfbaf
|
Add copyright notices and fix pyflakes errors
|
2014-09-03 09:43:11 +01:00 |
|
Mark Haines
|
112c7ea315
|
Set status message for ratelimit error responses
|
2014-09-03 09:37:44 +01:00 |
|
Mark Haines
|
30ad0c5674
|
Merge branch 'ratelimiting' into develop
|
2014-09-03 09:15:52 +01:00 |
|
Mark Haines
|
683596f91e
|
Raise LimitExceedError when the ratelimiting is throttling requests
|
2014-09-03 08:58:48 +01:00 |
|
Mark Haines
|
c7a7cdf734
|
Add ratelimiting function to basehandler
|
2014-09-02 17:57:04 +01:00 |
|
Mark Haines
|
dd2cd9312a
|
Test ratelimiter
|
2014-09-02 15:16:26 +01:00 |
|
Erik Johnston
|
4b8244fbf8
|
Fix bug where we didn't correctly store the ops power levels event.
|
2014-09-02 12:12:14 +01:00 |
|
Mark Haines
|
436b3c7d0c
|
Ratelimiter object
|
2014-09-02 11:16:21 +01:00 |
|
Erik Johnston
|
db02021aba
|
Implement auth for kicking.
|
2014-09-02 10:58:33 +01:00 |
|
Erik Johnston
|
b8ab9f1c0a
|
Add all the necessary checks to make banning work.
|
2014-09-01 18:24:56 +01:00 |
|
Erik Johnston
|
db7109c43b
|
Add beginnings of ban support.
|
2014-09-01 16:15:34 +01:00 |
|
Erik Johnston
|
865469f233
|
Implement power level lists, default power levels and send_evnet_level/add_state_level events.
|
2014-09-01 14:39:09 +01:00 |
|
Erik Johnston
|
10efca1a74
|
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
|
2014-09-01 13:41:44 +01:00 |
|
Matthew Hodgson
|
8fe912d95c
|
change the world: make the default matrix API URL prefix /_matrix rather than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions.
perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js
|
2014-08-31 14:51:37 +01:00 |
|
Erik Johnston
|
d2bc5d6f29
|
Create the correct events with the right configuration when creating a new room.
|
2014-08-28 10:59:15 +01:00 |
|
Mark Haines
|
2aeaa7b77c
|
Merge branch 'develop' into storage_transactions
Conflicts:
synapse/handlers/room.py
synapse/storage/stream.py
|
2014-08-27 17:15:58 +01:00 |
|
Mark Haines
|
b30358f439
|
add _get_room_member, fix datastore methods
|
2014-08-27 16:51:54 +01:00 |
|
Erik Johnston
|
47519cd8c2
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts:
synapse/handlers/events.py
synapse/rest/events.py
synapse/rest/room.py
|
2014-08-27 14:13:06 +01:00 |
|
Mark Haines
|
bf05218c4b
|
Merge branch 'develop' into storage_transactions
|
2014-08-27 11:19:37 +01:00 |
|
Kegan Dougal
|
dfa0cd1d90
|
Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.
|
2014-08-27 09:43:42 +01:00 |
|
Erik Johnston
|
93cff1668c
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
|
2014-08-26 18:57:55 +01:00 |
|
Erik Johnston
|
3a2a5b959c
|
WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
|
2014-08-26 18:57:46 +01:00 |
|
Kegan Dougal
|
5a3df1d029
|
Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expanded the feedback constants to fully explain what type of feedback they are.
|
2014-08-26 17:49:46 +01:00 |
|
Mark Haines
|
4b63b06cad
|
Merge branch 'develop' into storage_transactions
Conflicts:
synapse/api/auth.py
synapse/handlers/room.py
synapse/storage/__init__.py
|
2014-08-26 16:07:05 +01:00 |
|
Erik Johnston
|
3df5cb804f
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
|
2014-08-26 16:03:56 +01:00 |
|
Mark Haines
|
ac21dfff6d
|
Fix pyflakes errors
|
2014-08-26 16:02:59 +01:00 |
|
Erik Johnston
|
485bb64ddb
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
|
2014-08-26 13:55:37 +01:00 |
|
Kegan Dougal
|
52b64617f9
|
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
|
2014-08-26 10:04:26 +01:00 |
|
Erik Johnston
|
fea7b60cf3
|
Add 'state_key' to valid_keys
|
2014-08-26 09:40:58 +01:00 |
|
Erik Johnston
|
b52b33acf6
|
Send down state_key to clients
|
2014-08-26 09:40:29 +01:00 |
|
Kegan Dougal
|
47c3a089c5
|
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
|
2014-08-26 09:26:33 +01:00 |
|