Commit Graph

298 Commits

Author SHA1 Message Date
Dan Ballard eca82ae45d update to match connection.ConnectionStateToType name change for Goland 2019-07-26 13:52:11 -07:00
Sarah Jamie Lewis f973a2bfe5 Merge branch 'syncContacts' of dan/ui into master 2019-07-25 15:46:57 -07:00
Dan Ballard 4c626dc922 fix race condition where possible group/contact nick is not set right in ui 2019-07-25 15:22:06 -07:00
Dan Ballard ed904ed79d fix race conditions around contact access 2019-07-24 15:42:06 -07:00
Sarah Jamie Lewis 8fe6648100 Merge branch 'syncListeners' of dan/ui into master 2019-07-24 13:52:19 -07:00
Dan Ballard 5584fba6e5 fix race potentil race condition where listeners were not subscribed before events started being emmited 2019-07-24 13:51:20 -07:00
erinn f4b1296aa2 Merge branch 'appReload' of dan/ui into master 2019-07-23 13:57:41 -07:00
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 2019-07-23 13:56:50 -07:00
erinn 74dd48fdc1 Merge branch 'acnEvent' of dan/ui into master 2019-07-10 13:54:40 -07:00
Dan Ballard 56b7aec403 Use ACN events 2019-07-10 13:41:43 -07:00
erinn 3ba48d3bfd Merge branch 'clientServFlag' of dan/ui into master 2019-07-10 13:41:08 -07:00
Dan Ballard 4e671a7b3f add flag to allow running client/service on desktop 2019-07-08 12:45:04 -07:00
erinn d85961bb14 Merge branch 'android-service' of dan/ui into master 2019-06-25 09:46:30 -07:00
Dan Ballard 75111e0421 port from cwtch.app to appClient and appService 2019-06-24 18:58:45 -07:00
Dan Ballard 9400d5aa63 refactoring of main to mainUi() and mainService() 2019-06-24 18:58:45 -07:00
Dan Ballard 8a666a7f37 starts a go service 2019-06-24 18:58:45 -07:00
Dan Ballard b287d0b27e work on android service 2019-06-24 18:58:45 -07:00
erinn 1011a37d54 Merge branch 'clientServ' of dan/ui into master 2019-06-24 15:41:24 -07:00
Dan Ballard 18b9cc41e0 Minor updates to take avantage of additional events from the cwtch app and API changes 2019-06-12 10:51:27 -07:00
Sarah Jamie Lewis fec5b994d1 Merge branch 'ebf201906041258' of cwtch.im/ui into master 2019-06-04 13:03:03 -07:00
erinn 86156d2f16 permit clicks within chatoverlay editbox 2019-06-04 12:59:27 -07:00
erinn 007e485e76 Merge branch 'cwtchRefactor2' of dan/ui into master 2019-05-22 13:23:03 -07:00
Dan Ballard 30fbbef6b7 Refactor to match cwtch refactor - presense changes are events, minor
library API changes
2019-05-22 13:17:30 -07:00
erinn b6f0e7f171 Merge branch 'progress' of dan/ui into master 2019-04-24 13:38:02 -07:00
Dan Ballard 672570ed42 display progress of group loading and disable sending to groups until loaded 2019-04-24 13:32:20 -07:00
Dan Ballard fa8d2007ec Merge branch 'ebf' of cwtch.im/ui into master 2019-04-17 14:18:35 -07:00
erinn f4518cba9f merge 2019-04-17 14:06:19 -07:00
erinn 4494a2b168 chatoverlay scaling 2019-04-17 14:03:50 -07:00
erinn e60b2fae0b Merge branch 'android-notification' of dan/ui into master 2019-04-17 11:19:26 -07:00
Dan Ballard fe5dd1e615 general purpose and ongoing android notifications 2019-04-16 14:57:23 -07:00
Dan Ballard c7c464e21e Merge branch 'ebf' of cwtch.im/ui into master 2019-04-16 14:10:00 -07:00
erinn 61571989e7 make most things obey ui scale 2019-04-16 12:40:19 -07:00
Sarah Jamie Lewis 5cb93c8fe9 Merge branch 'ebf201904101353' of cwtch.im/ui into master 2019-04-10 13:55:02 -07:00
erinn 6d5aad4a4d message leaked to logs in debug mode 2019-04-10 13:53:45 -07:00
erinn b3c5b08a74 Merge branch 'handler' of dan/ui into master 2019-04-10 12:25:08 -07:00
Dan Ballard 07e660ab30 fix cant call argument as function 2019-04-10 12:21:30 -07:00
erinn 7ce73ec89d Merge branch 'qt512fix' of dan/ui into master 2019-04-10 10:59:47 -07:00
Dan Ballard 4b9f3f136e fix for QT 5.12 qml not handling function pointers to handlers 2019-04-10 10:58:35 -07:00
erinn 37f5cbc9b4 Merge branch 'makefile' of dan/ui into master 2019-04-09 13:13:18 -07:00
Dan Ballard c1e4f866e4 makefile to clean junk 2019-04-09 13:11:10 -07:00
erinn 029cd93713 Merge branch 'android-name' of dan/ui into master 2019-04-08 14:08:54 -07:00
Dan Ballard e854d7ff11 Merge branch 'ebf201904081214' of cwtch.im/ui into master 2019-04-08 14:08:13 -07:00
Dan Ballard 5493b2f988 change android application id 2019-04-08 14:01:53 -07:00
erinn 32a61f3c56 make all overlays obey prependmessage 2019-04-08 13:57:59 -07:00
erinn a3108c2581 faster group loading 2019-04-08 13:28:36 -07:00
Dan Ballard 493fbeba38 drone android + windows build versions 2019-03-29 14:51:35 -07:00
Dan Ballard 8a8cd9f804 drone fetch tags... 2019-03-29 13:01:43 -07:00
Dan Ballard f425e3ee32 drone builddate and buildver for linux 2019-03-29 12:43:48 -07:00
erinn 9f6eb6dfcb Merge branch 'version' of dan/ui into master 2019-03-29 12:39:08 -07:00
Dan Ballard eeb167ce38 accept version at build time; display version in settings pane 2019-03-29 12:36:43 -07:00