Compare commits

...

514 Commits

Author SHA1 Message Date
Sarah Jamie Lewis 12a6cb4610 Merge pull request 'Profile Manager user incokePopup for 0 profiles loaded error; fix lock image to icon in profileAddEdit' (#462) from dan/ui:oprofile-fix into master 2 years ago
Dan Ballard 8e92a6ae42 Profile Manager user incokePopup for 0 profiles loaded error; fix lock image to icon in profileAddEdit 2 years ago
erinn 211e388a7d Merge pull request 'fix contacts sort up on send msg; profile list shows unread;' (#460) from dan/ui:unread into master 2 years ago
Dan Ballard dc3872fc8a fix contacts sort up on send msg; profile list shows unread; approved 2 years ago
erinn bc55d472d1 Merge pull request 'Group Creation' (#459) from group_add into master 2 years ago
Sarah Jamie Lewis 60af2930b5 Group Creation 2 years ago
Dan Ballard 1f98899f6b drone: android auto increment AndroidManifest versionCode for second android build (arm64) - fix: don't overwrite file while reading 2 years ago
Dan Ballard b586248bda drone: android auto increment AndroidManifest versionCode for second android build (arm64) 2 years ago
Sarah Jamie Lewis f44cb450a5 Merge pull request 'build.gradle include' (#455) from android-packaging into master 2 years ago
Sarah Jamie Lewis f354f5a81a Merge branch 'master' into android-packaging 2 years ago
Dan Ballard e6145d6e12 extend build.gradle to have seperate paths for arm7 and arm64 and perform the appropriate link/rename so androiddeployqt and therecipeqt can pick up as tho it was not a splits build 2 years ago
Sarah Jamie Lewis ee1a8dbed5 Merge pull request 'linux build can now access assets in various */share/cwtch/assets folders. linux installer installs multiple sized icons' (#456) from dan/ui:share into master 2 years ago
Dan Ballard 4bb5a52b9f linux build can now access assets in various */share/cwtch/assets folders. linux installer installs multiple sized icons 2 years ago
Sarah Jamie Lewis bf27590afe build.gradle include 2 years ago
erinn 4cdb507e5e Merge pull request 'new spanish and italian translations' (#454) from dan/ui:esIt into master 2 years ago
Dan Ballard 3dbcf07396 new spanish and italian translations 2 years ago
Dan Ballard afcceac8cf Merge pull request 'Bugfix: Copy Address Regression' (#452) from group-add into master 2 years ago
Sarah Jamie Lewis 66c46714b7 Bugfix: Copy Address Regression 2 years ago
Dan Ballard 288e14ede2 drone: add android arm64-v6a step (fix?) 2 years ago
Dan Ballard 1962cf9df5 drone: add android arm64-v6a step (fix?) 2 years ago
Dan Ballard ae8702cda2 drone: add android arm64-v6a step 2 years ago
Dan Ballard 85dc5b5714 adding android libs for arm64-v8a 2 years ago
Dan Ballard 4932c728ec drone: android upload sign (strip newline/spaces) 2 years ago
Dan Ballard 0f15141f73 drone: android upload sign (typo) 2 years ago
Dan Ballard db0e8a2395 drone: android upload sign (typo) 2 years ago
Dan Ballard be1959b60c drone: android upload sign 2 years ago
Sarah Jamie Lewis dfb12a2ab0 Merge pull request 'only show settings icon in history warning for default state' (#449) from assetry into master 2 years ago
erinn 17c946de6d only show settings icon in history warning for default state 2 years ago
Sarah Jamie Lewis 9958bb605b Merge pull request 'fix acks, fix lists and bulletin for groups' (#448) from assetry into master 2 years ago
Sarah Jamie Lewis 826c8b3a1d Merge branch 'master' into assetry 2 years ago
erinn bb84e8f46f fix acks, fix lists and bulletin for groups 2 years ago
Sarah Jamie Lewis f168f6aee9 Merge pull request 'add missing assets' (#447) from assetry into master 2 years ago
erinn bc33356ca4 add missing assets 2 years ago
Sarah Jamie Lewis dfdce13e46 Merge pull request 'remove debug info from chatoverlay' (#446) from historywarningfix into master 2 years ago
erinn fa430b7d7c remove debug info from chatoverlay 2 years ago
Sarah Jamie Lewis 4d927c133d Merge pull request 'history warning, overlay model fixes, new zoom system beginnings' (#445) from historywarning into master 2 years ago
erinn 0663488d6d nits 2 years ago
erinn 6263dbf1fa Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning 2 years ago
erinn 1a556d05ce history warning and overlay model fixes 2 years ago
erinn 49bee4deb1 translations and new assets for history warning 2 years ago
erinn 240eb56ebe Merge pull request 'use log/privacy filter' (#444) from dan/ui:logPF into master 2 years ago
Dan Ballard 79052038e6 use log/privacy filter 2 years ago
erinn e5fce8634e Merge pull request 'Save state of root and profile panes open, and selected profile and conversation; jump to those when reloading' (#443) from dan/ui:stateful into master 2 years ago
erinn 09079dd224 Merge branch 'master' into stateful 2 years ago
Dan Ballard b920d3ab8b Save state of root and profile panes open, and selected profile and 2 years ago
erinn 8b6e8d2e98 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning 2 years ago
erinn 473e0a02d0 history warning and beginnings of new zoom system and listoverlay fixes 2 years ago
Dan Ballard b837757617 Merge pull request 'Add Group now Works (with TofuBundle)' (#442) from group-add into master 2 years ago
Sarah Jamie Lewis 6292b5a1b9 Add Group now Works (with TofuBundle) 2 years ago
Dan Ballard cfe0105992 Merge pull request 'fix resizing smaller' (#441) from resizefix into master 2 years ago
erinn bbedeb81c7 fix resizing smaller 2 years ago
erinn 3687ead49f Merge pull request 'responsize size fixes' (#438) from dan/ui:responsive into master 2 years ago
erinn c3deeaa227 Merge branch 'master' into responsive 2 years ago
erinn 96aaf1f0e9 Merge pull request 'fix profile badges to use icons; fix myprofile not re embiggening on single pane' (#439) from dan/ui:badgeIcons into master 2 years ago
erinn 79a8bfb0cf Merge branch 'master' into badgeIcons 2 years ago
Dan Ballard 23eece4424 fix profile badges to use icons; fix myprofile not re embiggening on single pane 2 years ago
Sarah Jamie Lewis 0de8bd19bb Merge pull request 'fix makefile' (#437) from dan/ui:makefile into master 2 years ago
Sarah Jamie Lewis e9b98f2aea Merge branch 'master' into makefile 2 years ago
Dan Ballard 12bed09d4e responsize size fixes 2 years ago
Dan Ballard 8e6f5e813a fix makefile 2 years ago
Sarah Jamie Lewis 4b081a0db6 Merge pull request 'display tor version on settings pane' (#436) from dan/ui:torVer into master 2 years ago
Sarah Jamie Lewis a942bfbba1 Merge branch 'master' into torVer 2 years ago
Dan Ballard 2035e44cfd display tor version on settings pane 2 years ago
Sarah Jamie Lewis 07cbb1054b Merge pull request 'upgrade packaged tors to 0.4.4.6' (#435) from dan/ui:torUp into master 2 years ago
Dan Ballard 0e965d630a upgrade packaged tors to 0.4.4.6 2 years ago
Dan Ballard d4d88ff541 drone nsis: sha256 installer 2 years ago
Dan Ballard d0f90a9b7f drone nsis: .nsi needs to be in deploy dir 2 years ago
Dan Ballard 3cdb2b2455 drone nsis: change windows step to leave a windows dir 2 years ago
Dan Ballard f02083e0d6 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 2 years ago
Dan Ballard c62891b8d9 drone package windows makensis param error 2 years ago
erinn 04aae4d093 Merge pull request 'update nsis script to make installed start menu link use icon' (#434) from nsi into master 2 years ago
erinn 9cc81b1f29 Merge branch 'master' into nsi 2 years ago
Dan Ballard 93dbc6d270 attempt to add nsis win installer generation to drone 2 years ago
Dan Ballard 8b004543ed update nsis script to make installed start menu link use icon 2 years ago
erinn d4e5546079 Merge pull request 'nsis script to make windows installer' (#432) from nsi into master 2 years ago
erinn ba7bb704cd Merge branch 'master' into nsi 2 years ago
Dan Ballard 752e21f89e fixed directory flatening issue 2 years ago
erinn 7aa7f67fd3 Merge pull request 'Fixes: #410' (#430) from user-feedback-hover into master 2 years ago
erinn 6e6045d911 Merge branch 'master' into user-feedback-hover 2 years ago
Sarah Jamie Lewis 16ee1635f5 Fixes: #410 2 years ago
Dan Ballard 9aa4f6d75d nsi to install cwtch, plus scripts and assets to generate it 2 years ago
erinn 38923ef814 Merge pull request 'Support multiline on Android' (#426) from user-feedback-elide into master 2 years ago
erinn 24a7abacd1 Merge branch 'master' into user-feedback-elide 2 years ago
Sarah Jamie Lewis eef74ae8b3 Update 'LICENSE' 2 years ago
Sarah Jamie Lewis 05cd440036 Support multiline on Android 2 years ago
Sarah Jamie Lewis c1bc5a7806 Merge pull request 'input box fixes' (#425) from inputboxfixes into master 2 years ago
Sarah Jamie Lewis d25aadbb2b Merge branch 'master' into inputboxfixes 2 years ago
erinn 7485837669 update opaque, fix inputbox enterkey on android 2 years ago
erinn f8d3277a6f feedback fixes to input box 2 years ago
erinn 0634d34bf2 inputbox fixes: remove twemoji 2 years ago
Dan Ballard 1eec8dbfe0 Merge pull request 'Display name now elides in message' (#423) from user-feedback-elide into master 2 years ago
Sarah Jamie Lewis dd5995628a Merge branch 'master' into user-feedback-elide 2 years ago
Dan Ballard d5e81e9ae3 Merge pull request 'Various Fixes from User Feedback' (#422) from emoji into master 2 years ago
Sarah Jamie Lewis 4e0ecd72c4 Message display name now elides 2 years ago
Sarah Jamie Lewis 6b8a8b8da1 Passworded accounts now require a password 2 years ago
Sarah Jamie Lewis 1d86c3d326 Updating Display name reflects in Messages 2 years ago
Sarah Jamie Lewis ef58f002b3 Peer Settings button goes to Message Pane if already in Settings 2 years ago
Sarah Jamie Lewis 1eb391ecc1 Merge pull request 'redesigned emoji drawer' (#421) from emodrawer2 into master 2 years ago
Sarah Jamie Lewis e74d599d95 Merge branch 'master' into emodrawer2 2 years ago
erinn 1515fb7998 update opaque, add clarification comment 2 years ago
Dan Ballard 78400a17c6 drone android: android and add ANDROID_MODULES_INCLUDE and docker to 2020.01 2 years ago
Dan Ballard 2f6395697e drone android: stop qtsetup generate android and add ANDROID_MODULES_INCLUDE 2 years ago
Dan Ballard e493a18f3f Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 2 years ago
Dan Ballard 44e0f9ebab drone android: stop qtsetup generate android and add ANDROID_MODULES_INCLUDE 2 years ago
Sarah Jamie Lewis de1b3319b1 Merge pull request 'updated splash screen and app icon for android' (#393) from dan/ui:androidSplash into master 2 years ago
Dan Ballard 4f4df63e51 updated splash screen and app icon for android 2 years ago
erinn bbea51b561 redesigned emoji drawer 2 years ago
Dan Ballard 3d509c6810 Merge pull request 'Android Notification - First Cut' (#391) from android_tests into master 2 years ago
Sarah Jamie Lewis 76df3c286d Android Notification - First Cut 2 years ago
Dan Ballard de56f8be15 Merge pull request 'fix messages pane' (#390) from tabbarfix into master 2 years ago
erinn 9e4917ac5b fix messages pane 2 years ago
Dan Ballard f402f515da Merge pull request 'add tabbar' (#389) from tabbar into master 2 years ago
erinn a0081c9d4e fix indents 2 years ago
erinn 94381cb076 adding to new opaque tabbar 2 years ago
erinn a0bbfa7721 add tabbar 2 years ago
erinn 4179e2798b Merge pull request 'gcd.firstTime + SettingsList scrolls' (#388) from android_tests into master 2 years ago
Sarah Jamie Lewis 8340b7aed3 Format gcd vars to spec 2 years ago
Sarah Jamie Lewis e74a0e8dc2 Formatting 2 years ago
Sarah Jamie Lewis 228a9b6ebd gcd.firstTime + SettingsList scrolls 2 years ago
Sarah Jamie Lewis b4b10ca75f Merge pull request 'gcd.torStatus; now peers get networkStatus, save as local attr, and pass to profilerow/myprofile to show online' (#387) from dan/ui:profileStatus into master 2 years ago
Dan Ballard 46ed17eec2 gcd.torStatus; now peers get networkStatus, save as local attr, and pass to profilerow/myprofile to show online 2 years ago
erinn a54aa8e0af Merge pull request 'Android Deep Dive Part 1 of Many' (#378) from android_tests into master 2 years ago
Sarah Jamie Lewis a5c96964e8 Android Bugfixxing Part 1 2 years ago
Sarah Jamie Lewis cb932d3ca3 All Image Changes 2 years ago
Sarah Jamie Lewis 72457d138b Merge pull request 'gifSplash' (#383) from dan/ui:gifSplash into master 2 years ago
Dan Ballard 454d10e28c splash pane now has new cwtch font logo and animated knot 2 years ago
Dan Ballard aadcb0d7c6 splash pane now has new cwtch font logo and animated knot 2 years ago
Sarah Jamie Lewis 4805507014 Merge pull request 'change file logging behaviour to use cwtch dir' (#382) from dan/ui:winLog into master 2 years ago
Sarah Jamie Lewis eb33e46e3d Merge branch 'master' into winLog 2 years ago
Sarah Jamie Lewis 45acecf9d7 Merge pull request 'updating app icon and profile manager tweeks' (#379) from dan/ui:iconTweeks into master 2 years ago
Dan Ballard 483d765146 change file logging behaviour to use cwtch dir 2 years ago
Dan Ballard 36a4e13184 updating app icon and profile manager tweeks 2 years ago
Dan Ballard 5cb284c99c updating app icon and profile manager tweeks 2 years ago
Sarah Jamie Lewis 7f011663d7 Merge pull request 'splash screen is back, just covering ACN/Cwtch app initialization, now with sweet new fade in transition' (#376) from dan/ui:splashFade into master 2 years ago
Dan Ballard 918e44fdb6 splash screen is back, just covering ACN/Cwtch app initialization, now with sweet new fade in transition 2 years ago
erinn 1c463f235c Merge pull request 'search contact list' (#366) from dan/ui:contactSearch into master 2 years ago
Dan Ballard 9701380e3c search contact list 2 years ago
Sarah Jamie Lewis 01428b1371 Merge pull request 'allow cwtch to log to file' (#367) from dan/ui:logFlag into master 2 years ago
Dan Ballard 568b979698 allow cwtch to log to file 2 years ago
Sarah Jamie Lewis c11e541f4e Merge pull request 'ran quality.sh' (#363) from dan/ui:qual into master 2 years ago
Dan Ballard 162ee96a1f ran quality.sh 2 years ago
erinn 0be9447a07 Merge pull request 'add peer / group pane' (#361) from dan/ui:addPeer into master 2 years ago
Dan Ballard 0e5d78cbb9 add peer / group pane 2 years ago
erinn 98d58ebd62 Merge pull request 'fix contactlist not shrinking in full mode' (#360) from fixContactList into master 2 years ago
Dan Ballard 5ca904b675 fix contactlist not shrinking in full mode 2 years ago
erinn d144f0d8b0 Merge pull request 'Self-Hosted Servers Experiment' (#359) from server_launch into master 2 years ago
Sarah Jamie Lewis a276d5732a Self-Hosted Servers Experiment 2 years ago
erinn fd45f72a09 Merge pull request 'fix p2p get name sync issue; overlay offline contact portraits' (#358) from dan/ui:nameSync into master 2 years ago
Dan Ballard 843790c27b fix p2p get name sync issue; overlay offline contact portraits 2 years ago
Sarah Jamie Lewis 9721999e9b Merge pull request 'add name on profile create' (#357) from dan/ui:createProfileName into master 2 years ago
Dan Ballard 6117486808 add name on profile create 2 years ago
erinn b80ecc0a7d Merge pull request 'Gate Group Functionality' (#356) from serverpane into master 2 years ago
erinn 2433c667d8 Merge branch 'master' into serverpane 2 years ago
Sarah Jamie Lewis 143dd9693c Update Cwtch Release 2 years ago
Sarah Jamie Lewis 91c182b880 Gate Group Functionality 2 years ago
Sarah Jamie Lewis 48d375f007 Merge pull request 'turning off unicode emoji (for now...?)' (#355) from TheUnicodeDefeatium into master 2 years ago
erinn 223936cda8 turning off unicode emoji (for now...?) 2 years ago
Dan Ballard f2a4c61610 fix assetPath on windows (#354) 2 years ago
Dan Ballard a247fd91c0 Merge pull request 'Experimental Gating + Server List Sketch' (#353) from serverpane into master 2 years ago
Sarah Jamie Lewis 1b0d69dfb2 Experimental Gating + Server List Sketch 2 years ago
Dan Ballard fec49cf1fd Merge pull request 'Experimental Gating + Server List Sketch' (#351) from serverpane into master 2 years ago
Sarah Jamie Lewis bfb431cbaf Experimental Gating + Server List Sketch 2 years ago
Sarah Jamie Lewis ada9dc7bb9 Merge pull request 'add flag to force windows to log to console' (#352) from consoleFlag into master 2 years ago
Dan Ballard 93776e0ca8 add flag to force windows to log to console 2 years ago
erinn 1de7e5bd6a Merge pull request 'redesign of profile add / edit pane' (#346) from dan/ui:profileAddEdit into master 2 years ago
Dan Ballard 1b57b5b0c6 redesign of profile add / edit pane 2 years ago
Dan Ballard 4fb726a926 add windows debug exports 2 years ago
Dan Ballard 4580d616de Merge pull request 'new message model' (#347) from mm into master 2 years ago
erinn a52794d562 addressing review comments 2 years ago
erinn cd241e45c4 addressing review comments 2 years ago
erinn e09ad91ab5 finishing first attempt at message model pr. mainly group acks 2 years ago
erinn 7bb2198879 update opaque 2 years ago
erinn 7398bec25b message model take one 2 years ago
erinn db315f8de1 message model take one 2 years ago
Sarah Jamie Lewis e2ab860c72 ACN Process Management (#345) 2 years ago
Dan Ballard e3717dd175 Merge pull request 'Use Connectivity + Fix Server Update Bug' (#343) from torrc into master 2 years ago
Sarah Jamie Lewis c4d5d889b6 Use Connectivity + Fix Server Update Bug 2 years ago
Dan Ballard 9e784ba4ea Merge pull request 'Tapir Integtation' (#325) from tapir-server into master 2 years ago
Sarah Jamie Lewis 325c959b69 Server Info Pane Fixups 2 years ago
Sarah Jamie Lewis 35cd963ec3 Tapir Integtation II 2 years ago
erinn 59dd9c34d6 Merge pull request 'Adding stub server list and using responsive pane' (#324) from dan/ui:03-responsivePane into master 2 years ago
Dan Ballard 733efb5d1d Adding stub server list and using responsive pane 2 years ago
Dan Ballard 78e3859b64 updating opaque to newest version 2 years ago
erinn a814dee7af Merge pull request 'WIP 02-contacts' (#323) from dan/ui:02-contacts into master 2 years ago
erinn bd10a2c303 Merge pull request 'WIP profile manager quick pass to be less hideous' (#322) from dan/ui:01-profiles into master 2 years ago
Dan Ballard c580597c8d make contact badge just be green/online, and move unread messages to right side of row 2 years ago
Dan Ballard 31abd0020e profile manager quick pass to be less hideous 2 years ago
erinn c55a6b196a Merge pull request 'dark theme fixes' (#321) from dan/ui:06-darkthemeContacts into master 2 years ago
Dan Ballard 27a09dd8cb dark theme updates 2 years ago
erinn 21201d2e68 Merge pull request 'Chat overlay messages and message editor redesign' (#320) from dan/ui:05-sendmsg into master 2 years ago
Dan Ballard 0ba6a200cc Message Editor refactor; and small bits like tabs; and a divider between contactlist and overlay pane 2 years ago
Dan Ballard af3c593228 Messages redesign: messages now follow design; rework timestamp workflow; inject dates into message pane 2 years ago
Dan Ballard f91f932c00 Merge pull request 'make new profile button clickable' (#319) from bf-new-profile into master 2 years ago
erinn 02c2900aa0 make new profile button clickable 2 years ago
Dan Ballard 08722d7b97 Merge pull request 'Peer History Save & Lists Refresh' (#315) from peer-save into master 2 years ago
Sarah Jamie Lewis 66676076e9 Fixes on List Overlay. Connection Error Sketch.Peer Save 2 years ago
Dan Ballard 5694dfe23e Migrate to new peer authorization levels, add new peer approval 2 years ago
Sarah Jamie Lewis b0aad3a1cc Merge pull request 'migrate to new cwtch authorizations + add new peer and blocked peer workflows to contact list' (#308) from dan/ui:03-approveBlock into master 2 years ago
Dan Ballard 94e30f4962 blocked contacts have normal row colors 2 years ago
Dan Ballard 315c66009e Migrate to new peer authorization levels, add new peer approval 2 years ago
Dan Ballard b8ffa85fac Add global settings pane; migrate peer settings to new opaque settings widgets; minor fixes; add global settings storage; rework global settings settings 2 years ago
Sarah Jamie Lewis 1337f97345 Merge pull request 'Add comboboxs to settings, minor tweaks' (#303) from dan/ui:combobox into master 2 years ago
Sarah Jamie Lewis 310d313034 Merge pull request 'Add global settings pane; migrate peer settings to new opaque settings widgets; minor fixes; add global settings storage; rework global settings settings' (#302) from dan/ui:gsettings into master 2 years ago
Dan Ballard 37dab30d5e adopt new opaque combobox; fix toolbar color on contactlist only pane; fix settings pane color to pane color 2 years ago
Dan Ballard 9c8134e0c3 Add global settings pane; migrate peer settings to new opaque settings widgets; minor fixes; add global settings storage; rework global settings settings 2 years ago
Dan Ballard ec60073ce2 update README with git submodule instructions 2 years ago
Dan Ballard 8dacea29bb Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 2 years ago
Dan Ballard da72629387 move qmlfmt to serpeate standalone openprivacy repo 2 years ago
Dan Ballard de2604b578 Merge pull request 'move widgets into the Opaque submodule project' (#298) from opaquemodules into master 2 years ago
erinn 5cf1d6a1db change Widgets to Opaque in qml imports 2 years ago
erinn ebfa5352b4 re-add statusbar 2 years ago
erinn f609dcaac4 support for translations in opaque 2 years ago
erinn 219065dde5 update translations 2 years ago
erinn 3ffdaa1ca3 adding back components that shouldnt have been moved to opaque 2 years ago
erinn 533b0d3fe0 restoring cwtch-specific widgets that were accidentally moved to opaque 2 years ago
erinn 282cc9d516 do random things with go.mod 2 years ago
erinn 92adc2a61d move widgets into the Opaque submodule project 2 years ago
Sarah Jamie Lewis ba22cf93c7 Merge pull request 'add IconTextField for contact list search textfield and UnderlineTextField for profile manager password (and further profile pane uses)' (#296) from dan/ui:textfields into master 2 years ago
Dan Ballard d0d8d4bd3b add IconTextField for contact list search textfield and UnderlineTextField for profile manager password (and further profile pane uses) 2 years ago
Sarah Jamie Lewis 02d4e04804 Merge pull request 'adding bottom status bar for global network status' (#285) from dan/ui:statusBar into master 2 years ago
Dan Ballard 40e0c5f700 adding bottom status bar for global network status 2 years ago
Sarah Jamie Lewis 4ccf48a50f Merge pull request 'Global Toolbar' (#284) from dan/ui:toolbar into master 2 years ago
Dan Ballard 3221e30701 Global Toolbar 2 years ago
Dan Ballard 22814ed160 Merge pull request 'ToggleSwtich' (#283) from sarah-ui into master 2 years ago
Sarah Jamie Lewis d77c33a485 ToggleSwtich 2 years ago
Sarah Jamie Lewis 0c65ec9c8e Merge pull request 'fixing qml errors' (#282) from dan/ui:qmlFix into master 2 years ago
Dan Ballard 1b82054e76 Merge pull request 'More layout fixes + HLine' (#281) from sarah-ui into master 2 years ago
Dan Ballard 92a1561a12 fixing qml errors 2 years ago
Sarah Jamie Lewis 2aa2eabf48 More layout fixes + HLine 2 years ago
Sarah Jamie Lewis 73d8951d6e Merge pull request 'new qmlfmt script and test application to main.qml' (#280) from dan/ui:qmlfmt into master 2 years ago
Dan Ballard 1af5662416 new qmlfmt script and test application to main.qml 2 years ago
Dan Ballard 1319674940 Merge pull request 'Adding Font Assets' (#279) from sarah-ui into master 2 years ago
Sarah Jamie Lewis 65de146c34 Updating Scrollbar Theme 2 years ago
Sarah Jamie Lewis 4bb5ef6a1c Adding Font Assets 2 years ago
Dan Ballard 427808b646 Merge pull request 'ButtonTextField, Some Theme Updates and Bug Fixes' (#278) from sarah-ui into master 2 years ago
Sarah Jamie Lewis 00522884ae Add DropShadow 2 years ago
Sarah Jamie Lewis ce8e46a4dd ButtonTextField, Some Theme Updates and Bug Fixes 2 years ago
Sarah Jamie Lewis 0a9b2ed6f5 Merge pull request 'Redesign my profile widget to match design. It dynamically resizes and' (#277) from dan/ui:04-widgets into master 2 years ago
Dan Ballard 5343348aa9 Redesign my profile widget to match design. It dynamically resizes and 2 years ago
Sarah Jamie Lewis 2f251aa4da Merge pull request 'Redesign: contact Row and Picture: themeing and modularizing:' (#276) from dan/ui:03-widgets into master 2 years ago
Dan Ballard 7495a6dca4 badge # count; contact name, onion elipses if not enough space 2 years ago
Dan Ballard 522f395d86 Redesign: contact Row and Picture: themeing and modularizing: 2 years ago
Dan Ballard cef2ae28d2 Merge pull request 'dont parse emojis until message rendertime' (#275) from loadfaster into master 2 years ago
erinn 481c8ca701 dont parse emojis until message rendertime 2 years ago
erinn bf213cc863 dont parse emojis until message rendertime 2 years ago
erinn 975ad0a8ac Merge pull request '02-widgets' (#274) from dan/ui:02-widgets into master 2 years ago
erinn 3d7ebf64af Merge pull request 'prototype of themeing' (#273) from dan/ui:01-theme into master 2 years ago
Dan Ballard 2037fc6d21 rename SimpleButton to button, make a Widgets. import everywhere; basic themeing 2 years ago
Dan Ballard 2abd9ba53b prototype of themeing 2 years ago
Sarah Jamie Lewis 632136f193 Merge pull request 'Using new cwtch attributes and get/ret val requests' (#272) from dan/ui:keyval into master 2 years ago
Dan Ballard fc3bdb76f6 New getVal/retVal message handling, and new attribute storage schema 2 years ago
Dan Ballard 631810df5b get therecipe-qt-docker-imgs sh 2 years ago
Sarah Jamie Lewis 64ff9aed24 Merge branch 'logconn' of dan/ui into master 2 years ago
Dan Ballard 35246ed364 migrate to stand alone log and connectivity packages 2 years ago
Sarah Jamie Lewis 2a1209c07a Merge branch 'race' of dan/ui into master 2 years ago
Dan Ballard b834d536c5 using race condition safe functions in cwtch 2 years ago
Sarah Jamie Lewis dbb7a563f1 Merge branch 'windows_build' of cwtch.im/ui into master 2 years ago
Dan Ballard 9fcca6580d Fix assets loading in QML on windows 2 years ago
Sarah Jamie Lewis ccf6df326e Merge branch 'profileImageAssets' of dan/ui into master 2 years ago
Dan Ballard 94f5dd20bd strip all absolute paths from stored profile images 2 years ago
Dan Ballard 449bccd626 Merge branch 'uibugfixs' of cwtch.im/ui into master 2 years ago
Dan Ballard 4e7173f878 drone add special build and deploy for branch master:windows_build 2 years ago
Dan Ballard 35e53a4d60 drone remove -H windowsgui for windows build, does the opposite of deiered 2 years ago
Dan Ballard da3c93792c drone build experiment to rid windows of tor dosbox 2 years ago
Sarah Jamie Lewis 0eb27d6525 Bug Fixes 3 years ago
erinn a4ae5dcbed assets folder + emoji drawer 3 years ago
Dan Ballard fee151cf26 save edit name fix 3 years ago
Sarah Jamie Lewis f5f6d4b947 Merge branch 'pwFixes' of dan/ui into master 3 years ago
Dan Ballard 9397131967 fix password not match error; fix clearing add/edit pane on reset 3 years ago
Sarah Jamie Lewis e635a3a384 Merge branch 'minori18n' of dan/ui into master 3 years ago
Dan Ballard 8d9681e130 upgrade cwtch 0.3.8 (tapir 0.1.14) 3 years ago
Dan Ballard 8e347d79b8 Merge branch 'master' into minori18n 3 years ago
Dan Ballard a9041c6485 minor translations updates 3 years ago
Sarah Jamie Lewis cedf39aaa6 Merge branch 'deleditProfile' of dan/ui into master 3 years ago
Dan Ballard aa81c40e50 tranlations for edit and delete profiles 3 years ago
Dan Ballard 7e0945583e go mod cwtch to 0.3.7; add profile list sorting by onion 3 years ago
Dan Ballard 13239c094c change password 3 years ago
Dan Ballard d77851a835 profile delete. profile version tagging. minor qml refactor (less importing widgets directly into qml namespace) 3 years ago
Sarah Jamie Lewis 5ca2fa6332 Merge branch 'add-profile' of dan/ui into master 3 years ago
Dan Ballard fbecb20e05 Merge branch 'master' into add-profile 3 years ago
Dan Ballard 541f4f7da4 profile edit (name) and delete (non functioning cus cwtch doesnt support) ui 3 years ago
Dan Ballard ba14e8ad72 Merge branch 'lockProfile' into add-profile 3 years ago
Sarah Jamie Lewis 5df3fd4cf4 Merge branch 'lockProfile' of dan/ui into master 3 years ago
Dan Ballard 1b20c9ed02 gcd and manager now lock gcd to qml ui events for non selected profile 3 years ago
Dan Ballard d3e178474d show add profile button 3 years ago
Dan Ballard 7a7be2777b gcd and manager now lock gcd to qml ui events for non selected profile 3 years ago
Sarah Jamie Lewis 434907ea0d Merge branch 'profileMan' of dan/ui into master 3 years ago
Dan Ballard bac4accb1b profile manager: screen, unlock, select, back to 3 years ago
Sarah Jamie Lewis 91f397d9e1 Merge branch 'contact-sort' of dan/ui into master 3 years ago
Dan Ballard 606f7c7eb6 contactList: new messages make contact float to top 3 years ago
Dan Ballard c77737be1d Merge branch 'network_check' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 6dd346fe96 Alert the user when there is no internet 3 years ago
Sarah Jamie Lewis 54918e612f Merge branch 'refactor' of dan/ui into master 3 years ago
Dan Ballard 35fa0adb67 rename packages to better align with their purposes now 3 years ago
Sarah Jamie Lewis 4f205f7c4f Merge branch 'peerRace' of dan/ui into master 3 years ago
Dan Ballard d6eebe82bd fix race condition in ui/gcd vs cwtch app start 3 years ago
Sarah Jamie Lewis 628e414376 Merge branch 'addContact' of dan/ui into master 3 years ago
Dan Ballard 0964363b89 fixes for adding/imorting contacts; remove unused 'letter' class 3 years ago
Sarah Jamie Lewis e2c3a82ea0 Merge branch 'uistate' of dan/ui into master 3 years ago
Dan Ballard f0099acb2b remove uistate's state; remove contact; remove trusted 3 years ago
Dan Ballard 30b8d9ab6d merge 3 years ago
Dan Ballard 1bf2910b4d remove 'badge'/unread treacking state from go code; now uses attributes to store in back end and maintain in front end 3 years ago
Dan Ballard 5bea6bdc47 remove 'badge'/unread treacking state from go code; now uses attributes to store in back end and maintain in front end 3 years ago
Sarah Jamie Lewis 1ad9d5be20 Merge branch 'messages' of dan/ui into master 3 years ago
Dan Ballard ee30a3227d remove frontend message storage 3 years ago
Sarah Jamie Lewis 121a62c142 Merge branch 'makefile' of dan/ui into master 3 years ago
Dan Ballard 3fd5755ed9 makefile updates with linux and android targets and go mod support 3 years ago
Dan Ballard 1773e52cbd undo drone builds share fetch 3 years ago
Dan Ballard a75f7778be make builds share vendor fetch 3 years ago
Dan Ballard b80500da35 update go modules, drone try to use 3 years ago
erinn cf10647d4c Merge branch 'reconnect' of dan/ui into master 3 years ago
Dan Ballard ab92e68628 ping ACN status on window acticate (mostly for android) 3 years ago
Sarah Jamie Lewis 62911b03fa Merge branch 'dev-profiles' of dan/ui into master 3 years ago
Dan Ballard f3a453f5a6 dev builds use seperate profiles 3 years ago
Sarah Jamie Lewis 45973dfaf4 Merge branch 'linux-install' of dan/ui into master 3 years ago
Dan Ballard db817dbed2 install Desktop file for linux 3 years ago
Sarah Jamie Lewis c3189553c8 BUGFIX: Prevent the user from opening a conversation with themselves 3 years ago
erinn 3a744197b8 translations for InplaceEditText Update button 3 years ago
erinn ab8153f042 editbox improvements 3 years ago
erinn 4dd686476a editbox improvements 3 years ago
erinn 742eefd950 editbox improvements 3 years ago
erinn 1ef634d25d Merge branch 'fixGroupInvite' of dan/ui into master 3 years ago
Dan Ballard 504a935005 fixing group invite workflow: ui takes responsibility for group invite addition (and peers) 3 years ago
erinn 033c1c4279 Merge branch 'startFix' of dan/ui into master 3 years ago
Dan Ballard 81c0047c20 Fix client flag not being set right causing two LoadProfile messages to be issued causing error causing erroneous CreatePeers 3 years ago
Dan Ballard 6af91b71c1 Android Back button like home button (#212) 3 years ago
Dan Ballard fb0e5117c1 Merge branch 'ebf20190911a' of cwtch.im/ui into master 3 years ago
erinn 85378e3ca8 better group loading progress bar display 3 years ago
erinn c230187d15 Merge branch 'ui-tweaks' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 594b55de1d Toggle Allowing Unknown Peers 3 years ago
Dan Ballard 4141d21dcb drone disable go mod 3 years ago
Dan Ballard 21b6429a7f drone fix ordering 3 years ago
Dan Ballard c9f4afb214 drone prolly cannot vendor, lets try mods + get -d 3 years ago
Dan Ballard 02dc1b9b03 drone go mod again with newer 3 years ago
Sarah Jamie Lewis 8c51c10eb0 Merge branch 'readmeLin' of dan/ui into master 3 years ago
Dan Ballard 68e66fb62d README updates for 0.2 3 years ago
Dan Ballard 208a18da7f drone revert to working 3 years ago
Dan Ballard 956e7a4413 drone 4g mem 3 years ago
Dan Ballard 4da95090c5 drone clean 3 years ago
Sarah Jamie Lewis 1e8dd756a7 Merge branch 'infinite' of dan/ui into master 3 years ago
Dan Ballard c23a922599 drone mod therexipe june 3 years ago
Dan Ballard 8c5252c32c drone fetch 3 years ago
Dan Ballard 589ae29ac7 drone typo 3 years ago
Dan Ballard f04733f422 drone mod vendor rm 3 years ago
Dan Ballard 3eccf2d510 drone just go mod for checkout 3 years ago
Sarah Jamie Lewis a8edcc8173 Merge branch 'logfileWin' of dan/ui into master 3 years ago
Dan Ballard 882a9abefb changes in cwtch event.queue 3 years ago
Dan Ballard ccf497c840 drone reset to go get no mod support 3 years ago
Dan Ballard 4cabff44f1 drone no downalod, straight to vendor 3 years ago
Dan Ballard cf5d54edef drone ordering of rm 3 years ago
Dan Ballard c3af080db4 drone rm other copy off therecipe we downloaded? 3 years ago
Dan Ballard a975e22482 try turning off mod support earlier so it doesn cgo build munge things 3 years ago
Dan Ballard 29307657b5 drome rm therecipe vendor 3 years ago
Dan Ballard 9b29a45ea0 drone not download env 3 years ago
Dan Ballard f3c80c2e48 drone mod work adapting from issue 3 years ago
Dan Ballard 390d8a6db9 drone vendor and rm therecipe 3 years ago
Dan Ballard da46a81265 disable modules 3 years ago
Dan Ballard 6bf9458b1c remove the recipe from go.mod, see if drone cna handle 3 years ago
Dan Ballard 7edb9b0961 first pass at go mod support for drone 3 years ago
Dan Ballard 2c0925004d windows log to file 3 years ago
erinn f029da4c49 Merge branch 'ui-tweaks' of cwtch.im/ui into master 3 years ago
erinn 2d9a558b89 Merge branch 'delete' of dan/ui into master 3 years ago
erinn c6f9b8a271 Merge branch 'windows' of dan/ui into master 3 years ago
Dan Ballard 12fde77c71 removing fake delete to surface fake deleted contact as we still connect to them; adopting proper delete support added to cwtch 3 years ago
Dan Ballard c6ed152809 start tor on windows properly 3 years ago
Sarah Jamie Lewis 928ee5a76f UI Twraks 3 years ago
Dan Ballard 6de3805ecf Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 3 years ago
Dan Ballard a84a0ae1b4 drone not double up on version tag for directory 3 years ago
erinn a31a073847 Merge branch 'unlocking' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 0d6dd0e7ed Unblocking 3 years ago
erinn c6ca6d2567 Merge branch 'blocking' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 9a4c24626d Expose Blocking in the UI (initial version) 3 years ago
Dan Ballard 1b54cf2a19 switching to static therecipe build images. Also adding version tag to buildfiles dir 3 years ago
Sarah Jamie Lewis ec0766946f Merge branch 'qservice' of dan/ui into master 3 years ago
Sarah Jamie Lewis f9713bb1e0 Merge branch 'pluginRetry' of dan/ui into master 3 years ago
Dan Ballard 49fef3f800 Use QAndroidService to properly have the service run on Android 3 years ago
Dan Ballard 3c9abe2a0b drone bump to use QT 5.13 3 years ago
Dan Ballard 7e0786aea2 use the new retryContact plugin 3 years ago
Dan Ballard 732d8ab671 Merge branch 'tapir' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 10f892d10d fmt 3 years ago
Sarah Jamie Lewis d13c53cc73 Tapir Integration 3 years ago
Dan Ballard 741443bcf3 undo testing log setup 3 years ago
Dan Ballard eca82ae45d update to match connection.ConnectionStateToType name change for Goland 3 years ago
Sarah Jamie Lewis f973a2bfe5 Merge branch 'syncContacts' of dan/ui into master 3 years ago
Dan Ballard 4c626dc922 fix race condition where possible group/contact nick is not set right in ui 3 years ago
Dan Ballard ed904ed79d fix race conditions around contact access 3 years ago
Sarah Jamie Lewis 8fe6648100 Merge branch 'syncListeners' of dan/ui into master 3 years ago
Dan Ballard 5584fba6e5 fix race potentil race condition where listeners were not subscribed before events started being emmited 3 years ago
erinn f4b1296aa2 Merge branch 'appReload' of dan/ui into master 3 years ago
Dan Ballard 412e1f1713 Adopt cwtch app level reload system; Also minor tweaks to cwtch gropup loading progress bar logic and chat disable tet field logic 3 years ago
erinn 74dd48fdc1 Merge branch 'acnEvent' of dan/ui into master 3 years ago
Dan Ballard 56b7aec403 Use ACN events 3 years ago
erinn 3ba48d3bfd Merge branch 'clientServFlag' of dan/ui into master 3 years ago
Dan Ballard 4e671a7b3f add flag to allow running client/service on desktop 3 years ago
erinn d85961bb14 Merge branch 'android-service' of dan/ui into master 3 years ago
Dan Ballard 75111e0421 port from cwtch.app to appClient and appService 3 years ago
Dan Ballard 9400d5aa63 refactoring of main to mainUi() and mainService() 3 years ago
Dan Ballard 8a666a7f37 starts a go service 3 years ago
Dan Ballard b287d0b27e work on android service 3 years ago
erinn 1011a37d54 Merge branch 'clientServ' of dan/ui into master 3 years ago
Dan Ballard 18b9cc41e0 Minor updates to take avantage of additional events from the cwtch app and API changes 3 years ago
Sarah Jamie Lewis fec5b994d1 Merge branch 'ebf201906041258' of cwtch.im/ui into master 3 years ago
erinn 86156d2f16 permit clicks within chatoverlay editbox 3 years ago
erinn 007e485e76 Merge branch 'cwtchRefactor2' of dan/ui into master 3 years ago
Dan Ballard 30fbbef6b7 Refactor to match cwtch refactor - presense changes are events, minor 3 years ago
erinn b6f0e7f171 Merge branch 'progress' of dan/ui into master 3 years ago
Dan Ballard 672570ed42 display progress of group loading and disable sending to groups until loaded 3 years ago
Dan Ballard fa8d2007ec Merge branch 'ebf' of cwtch.im/ui into master 3 years ago
erinn f4518cba9f merge 3 years ago
erinn 4494a2b168 chatoverlay scaling 3 years ago
erinn e60b2fae0b Merge branch 'android-notification' of dan/ui into master 3 years ago
Dan Ballard fe5dd1e615 general purpose and ongoing android notifications 3 years ago
Dan Ballard c7c464e21e Merge branch 'ebf' of cwtch.im/ui into master 3 years ago
erinn 61571989e7 make most things obey ui scale 3 years ago
Sarah Jamie Lewis 5cb93c8fe9 Merge branch 'ebf201904101353' of cwtch.im/ui into master 3 years ago
erinn 6d5aad4a4d message leaked to logs in debug mode 3 years ago
erinn b3c5b08a74 Merge branch 'handler' of dan/ui into master 3 years ago
Dan Ballard 07e660ab30 fix cant call argument as function 3 years ago
erinn 7ce73ec89d Merge branch 'qt512fix' of dan/ui into master 3 years ago
Dan Ballard 4b9f3f136e fix for QT 5.12 qml not handling function pointers to handlers 3 years ago
erinn 37f5cbc9b4 Merge branch 'makefile' of dan/ui into master 3 years ago
Dan Ballard c1e4f866e4 makefile to clean junk 3 years ago
erinn 029cd93713 Merge branch 'android-name' of dan/ui into master 3 years ago
Dan Ballard e854d7ff11 Merge branch 'ebf201904081214' of cwtch.im/ui into master 3 years ago
Dan Ballard 5493b2f988 change android application id 3 years ago
erinn 32a61f3c56 make all overlays obey prependmessage 3 years ago
erinn a3108c2581 faster group loading 3 years ago
Dan Ballard 493fbeba38 drone android + windows build versions 3 years ago
Dan Ballard 8a8cd9f804 drone fetch tags... 3 years ago
Dan Ballard f425e3ee32 drone builddate and buildver for linux 3 years ago
erinn 9f6eb6dfcb Merge branch 'version' of dan/ui into master 3 years ago
Dan Ballard eeb167ce38 accept version at build time; display version in settings pane 3 years ago
erinn dfef958c68 Merge branch 'i18n-tooltip' of dan/ui into master 3 years ago
erinn 9ff099418f Merge branch 'android' of dan/ui into master 3 years ago
Dan Ballard e1d1715023 translate tooltip 3 years ago
Dan Ballard 0f81b4430a disable emoji parsing code on android for now to enable typing 3 years ago
Dan Ballard 90c9405b7e Merge branch 'ebf201903261119' of cwtch.im/ui into master 3 years ago
erinn ded921a898 add translation_fr.qm to git 3 years ago
erinn f26fd38bf0 Merge branch 'splash' of dan/ui into master 3 years ago
Dan Ballard abef1472d8 splash pane with custom loading progressbar; custom pre splash screen for android 3 years ago
Dan Ballard b75b374e57 Merge branch 'ebf201903251321' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 1cfb38d830 Merge branch 'ebf201903251211' of cwtch.im/ui into master 3 years ago
erinn 8a30cc20a1 add fr to language switcher 3 years ago
erinn 7bb8257420 proper flag parsing 3 years ago
erinn 78d958e5f0 Merge branch 'fr' of juju/ui into master 3 years ago
erinn 71defd5ae3 Merge branch 'de' of dan/ui into master 3 years ago
Dan Ballard 34d09eb69d DE translation from cliff 3 years ago
juju4 d45d7c24ab add french translation 3 years ago
Dan Ballard e0fd78be73 Merge branch 'ebf201903201404' of cwtch.im/ui into master 3 years ago
erinn 9f8863559d allow clicking off textboxes in the control pane 3 years ago
Dan Ballard a552fe885b Merge branch 'ebf201903201404' of cwtch.im/ui into master 3 years ago
erinn 5ac792826a make inplaceedittext work on focus lost 3 years ago
Dan Ballard 8b30638373 Merge branch 'ebf201903181652' of cwtch.im/ui into master 3 years ago
erinn ce94f649d2 language switcher! 3 years ago
erinn a19073c8c4 Merge branch 'pt_BR' of agentofuser/ui into master 3 years ago
erinn 1e72a59829 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201903181652 3 years ago
erinn 196e8fad68 language switcher 3 years ago
erinn b0027c9e0e Update 'README.md' 3 years ago
erinn 4e17b11c49 Update 'README.md' 3 years ago
Agent of User 7f3dd9663e i18n: minor pt_BR edit 3 years ago
Agent of User bfa9bbb039 Compile pt_BR translations 3 years ago
Agent of User 5eba883bf0 Translate to Brazilian Portuguese (pt_BR) 3 years ago
Dan Ballard 28c19d7e4b drone compile translations 3 years ago
Dan Ballard 84b6bdd045 no translation refresh in drone. 3 years ago
Dan Ballard c73d7603ef drone to compile translation files (lrelease) 3 years ago
Dan Ballard 68f4bee72e update README translation instructions 3 years ago
Dan Ballard 4c1fd05425 Merge branch 'typo' of agentofuser/ui into master 3 years ago
Agent of User ba99fc612c Fix typo: s/zoon/zoom/ 3 years ago
erinn a43d148da8 Merge branch 'translate-en' of dan/ui into master 3 years ago
Dan Ballard e4db07bee8 Add english translations. change translatable strings to ids 3 years ago
erinn c36d74639e Merge branch 'translate' of dan/ui into master 3 years ago
Dan Ballard 901109409b adding i18n support 3 years ago
erinn 7a9022bac1 Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis bcd81c813d Add User Feedback when hovering over a contact in groups 3 years ago
erinn ac6fb8d2e8 Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis c483bded55 Only use recieved messages to update the group membership 3 years ago
erinn 713c3ed72d Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis 153651478a Adding Basic Group Membership Pane 3 years ago
Sarah Jamie Lewis eaa700ba57 Merge branch 'ebf201903051402' of cwtch.im/ui into master 3 years ago
erinn c4b0eeccfb Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
erinn 202153bab2 fix implicitwidth issue 3 years ago
Sarah Jamie Lewis d4abc25ed0 Remove Info Log 3 years ago
erinn ebdaf54ff9 Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Dan Ballard 2e7f49bde4 drone branch restrict master 3 years ago
Sarah Jamie Lewis a9b1f7904a Fixing Error Handling for Peer Connections, Ack's now don't ack'd error'd messages. 3 years ago
Dan Ballard d6fc4766a0 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 3 years ago
Dan Ballard 7b350d4c54 Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Dan Ballard 3cc713ed9a drone restict when builds by repo 3 years ago
Sarah Jamie Lewis 18dd7cc4b7 Fix server init bug 3 years ago
Dan Ballard 2a6fb029fd drone restict when builds 3 years ago
Dan Ballard f4368a0810 drone sha256 3 years ago
Dan Ballard f886a626b7 drone needs git 3 years ago
Dan Ballard afa6aa94c4 drone lol needs 3gb? 3 years ago
Dan Ballard 35e35656cb drone dated hashed dir 3 years ago
Sarah Jamie Lewis dd1df6f916 Merge branch 'torwin' of dan/ui into master 3 years ago
Dan Ballard cb64131d0b win tor files 3 years ago
Dan Ballard e33e72d759 tor for windows 3 years ago
Dan Ballard c756c6d2c7 Merge branch 'master' of https://git.openprivacy.ca/cwtch.im/ui 3 years ago
Dan Ballard c84d5eb643 drone build windows 3 years ago
Dan Ballard 7b7715539e Merge branch 'alpha-updates' of cwtch.im/ui into master 3 years ago
Sarah Jamie Lewis b2c9663564 Add Back Button 3 years ago
Dan Ballard baa0a71f45 drone build step get secret 3 years ago
Dan Ballard 06b8820c3b drone build deploy android 3 years ago
Dan Ballard e2147fbf6a drone new key / no echo 3 years ago
Dan Ballard 0777bfa68c drone base64 key 3 years ago
Dan Ballard 741cb78b0a drone build steps push files 3 years ago
Dan Ballard 9c5d8c6df4 drone build steps push files 3 years ago
Dan Ballard a7c769b49f attempt to deploy files 3 years ago
Dan Ballard e3c52e916f drone/ android env defs 3 years ago
Dan Ballard 466b55f8bc drone - android : change base 3 years ago
Dan Ballard 1361d9d12e drone build android 3 years ago
Dan Ballard 39e0c81f47 drone go get -d 3 years ago
Dan Ballard eb50e36849 merge README 3 years ago
Dan Ballard ce606b99b2 updating windows instructions 3 years ago
  1. 206
      .drone.yml
  2. 3
      .gitignore
  3. 3
      .gitmodules
  4. 89
      ANDROID_DEBUGGING.md
  5. 2
      LICENSE
  6. 33
      Makefile
  7. 10
      QML_DEBUG_NOTES.md
  8. 65
      README.md
  9. 73
      android/AndroidManifest.xml
  10. 150
      android/build.gradle
  11. BIN
      android/libs/arm64-v8a/libQt5AndroidExtras.so
  12. BIN
      android/libs/arm64-v8a/libtor.so
  13. BIN
      android/libs/armeabi-v7a/libQt5AndroidExtras.so
  14. BIN
      android/libs/armeabi-v7a/libtor.so
  15. BIN
      android/res/drawable-hdpi/ic_launcher.png
  16. BIN
      android/res/drawable-mdpi/ic_launcher.png
  17. BIN
      android/res/drawable-xhdpi/ic_launcher.png
  18. BIN
      android/res/drawable-xxhdpi/ic_launcher.png
  19. BIN
      android/res/drawable-xxxhdpi/ic_launcher.png
  20. BIN
      android/res/drawable/cwtch_logo.png
  21. BIN
      android/res/drawable/cwtch_title.png
  22. BIN
      android/res/drawable/ic_launcher.png
  23. BIN
      android/res/drawable/knot.png
  24. 15
      android/res/drawable/splash.xml
  25. BIN
      android/res/drawable/splash_350.png
  26. 6
      android/res/values/apptheme.xml
  27. 5
      android/res/values/strings.xml
  28. 108
      android/src/ca/openprivacy/cwtch/ui/CwtchActivity.java
  29. 15
      android/src/ca/openprivacy/cwtch/ui/CwtchService.java
  30. 19
      assets/core/account_blocked.svg
  31. BIN
      assets/core/account_blocked.webp
  32. 1
      assets/core/account_circle-24px.svg
  33. BIN
      assets/core/account_circle-24px.webp
  34. 1
      assets/core/account_circle-24px_lines.svg
  35. BIN
      assets/core/account_circle-24px_lines.webp
  36. 22
      assets/core/account_circle-24px_lines_thin-blocked.svg
  37. BIN
      assets/core/account_circle-24px_lines_thin-blocked.webp
  38. 20
      assets/core/account_circle-24px_lines_thin.svg
  39. BIN
      assets/core/account_circle-24px_lines_thin.webp
  40. 17
      assets/core/account_circle-24px_negative_space.svg
  41. BIN
      assets/core/account_circle-24px_negative_space.webp
  42. 23
      assets/core/account_circle-24px_user.svg
  43. BIN
      assets/core/account_circle-24px_user.webp
  44. 1
      assets/core/add_circle-24px.svg
  45. BIN
      assets/core/add_circle-24px.webp
  46. 1
      assets/core/attach_file-24px.svg
  47. BIN
      assets/core/attach_file-24px.webp
  48. 1
      assets/core/block-24px.svg
  49. BIN
      assets/core/block-24px.webp
  50. 1
      assets/core/check-24px.svg
  51. BIN
      assets/core/check-24px.webp
  52. BIN
      assets/core/chevron_left-24px.png
  53. 1
      assets/core/chevron_left-24px.svg
  54. BIN
      assets/core/chevron_left-24px.webp
  55. 1
      assets/core/clear-24px.svg
  56. BIN
      assets/core/clear-24px.webp
  57. 1
      assets/core/delete-24px.svg
  58. BIN
      assets/core/delete-24px.webp
  59. 1
      assets/core/done-24px.svg
  60. BIN
      assets/core/done-24px.webp
  61. 1
      assets/core/drag_indicator-24px.svg
  62. BIN
      assets/core/drag_indicator-24px.webp
  63. 1
      assets/core/edit-24px.svg
  64. BIN
      assets/core/edit-24px.webp
  65. 1
      assets/core/favorite-24px.svg
  66. BIN
      assets/core/favorite-24px.webp
  67. 0
      assets/core/fontawesome/regular/check-circle.svg
  68. BIN
      assets/core/fontawesome/regular/check-circle.webp
  69. 0
      assets/core/fontawesome/regular/hourglass.svg
  70. BIN
      assets/core/fontawesome/regular/hourglass.webp
  71. 0
      assets/core/fontawesome/regular/user.svg
  72. BIN
      assets/core/fontawesome/regular/user.webp
  73. 0
      assets/core/fontawesome/regular/window-close.svg
  74. BIN
      assets/core/fontawesome/regular/window-close.webp
  75. 0
      assets/core/fontawesome/solid/plus-circle.svg
  76. BIN
      assets/core/fontawesome/solid/plus-circle.webp
  77. 0
      assets/core/fontawesome/solid/plus-square.svg
  78. BIN
      assets/core/fontawesome/solid/plus-square.webp
  79. 0
      assets/core/fontawesome/solid/plus.svg
  80. BIN
      assets/core/fontawesome/solid/plus.webp
  81. 21
      assets/core/group_settings-24px.svg
  82. 1
      assets/core/info-24px.svg
  83. BIN
      assets/core/info-24px.webp
  84. BIN
      assets/core/lock-24px.png
  85. 1
      assets/core/lock-24px.svg
  86. BIN
      assets/core/lock-24px.webp
  87. 1
      assets/core/lock_open-24px.svg
  88. BIN
      assets/core/lock_open-24px.webp
  89. 1
      assets/core/menu-24px.svg
  90. BIN
      assets/core/menu-24px.webp
  91. 1
      assets/core/mood-24px.svg
  92. BIN
      assets/core/mood-24px.webp
  93. 1
      assets/core/more_vert-24px.svg
  94. BIN
      assets/core/more_vert-24px.webp
  95. 13
      assets/core/negative_heart_24px.svg
  96. BIN
      assets/core/negative_heart_24px.webp
  97. 19
      assets/core/peer_settings-24px.svg
  98. BIN
      assets/core/peer_settings-24px.webp
  99. 0
      assets/core/regular/hdd.svg
  100. BIN
      assets/core/regular/hdd.webp

206
.drone.yml

@ -1,28 +1,206 @@
workspace:
base: /media/sf_GOPATH1/src
path: cwtch.im/ui
base: /media/sf_GOPATH1/src/cwtch.im
path: ui
pipeline:
build-linux:
mem_limit: 3G
image: therecipe/qt:linux
image: therecipe/qt:linux_static
when:
repo: cwtch.im/ui
branch: master
event: [ push, pull_request ]
environment:
- QT_DIR=/opt/Qt
- QT_DOCKER='true'
- QT_API=5.12.0
- QT_API=5.13.0
- GO111MODULE=on
commands:
- export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
- apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client
- go mod download
- $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro
- git fetch --tags
- export VERSION=`git describe --tags`
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
- go mod vendor
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build linux
- cp README.md deploy/linux
- cp -R assets deploy/linux/
- export FILENAME=cwtch-linux-$BUILDDATE.tar.gz
- cd deploy
- mv linux cwtch
- tar -czf $FILENAME cwtch
- sha256sum $FILENAME > $FILENAME.sha256
- rm -r cwtch
build-android-arm-v7a:
mem_limit: 3G
image: therecipe/qt:android
secrets: [upload_jks_file,upload_jks_pass]
when:
repo: cwtch.im/ui
branch: master
event: push
environment:
- QT_DIR=/opt/Qt
- QT_DOCKER='true'
- QT_API=5.13.0
- ANDROID_NDK_DIR=/home/user/android-ndk-r18b
- ANDROID_SDK_DIR=/home/user/android-sdk-linux
- GO111MODULE=on
commands:
- echo $QT_DIR
- export GOPATH=$GOPATH:/media/sf_GOPATH1/
- echo $GOPATH
- export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
- echo $PATH
- apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
- go get
- qtdeploy build linux
build-android:
- rm -r vendor/
- make clean
- echo "cwtch-upload" > android/jks_alias
- echo $UPLOAD_JKS_PASS > android/jks_pass
- echo $UPLOAD_JKS_FILE | tr -d '\n ' > android/ui.jks.b64
- base64 --decode android/ui.jks.b64 > android/ui.jks
- export GOARCH=arm
- go mod download
- export VERSION=`git describe --tags`
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
- go mod vendor
- qtsetup generate android
- mv assets android/
- ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
- mv android/assets assets
- cd deploy
- export FILENAME=cwtch-android-arm-v7a-$BUILDDATE.apk
- cp android/build-release-signed.apk $FILENAME
- sha256sum $FILENAME > $FILENAME.sha256
- rm -r android
build-android-arm64-v8a:
mem_limit: 3G
image: therecipe/qt:android
secrets: [upload_jks_file,upload_jks_pass]
when:
repo: cwtch.im/ui
branch: master
event: push
environment:
- QT_DIR=/opt/Qt
- QT_DOCKER='true'
- QT_API=5.13.0
- ANDROID_NDK_DIR=/home/user/android-ndk-r18b
- ANDROID_SDK_DIR=/home/user/android-sdk-linux
- GO111MODULE=on
commands:
- export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
- apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
- rm -r vendor/
- make clean
- echo "cwtch-upload" > android/jks_alias
- echo $UPLOAD_JKS_PASS > android/jks_pass
- echo $UPLOAD_JKS_FILE | tr -d '\n ' > android/ui.jks.b64
- base64 --decode android/ui.jks.b64 > android/ui.jks
- export GOARCH=arm64
- perl -pe 's/versionCode="(\d+)"/"versionCode=\"" .($1+1)."\""/eg' android/AndroidManifest.xml > android/AndroidManifest.xml.inc
- rm android/AndroidManifest.xml
- mv android/AndroidManifest.xml.inc android/AndroidManifest.xml
- go mod download
- export VERSION=`git describe --tags`
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
- go mod vendor
- qtsetup generate android
- mv assets android/
- ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
- mv android/assets assets
- cd deploy
- export FILENAME=cwtch-android-arm64-v8a-$BUILDDATE.apk
- cp android/build-release-signed.apk $FILENAME
- sha256sum $FILENAME > $FILENAME.sha256
- rm -r android
build-windows:
mem_limit: 3G
image: therecipe/qt:windows_64_static
when:
repo: cwtch.im/ui
branch: [ master, windows_build ]
event: push
environment:
- QT_DIR=/opt/Qt
- QT_DOCKER='true'
- QT_API=5.13.0
- GO111MODULE=on
commands:
- export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
- apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip
- rm -r vendor || true
- make clean || true
- go mod download
- export VERSION=`git describe --tags`
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
- go mod vendor
- export QT_DEBUG=true
- export CONSOLE=true
- export QT_DEBUG_QML=true
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build windows
- cp README.md deploy/windows
- cp -R assets deploy/windows/
- cp -r windows/* deploy/windows
- cd deploy
- mv windows cwtch
- export FILENAME=cwtch-windows-$BUILDDATE.zip
- zip -r $FILENAME cwtch
- sha256sum $FILENAME > $FILENAME.sha256
- mv cwtch windows
package-windows:
mem_limit: 3G
image: hp41/nsis:latest
when:
repo: cwtch.im/ui
branch: [ master, windows_build ]
event: push
environment:
commands:
- cp nsis/cwtch-installer.nsi deploy/
- cd deploy
- makensis -V3 cwtch-installer.nsi
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
- export FILENAME=cwtch-installer-$BUILDDATE.exe
- mv cwtch-installer.exe $FILENAME
- sha256sum $FILENAME > $FILENAME.sha256
- rm cwtch-installer.nsi
- rm -r windows
deploy-buildfiles:
image: pivotaldata/concourse-ssh
secrets: [buildfiles_key]
when:
repo: cwtch.im/ui
branch: master
event: push
status: [ success ]
commands:
- apk add --no-cache git
- echo $BUILDFILES_KEY > ~/id_rsab64
- base64 -d ~/id_rsab64 > ~/id_rsa
- chmod 400 ~/id_rsa
- export DIR=`date +%G.%m.%d-%H.%M`-`git describe --tags`
- cd deploy
- mkdir $DIR
- mv cwtch* $DIR/
- scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
deploy-windows-build:
image: pivotaldata/concourse-ssh
secrets: [buildfiles_key]
when:
repo: cwtch.im/ui
branch: windows_build
event: push
status: [ success ]
commands:
- qtdeploy build android
- apk add --no-cache git
- echo $BUILDFILES_KEY > ~/id_rsab64
- base64 -d ~/id_rsab64 > ~/id_rsa
- chmod 400 ~/id_rsa
- git fetch --tags
- export DIR=`date +%G.%m.%d-%H.%M`-`git describe --tags`
- cd deploy
- mkdir -p windows_build/$DIR
- mv cwtch* windows_build/$DIR/
- scp -r -o StrictHostKeyChecking=no -i ~/id_rsa windows_build buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
notify-email:
image: drillster/drone-email
host: build.openprivacy.ca
@ -30,10 +208,14 @@ pipeline:
skip_verify: true
from: drone@openprivacy.ca
when:
repo: cwtch.im/ui
branch: master
status: [ failure ]
notify-gogs:
image: openpriv/drone-gogs
when:
repo: cwtch.im/ui
branch: master
event: pull_request
status: [ success, changed, failure ]
secrets: [gogs_account_token]

3
.gitignore

@ -5,4 +5,5 @@ rcc*
*.qmlc
*.jsc
vendor/
tor/
.directory
cwtch_log.txt

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "qml/opaque"]
path = qml/opaque
url = https://git.openprivacy.ca/openprivacy/opaque

89
ANDROID_DEBUGGING.md

@ -0,0 +1,89 @@