Commit Graph

600 Commits

Author SHA1 Message Date
Dan Ballard 483d765146 change file logging behaviour to use cwtch dir
the build was successful Details
2020-11-19 12:27:56 -08:00
Dan Ballard 36a4e13184 updating app icon and profile manager tweeks
the build was successful Details
2020-11-19 11:49:20 -08:00
Dan Ballard 5cb284c99c updating app icon and profile manager tweeks
the build was successful Details
2020-11-17 17:47:31 -08:00
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
the build was successful Details
Reviewed-on: #376

Tested on Android: #377
2020-11-17 12:49:26 -08:00
Dan Ballard 918e44fdb6 splash screen is back, just covering ACN/Cwtch app initialization, now with sweet new fade in transition
the build was successful Details
2020-11-17 12:10:27 -08:00
erinn 1c463f235c Merge pull request 'search contact list' (#366) from dan/ui:contactSearch into master
the build was successful Details
Reviewed-on: #366
2020-11-13 16:50:04 -08:00
Dan Ballard 9701380e3c search contact list
the build was successful Details
2020-11-13 15:11:32 -08:00
Sarah Jamie Lewis 01428b1371 Merge pull request 'allow cwtch to log to file' (#367) from dan/ui:logFlag into master
the build was successful Details
Reviewed-on: #367
2020-11-13 12:21:45 -08:00
Dan Ballard 568b979698 allow cwtch to log to file
the build was successful Details
2020-11-13 12:13:53 -08:00
Sarah Jamie Lewis c11e541f4e Merge pull request 'ran quality.sh' (#363) from dan/ui:qual into master
the build was successful Details
Reviewed-on: #363
2020-11-12 16:12:37 -08:00
Dan Ballard 162ee96a1f ran quality.sh
the build was successful Details
2020-11-12 16:08:27 -08:00
erinn 0be9447a07 Merge pull request 'add peer / group pane' (#361) from dan/ui:addPeer into master
the build was successful Details
Reviewed-on: #361
2020-11-12 15:46:54 -08:00
Dan Ballard 0e5d78cbb9 add peer / group pane
the build was successful Details
2020-11-12 15:45:53 -08:00
erinn 98d58ebd62 Merge pull request 'fix contactlist not shrinking in full mode' (#360) from fixContactList into master
the build was successful Details
Reviewed-on: #360
2020-11-04 14:57:12 -08:00
Dan Ballard 5ca904b675 fix contactlist not shrinking in full mode
the build was successful Details
2020-11-04 14:55:52 -08:00
erinn d144f0d8b0 Merge pull request 'Self-Hosted Servers Experiment' (#359) from server_launch into master
the build was successful Details
Reviewed-on: #359
2020-11-04 14:14:52 -08:00
Sarah Jamie Lewis a276d5732a Self-Hosted Servers Experiment
the build was successful Details
2020-11-04 14:08:20 -08:00
erinn fd45f72a09 Merge pull request 'fix p2p get name sync issue; overlay offline contact portraits' (#358) from dan/ui:nameSync into master
the build was successful Details
Reviewed-on: #358
2020-11-04 13:53:27 -08:00
Dan Ballard 843790c27b fix p2p get name sync issue; overlay offline contact portraits
the build was successful Details
2020-11-04 13:42:49 -08:00
Sarah Jamie Lewis 9721999e9b Merge pull request 'add name on profile create' (#357) from dan/ui:createProfileName into master
the build was successful Details
Reviewed-on: #357
2020-11-03 12:48:18 -08:00
Dan Ballard 6117486808 add name on profile create
the build was successful Details
2020-11-03 12:36:38 -08:00
erinn b80ecc0a7d Merge pull request 'Gate Group Functionality' (#356) from serverpane into master
the build was successful Details
Reviewed-on: #356
2020-10-29 17:30:16 -07:00
erinn 2433c667d8 Merge branch 'master' into serverpane
the build was successful Details
2020-10-29 17:30:07 -07:00
Sarah Jamie Lewis 143dd9693c Update Cwtch Release
the build was successful Details
2020-10-29 16:20:08 -07:00
Sarah Jamie Lewis 91c182b880 Gate Group Functionality
the build was successful Details
2020-10-29 16:12:04 -07:00
Sarah Jamie Lewis 48d375f007 Merge pull request 'turning off unicode emoji (for now...?)' (#355) from TheUnicodeDefeatium into master
the build was successful Details
Reviewed-on: #355
2020-10-29 15:41:36 -07:00
erinn 223936cda8 turning off unicode emoji (for now...?)
the build was successful Details
2020-10-29 15:34:41 -07:00
Dan Ballard f2a4c61610 fix assetPath on windows (#354)
the build was successful Details
Merge branch 'master' into winassetPath

fix assetDir path on windows

Co-authored-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
Co-authored-by: Dan Ballard <dan@mindstab.net>
Reviewed-on: #354
2020-10-28 16:58:15 -07:00
Dan Ballard a247fd91c0 Merge pull request 'Experimental Gating + Server List Sketch' (#353) from serverpane into master
the build was successful Details
Reviewed-on: #353
2020-10-28 12:38:12 -07:00
Sarah Jamie Lewis 1b0d69dfb2 Experimental Gating + Server List Sketch
the build was successful Details
2020-10-28 12:36:55 -07:00
Dan Ballard fec49cf1fd Merge pull request 'Experimental Gating + Server List Sketch' (#351) from serverpane into master
the build was successful Details
Reviewed-on: #351
2020-10-28 12:35:55 -07:00
Sarah Jamie Lewis bfb431cbaf Experimental Gating + Server List Sketch
the build was successful Details
2020-10-28 12:29:07 -07:00
Sarah Jamie Lewis ada9dc7bb9 Merge pull request 'add flag to force windows to log to console' (#352) from consoleFlag into master
the build was successful Details
Reviewed-on: #352
2020-10-28 12:20:33 -07:00
Dan Ballard 93776e0ca8 add flag to force windows to log to console
the build was successful Details
2020-10-28 11:13:20 -07:00
erinn 1de7e5bd6a Merge pull request 'redesign of profile add / edit pane' (#346) from dan/ui:profileAddEdit into master
the build was successful Details
Reviewed-on: #346
2020-10-23 16:01:38 -07:00
Dan Ballard 1b57b5b0c6 redesign of profile add / edit pane
the build was successful Details
2020-10-23 15:56:58 -07:00
Dan Ballard 4fb726a926 add windows debug exports
the build was successful Details
2020-10-23 13:50:46 -07:00
Dan Ballard 4580d616de Merge pull request 'new message model' (#347) from mm into master
the build was successful Details
Reviewed-on: #347
2020-10-23 10:30:46 -07:00
erinn a52794d562 addressing review comments
the build was successful Details
2020-10-22 18:14:04 -07:00
erinn cd241e45c4 addressing review comments
the build was successful Details
2020-10-22 18:05:32 -07:00
erinn e09ad91ab5 finishing first attempt at message model pr. mainly group acks 2020-10-22 18:05:03 -07:00
erinn 7bb2198879 update opaque 2020-10-22 18:04:01 -07:00
erinn 7398bec25b message model take one 2020-10-22 18:04:01 -07:00
erinn db315f8de1 message model take one 2020-10-22 18:04:01 -07:00
Sarah Jamie Lewis e2ab860c72 ACN Process Management (#345)
the build was successful Details
ACN Process Management
update connectivity
use filepath instead of path for join

Co-authored-by: Dan Ballard <dan@mindstab.net>
Reviewed-on: #345
2020-10-21 16:58:57 -07:00
Dan Ballard e3717dd175 Merge pull request 'Use Connectivity + Fix Server Update Bug' (#343) from torrc into master
the build was successful Details
Reviewed-on: #343
2020-10-14 12:49:41 -07:00
Sarah Jamie Lewis c4d5d889b6 Use Connectivity + Fix Server Update Bug
the build was successful Details
2020-10-13 14:22:48 -07:00
Dan Ballard 9e784ba4ea Merge pull request 'Tapir Integtation' (#325) from tapir-server into master
the build was successful Details
Reviewed-on: #325

setting up for more group/server work in cwtch and another round of ui improvements in ui
2020-10-02 12:58:51 -07:00
Sarah Jamie Lewis 325c959b69 Server Info Pane Fixups
the build was successful Details
2020-10-01 14:37:15 -07:00
Sarah Jamie Lewis 35cd963ec3 Tapir Integtation II
the build was successful Details
2020-09-28 15:44:26 -07:00