Commit Graph

17 Commits

Author SHA1 Message Date
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
2d31e44b54 android refactor password 2022-07-29 19:02:30 +08:00
Kingtous
608f02ea21 feat: dark theme
Signed-off-by: Kingtous <kingtous@qq.com>
2022-07-29 16:47:24 +08:00
kingtous
4cfa840822 add: address book ui&getAb
Signed-off-by: Kingtous <kingtous@qq.com>
2022-07-25 16:23:45 +08:00
csf
88fef77980 android opt:add disable ignore_battery_optimizations 2022-07-16 22:31:44 +08:00
csf
fb02fc1197 [android] fix build; ignore battery optimizations 2022-07-14 17:44:37 +08:00
Kingtous
79217ca1d9 add: send/receive file/folder 2022-07-11 10:30:45 +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
Hamidi Mohammed
5a051ae3b6 code enhancement
Signed-off-by: Hamidi Mohammed <mr.hammiddi@gmail.com>
2022-06-19 17:15:37 +01: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
0b67164ecf adapt to flutter 3 2022-06-01 15:29:31 +08:00
kingtous
82895e6951 opt & fix:
- main window ui: adapt pc logic
- fix: platform infomation using device info plus

Signed-off-by: Kingtous <kingtous@qq.com>
2022-05-30 13:26:01 +08:00
csf
fa5f48638f adapt to flutter 3 2022-05-26 18:25:16 +08:00
csf
a23fa7fc66 add desktop 2022-05-23 16:02:37 +08:00
Kingtous
925ca66c42 opt: reset file confirm & clean code 2022-05-18 15:47:07 +08:00
rustdesk
6de0fa781c for merge 2022-05-12 16:50:30 +08:00