Commit Graph

321 Commits

Author SHA1 Message Date
Dan Ballard 2c0925004d windows log to file 2019-08-13 11:17:20 -07:00
erinn f029da4c49 Merge branch 'ui-tweaks' of cwtch.im/ui into master 2019-08-09 19:27:40 -07:00
erinn 2d9a558b89 Merge branch 'delete' of dan/ui into master 2019-08-09 19:26:38 -07:00
erinn c6f9b8a271 Merge branch 'windows' of dan/ui into master 2019-08-09 19:25:03 -07:00
Dan Ballard 12fde77c71 removing fake delete to surface fake deleted contact as we still connect to them; adopting proper delete support added to cwtch 2019-08-09 17:44:56 -07:00
Dan Ballard c6ed152809 start tor on windows properly 2019-08-09 17:31:22 -07:00
Sarah Jamie Lewis 928ee5a76f UI Twraks
- Double Spacing
- Emoji + Spacing
- linebreaks
2019-08-09 15:43:26 -07:00
Dan Ballard 6de3805ecf Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 2019-08-09 13:28:56 -07:00
Dan Ballard a84a0ae1b4 drone not double up on version tag for directory 2019-08-09 13:28:17 -07:00
erinn a31a073847 Merge branch 'unlocking' of cwtch.im/ui into master 2019-08-08 16:00:15 -07:00
Sarah Jamie Lewis 0d6dd0e7ed Unblocking 2019-08-08 15:49:42 -07:00
erinn c6ca6d2567 Merge branch 'blocking' of cwtch.im/ui into master 2019-08-07 12:43:22 -07:00
Sarah Jamie Lewis 9a4c24626d Expose Blocking in the UI (initial version) 2019-08-06 19:47:19 -07:00
Dan Ballard 1b54cf2a19 switching to static therecipe build images. Also adding version tag to buildfiles dir 2019-08-02 13:05:51 -07:00
Sarah Jamie Lewis ec0766946f Merge branch 'qservice' of dan/ui into master 2019-08-02 11:19:14 -07:00
Sarah Jamie Lewis f9713bb1e0 Merge branch 'pluginRetry' of dan/ui into master 2019-08-02 11:19:05 -07:00
Dan Ballard 49fef3f800 Use QAndroidService to properly have the service run on Android 2019-08-02 11:08:38 -07:00
Dan Ballard 3c9abe2a0b drone bump to use QT 5.13 2019-08-02 11:06:48 -07:00
Dan Ballard 7e0786aea2 use the new retryContact plugin 2019-08-02 10:51:35 -07:00
Dan Ballard 732d8ab671 Merge branch 'tapir' of cwtch.im/ui into master 2019-08-01 15:32:17 -07:00
Sarah Jamie Lewis 10f892d10d fmt 2019-07-31 15:35:35 -07:00
Sarah Jamie Lewis d13c53cc73 Tapir Integration 2019-07-31 14:05:05 -07:00
Dan Ballard 741443bcf3 undo testing log setup 2019-07-29 13:43:35 -07:00
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