| 
								
								
									 Timo Kösters | 3e274d7d2c | Merge branch 'valkum/conduit-update_rocket' into 'master' update dependencies
See merge request famedly/conduit!32 | 2021-03-04 12:32:22 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 105f893cf3 | chore: bump other dependencies to make it work | 2021-03-04 12:29:08 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | a04860b513 | Merge branch 'as-fix' into 'master' fix: apply the same appservice sending rules to events coming from federation
See merge request famedly/conduit!31 | 2021-03-04 11:18:00 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 437cb5783a | fix: apply the same appservice sending rules to events coming from federation currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it | 2021-03-04 11:34:38 +01:00 |  | 
				
					
						| 
								
								
									 Rudi Floren | f4039902d8 | Bump Rocket to current HEAD | 2021-03-03 22:42:10 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 1a940b6e05 | Merge branch 'as-fix' into 'master' fix: don't always query aliases of appservices
See merge request famedly/conduit!29 | 2021-03-03 21:07:18 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | f2ec2be821 | fix: don't always query aliases of appservices only do so if the alias matches the regex in the registration file | 2021-03-03 21:53:32 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 1a198e7336 | Merge branch 'jaeger' into 'master' feat: opentelemetry/jaeger support
See merge request famedly/conduit!28 | 2021-03-02 14:14:26 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 4155a47db1 | feat: opentelemetry/jaeger support | 2021-03-02 15:08:54 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 066d5b92da | Merge branch 'sending' into 'master' fix: sending code got stuck sometimes
See merge request famedly/conduit!25 | 2021-03-02 14:04:11 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | f7713fdf2e | fix: sending code got stuck sometimes | 2021-03-02 14:58:46 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 566b8ebabb | Merge branch 'receipt-and-txnid' into 'master' /receipt and transaction ids for federated requests
Closes #11
See merge request famedly/conduit!27 | 2021-03-02 13:49:14 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 278751eb23 | improvement: use transaction ids for federation requests | 2021-03-02 14:36:48 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | dd68031b69 | improvement: implement /receipt | 2021-03-02 14:33:35 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | a9239a4d0b | Merge branch 'larodar-master-patch-53953' into 'master' Chore: Add Issue Template
See merge request famedly/conduit!26 | 2021-02-26 15:00:19 +00:00 |  | 
				
					
						| 
								
								
									 Niklas Zender | a601c29c97 | Chore: Add Issue Template | 2021-02-26 14:55:06 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | fb9880fee9 | Merge branch 'are-we-synpase-sync' into 'master' Sync are-we-synapse with dendrite
See merge request famedly/conduit!21 | 2021-02-07 21:36:05 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 098ecb2ca3 | Merge branch 'jwt-token-fixed' into 'master' Add 'm.login.token' authentication
See merge request famedly/conduit!5 | 2021-02-07 17:11:53 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | d49911c5e0 | Add 'm.login.token' authentication | 2021-02-07 17:38:45 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 3588dcd6d0 | Merge branch 'deviceid-login' into 'master' Handle optional device_id field during login
See merge request famedly/conduit!16 | 2021-02-07 12:28:05 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 2d7012cdb1 | Merge branch 'appservices' into 'master' Appservices
Closes #29
See merge request famedly/conduit!11 | 2021-02-07 12:24:28 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | ea1e4625d1 | fix: default config options | 2021-02-07 13:20:00 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 6924dfc8ea | improvement: better appservice compatibility and optimizations | 2021-02-06 15:28:30 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 7be2a83195 | Merge branch 'valkum/complement' into 'master' Complement Testing: Fix binary name typo
See merge request famedly/conduit!20 | 2021-02-05 08:52:25 +00:00 |  | 
				
					
						| 
								
								
									 Valkum | 1d7207b39e | Sync are-we-synapse with dendrite | 2021-02-05 02:06:14 +01:00 |  | 
				
					
						| 
								
								
									 Valkum | a61b1cef5b | Fix binary name typo | 2021-02-04 23:51:20 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | a478ec0443 | Merge branch 'cleanup' into 'master' Update repository link in crate metadata
See merge request famedly/conduit!19 | 2021-02-03 18:30:11 +00:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | fd3fb3a7ed | Merge remote-tracking branch 'famedly/master' into appservices | 2021-02-03 12:54:37 +01:00 |  | 
				
					
						| 
								
								
									 Jonas Platte | 6de5b3c2a0 | Update repository link in crate metadata | 2021-02-02 18:14:00 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 265fab843a | feature: push rule settings | 2021-01-28 20:47:19 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 87a0019f3a | Merge branch 'valkum/complement' into 'master' Allow the complement test image to use build artifacts
See merge request famedly/conduit!17 | 2021-01-23 07:43:05 +00:00 |  | 
				
					
						| 
								
								
									 Valkum | a1e296374f | Allow the complement test image to use build artifacts | 2021-01-22 20:11:19 +01:00 |  | 
				
					
						| 
								
								
									 Devon Hudson | 762255fa8d | Simplify device creation logic during login | 2021-01-17 08:39:47 -07:00 |  | 
				
					
						| 
								
								
									 Devon Hudson | 890187e004 | improvement: Handle optional device_id field during login remove debug logging | 2021-01-16 22:19:48 -07:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 9424ba0559 | Merge branch 'logout-devices' into 'master' Respect logout_devices param on password change
See merge request famedly/conduit!15 | 2021-01-16 22:35:08 +00:00 |  | 
				
					
						| 
								
								
									 Devon Hudson | ebb38cd330 | improvement: respect logout_devices param on password change Move logout devices comment next to relevant loop
remove unnecessary log | 2021-01-16 15:14:50 -07:00 |  | 
				
					
						| 
								
								
									 Paul van Tilburg | c263e13000 | fix: update binary file name in docs for consistency | 2021-01-11 20:28:47 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | ad7b3f184b | improvement: send 200 response for turn server info We didn't implement it, but this will stop clients from retrying the
endpoint every minute | 2021-01-11 17:26:47 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | d45d033bf1 | fix: send presence updates when going offline remaining bug: conduit sends presence updates every 5 minutes even if
the user is already offline | 2021-01-10 17:12:34 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | b4818716b8 | improvement: better deploy guide | 2021-01-01 22:21:05 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | d7e56dbfa0 | docs: recommend using binaries | 2021-01-01 11:27:01 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 3bdaf6e79e | improvement: better default config | 2021-01-01 11:24:09 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 85364a9c27 | improvement: change federation_enabled to federation_disabled This enables federation by default | 2021-01-01 10:52:43 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | edfd3c1f34 | improvement: better config, better logs | 2020-12-31 21:07:55 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | df16b2ba98 | fix: rare state races | 2020-12-31 14:52:08 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | 2cf6fd57b7 | improvement: don't send pdus to appservices if it isn't interested TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself | 2020-12-23 19:41:54 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | fb9bd34696 | improvement: better warnings when server is unreachable | 2020-12-23 15:53:41 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | c1bc70aeca | Merge branch 'kuboschek/conduit-always-query-srv' into appservices | 2020-12-22 20:35:43 +01:00 |  | 
				
					
						| 
								
								
									 Leonhard Kuboschek | 8dcc1dfe56 | improvement: always use port from SRV lookups Also query SRV records when well-known is not found, fixes #29 | 2020-12-22 20:34:07 +01:00 |  | 
				
					
						| 
								
								
									 Timo Kösters | f12fbca3c5 | fix: send state in /sync, element displays wrong membership changes | 2020-12-22 20:22:17 +01:00 |  |