Commit Graph

73 Commits

Author SHA1 Message Date
Sarah Jamie Lewis afa6794f8d Merge pull request 'fix drone use of env vars so it can pull from forks and actually use the right branch' (#98) from winDroneVars into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #98
2021-07-06 17:33:38 -07:00
Dan Ballard 8f88f614f2 fix drone use of env vars so it can pull from forks and actually use the right branch
continuous-integration/drone/pr Build is passing Details
2021-07-06 16:34:50 -07:00
Sarah Jamie Lewis df43870e61 Merge pull request 'this should allow the ssh clone to work on forks' (#97) from cloneFork into trunk
continuous-integration/drone/push Build was killed Details
Reviewed-on: #97
2021-07-06 15:18:35 -07:00
Sarah Jamie Lewis c44d879f9d Merge branch 'trunk' into cloneFork
continuous-integration/drone/pr Build is passing Details
2021-07-06 15:18:27 -07:00
Dan Ballard a789313712 this should allow the ssh clone to work on forks
continuous-integration/drone/pr Build is passing Details
2021-07-06 15:04:36 -07:00
Sarah Jamie Lewis f335d5b231 Merge pull request 'packaging: linux now installs a sh script to invoke cwtch so its command line callable, not just desktop. use bundled tor. windows bat files to trigger file logging for debug' (#95) from linuxPack into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #95
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-07-06 12:47:28 -07:00
Sarah Jamie Lewis 565bdb0fea Merge branch 'trunk' into linuxPack
continuous-integration/drone/pr Build is passing Details
2021-07-06 12:24:53 -07:00
Dan Ballard 3e82b447f2 packaging: linux now installs a sh script to invoke cwtch so its command line callable, not just desktop. use bundled tor. windows bat files to trigger file logging for debug
continuous-integration/drone/pr Build is passing Details
2021-07-06 09:37:41 -07:00
Dan Ballard 4c35a2ea28 Merge pull request 'Add Polish Template' (#94) from sarah-patch-2 into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #94
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-07-05 13:25:48 -07:00
Sarah Jamie Lewis 3798ca9d60 Add Polish Template
continuous-integration/drone/pr Build is passing Details
2021-07-05 13:17:15 -07:00
Sarah Jamie Lewis 20a0beda58 Merge pull request 'fix shutdown prompt when clicking notifications' (#90) from notifix into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #90
2021-07-02 17:07:15 -07:00
erinn 644d6b9793 Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/cwtch-ui into notifix
continuous-integration/drone/pr Build is passing Details
2021-07-02 16:27:16 -07:00
erinn 624f7d3caa fixing notification bugs 2021-07-02 16:27:09 -07:00
Sarah Jamie Lewis 3285053932 Merge pull request 'apply newer fluter runloop in run_loop.cpp for windows performance fix' (#84) from windowsPerf into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #84
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-06-30 16:33:52 -07:00
Sarah Jamie Lewis f43fdc57bb Merge branch 'trunk' into windowsPerf
continuous-integration/drone/pr Build is passing Details
2021-06-30 16:33:40 -07:00
Dan Ballard 88114ac6eb apply newer fluter runloop in run_loop.cpp for windows performance fix
continuous-integration/drone/pr Build is passing Details
2021-06-30 16:27:14 -07:00
erinn ddc91c8d86 Merge pull request 'Multiline Support' (#83) from multiline into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #83
Reviewed-by: erinn <erinn@openprivacy.ca>
2021-06-30 16:16:21 -07:00
Sarah Jamie Lewis 8b30b4a227 Multiline Support
continuous-integration/drone/pr Build is passing Details
- Fixes #49
- Fixes #50
2021-06-30 16:12:34 -07:00
erinn 1a8d91548e Merge pull request 'Upgrade libCwtch + Formatting Pass' (#82) from fix-reconnect into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #82
Reviewed-by: erinn <erinn@openprivacy.ca>
2021-06-30 14:18:50 -07:00
Sarah Jamie Lewis 208ca58e6e Merge branch 'trunk' into fix-reconnect
continuous-integration/drone/pr Build is passing Details
2021-06-30 14:07:37 -07:00
Sarah Jamie Lewis 8df3eecd7c Formatting Pass
continuous-integration/drone/pr Build is passing Details
2021-06-30 13:59:52 -07:00
Sarah Jamie Lewis a792926b5c Update LibCwtch-go 2021-06-30 13:59:41 -07:00
Sarah Jamie Lewis 273849d5b8 Merge pull request 'nsis run after install fix' (#81) from nsis into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #81
2021-06-30 12:47:40 -07:00
Sarah Jamie Lewis 59acfb2cd1 Merge branch 'trunk' into nsis
continuous-integration/drone/pr Build is passing Details
2021-06-30 12:47:30 -07:00
Dan Ballard 24f0c84471 Merge branch 'nsis' of git.openprivacy.ca:cwtch.im/cwtch-ui into nsis
continuous-integration/drone/pr Build is passing Details
2021-06-30 12:40:20 -07:00
Dan Ballard 445a88ed88 fix 'Run app` after incaller closes not working 2021-06-30 12:39:51 -07:00
Sarah Jamie Lewis edcc6c1770 Merge pull request 'NSIS windows installer' (#80) from nsis into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #80
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-06-30 12:19:34 -07:00
Sarah Jamie Lewis 759d8a1a84 Merge branch 'trunk' into nsis
continuous-integration/drone/pr Build is passing Details
2021-06-30 12:19:11 -07:00
Dan Ballard bd29ad8d4c integrating changes from tests in flutter_app
continuous-integration/drone/pr Build is passing Details
2021-06-30 12:00:44 -07:00
Dan Ballard 48405f359b Merge pull request 'Fix: #22 - Explictly pop to conversations after AddContact' (#79) from addcontact-bugfix into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #79
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-06-30 11:48:21 -07:00
Sarah Jamie Lewis b832f71569 Fix: #22 - Explictly pop to conversations after AddContact
continuous-integration/drone/pr Build is passing Details
Also a few checks to prevent post-acceptence onChange events from breaking context.
2021-06-30 11:35:07 -07:00
Dan Ballard bec93d8980 Merge pull request 'Show Syncing Message + Update libcwtch-go to fix message fetching issues' (#76) from notification-fixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #76
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-06-29 17:30:52 -07:00
Sarah Jamie Lewis bb5fbf1b7f Merge branch 'trunk' into notification-fixes
continuous-integration/drone/pr Build is passing Details
2021-06-29 17:19:55 -07:00
Sarah Jamie Lewis 9c9ea38456 Propagate group name on Android properly
continuous-integration/drone/pr Build was killed Details
2021-06-29 17:19:08 -07:00
Sarah Jamie Lewis 45459cf76a Show Syncing Message + Update libcwtch-go to fix message fetching issues
continuous-integration/drone/pr Build is passing Details
2021-06-29 16:44:43 -07:00
erinn fbf79a230b Merge pull request 'Don't attempt to load messages on group syncing (Fixes: #56)' (#74) from notification-fixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #74
2021-06-29 11:59:46 -07:00
erinn 611ebdd018 Merge branch 'trunk' into notification-fixes
continuous-integration/drone/pr Build is passing Details
2021-06-29 11:59:22 -07:00
erinn 45a54e903b Merge pull request 'Add tooltips to contact request. Fixes: #59' (#71) from bug-fixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #71
2021-06-29 11:54:10 -07:00
erinn 88c354288f Merge branch 'trunk' into bug-fixes
continuous-integration/drone/pr Build is passing Details
2021-06-29 11:54:02 -07:00
Sarah Jamie Lewis 7648916f6a Don't attempt to load messages on group syncing (Fixes: #56)
continuous-integration/drone/pr Build is passing Details
Also should help with #32
2021-06-29 11:49:29 -07:00
Sarah Jamie Lewis 1dd3593c97 Add tooltips to contact request. Fixes: #59
continuous-integration/drone/pr Build is passing Details
2021-06-29 10:21:33 -07:00
Dan Ballard f2d18d44eb updating paths in nsis code and sketching install commands in drone - but need a new container 2021-06-28 17:59:46 -07:00
Dan Ballard 43ce9b9df2 initial import of ui nsis script for testing and adaptation 2021-06-28 15:24:15 -07:00
Dan Ballard 8cb74310f0 Merge pull request 'Check DBUS Access before using Notification Manager' (#65) from bug-fixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #65
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-06-28 15:08:44 -07:00
Sarah Jamie Lewis b0a9531bdb Check DBUS Access before using Notification Manager
continuous-integration/drone/pr Build is passing Details
2021-06-28 14:35:39 -07:00
Dan Ballard ab3398aa3b Merge pull request 'Autofill Hints for Password Fields (#40)' (#43) from bug-fixes into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #43
2021-06-28 12:41:36 -07:00
Sarah Jamie Lewis 5ddfa69dc5 Merge pull request 'add missing translations for german and make them informal' (#62) from sacovo/cwtch-ui:l10n_german into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #62
2021-06-28 12:27:25 -07:00
Sandro Covo bd4bcfb0d9 add missing translations for german and make them informal
continuous-integration/drone/pr Build is failing Details
2021-06-28 21:15:54 +02:00
Sarah Jamie Lewis ddce35f906 Merge pull request 'trunk' (#38) from ZRRpETIS/cwtch-ui:trunk into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #38
2021-06-28 10:56:02 -07:00
Sarah Jamie Lewis 1baa0ca31e Autofill Hints for Password Fields (#40)
continuous-integration/drone/pr Build is passing Details
2021-06-27 08:16:31 -07:00