Commit Graph

93 Commits

Author SHA1 Message Date
Dan Ballard 9bb23de090 Merge pull request 'Max width on UI Landscape Setting' (#104) from bugfix into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #104
2021-07-08 15:52:29 -07:00
Sarah Jamie Lewis 992b26e1ab Max width on UI Landscape Setting
continuous-integration/drone/pr Build is running Details
Fix #16
2021-07-08 14:43:35 -07:00
Sarah Jamie Lewis d4ab6585ea UI state fixes
Fix #89
Fix #75
2021-07-08 14:43:35 -07:00
Dan Ballard 1f012b153c Merge pull request 'UI state fixes' (#103) from bugfix into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #103
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-07-08 13:43:31 -07:00
Sarah Jamie Lewis 9029386344 UI state fixes
continuous-integration/drone/pr Build is passing Details
Fix #89
Fix #75
2021-07-08 13:31:07 -07:00
Sarah Jamie Lewis f4b4458d4c Merge pull request 'Add support for CWTCH_DIR env var' (#101) from cwtchDirEnv into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #101
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
2021-07-08 13:27:41 -07:00
Sarah Jamie Lewis d496581f34 Merge branch 'trunk' into cwtchDirEnv
continuous-integration/drone/pr Build is passing Details
2021-07-08 13:27:36 -07:00
Dan Ballard 057732c445 Add support for CWTCH_DIR env var
continuous-integration/drone/pr Build is passing Details
2021-07-07 16:31:07 -07:00
Dan Ballard c2270fb674 Merge pull request 'Add localization support for UI settings fields' (#100) from quote into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #100
2021-07-07 15:48:09 -07:00
Sarah Jamie Lewis dd95e02f54 Add localization support for UI settings fields
continuous-integration/drone/pr Build is passing Details
+ allow for Polish translations
2021-07-07 15:35:48 -07:00
Dan Ballard c51fd10650 Merge pull request 'Fix listen provider bug' (#99) from quote into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #99
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-07-07 12:48:11 -07:00
Sarah Jamie Lewis 3c41ab3ca5 Fix listen provider bug
continuous-integration/drone/pr Build is passing Details
2021-07-07 12:23:11 -07:00
Dan Ballard 84a0ca5d19 Merge pull request 'Implement Quoting' (#96) from quote into trunk
continuous-integration/drone/push Build is passing Details
Reviewed-on: #96
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
2021-07-07 11:46:28 -07:00
Sarah Jamie Lewis 0c9da27363 const group handle length
continuous-integration/drone/pr Build is passing Details
2021-07-07 11:31:16 -07:00
Sarah Jamie Lewis 1c460b431e Remove print + add check for body in quote
continuous-integration/drone/pr Build is passing Details
2021-07-07 11:25:13 -07:00
Sarah Jamie Lewis e4046fb574 Addressing Dans comments + Marcia design
continuous-integration/drone/pr Build is running Details
2021-07-07 11:11:09 -07:00
Sarah Jamie Lewis 29c9c1615b Upgrade libCwtch 2021-07-07 09:10:17 -07:00
Sarah Jamie Lewis ddfc7fc43c Refactor Message/MessageState to make adding more Message Types simpler 2021-07-07 09:10:17 -07:00
Sarah Jamie Lewis b9984a3598 Quoted Messages Initial Pass 2021-07-07 09:10:17 -07:00
Sarah Jamie Lewis 370a7fd1da Add Polish Template 2021-07-07 09:10:17 -07:00
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