Commit Graph

65 Commits

Author SHA1 Message Date
Kingtous
74b830159b add: ci dependencies 2022-08-01 14:56:13 +08:00
Kingtous
c4451b3cc7 fix: merge conflict 2022-08-01 14:33:08 +08:00
Kingtous
3b9c62b05d Merge remote-tracking branch 'rustdesk/master' into flutter_desktop
# Conflicts:
#	.github/workflows/ci.yml
#	Cargo.lock
#	Cargo.toml
#	flutter/lib/common.dart
#	flutter/lib/mobile/pages/remote_page.dart
#	flutter/lib/mobile/pages/server_page.dart
#	flutter/lib/mobile/pages/settings_page.dart
#	flutter/lib/mobile/widgets/dialog.dart
#	flutter/lib/models/model.dart
#	flutter/lib/models/server_model.dart
#	src/client.rs
#	src/common.rs
#	src/ipc.rs
#	src/mobile_ffi.rs
#	src/rendezvous_mediator.rs
#	src/ui.rs
2022-08-01 10:44:05 +08:00
csf
67a3db7378 UI optimization 2022-07-29 22:17:55 +08:00
csf
2d31e44b54 android refactor password 2022-07-29 19:02:30 +08:00
Kingtous
4a89469b84 Merge remote-tracking branch 'rustdesk/master' into flutter_desktop
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	build.rs
#	flutter/.gitignore
#	flutter/lib/common.dart
#	flutter/lib/mobile/pages/remote_page.dart
#	flutter/lib/models/model.dart
#	flutter/lib/models/native_model.dart
#	flutter/lib/models/server_model.dart
#	flutter/pubspec.lock
#	flutter/pubspec.yaml
#	src/client.rs
#	src/client/file_trait.rs
#	src/flutter.rs
#	src/mobile_ffi.rs
#	src/ui.rs
2022-06-27 11:18:53 +08:00
kingtous
985c616ca6 refactor: make multi FFI object && initial flutter multi sessions support
Signed-off-by: Kingtous <kingtous@qq.com>
2022-06-13 21:07:26 +08:00
csf
75b920079b run android InputService independently 2022-06-01 21:14:02 +08:00
SoLongAndThanksForAllThePizza
e836b7fcfb implement functional draft version 2022-05-29 04:39:12 +08:00
Kingtous
a364e7f808 demo: use mobile_ffi to get id for desktop version 2022-05-25 14:12:40 +08:00
Kingtous
a81e2f9859 refactor: split desktop & mobile 2022-05-25 14:12:35 +08:00
csf
7296e55435 del unused 2022-05-17 21:58:15 +08:00
csf
a7af7967f6 use new event channel for mobile and web 2022-05-17 19:59:37 +08:00
rustdesk
c3bc539a61 fix chat model 2022-05-16 00:01:27 +08:00
rustdesk
6de0fa781c for merge 2022-05-12 16:50:30 +08:00