erinn
9e4917ac5b
fix messages pane
2020-11-24 14:48:29 -08:00
Dan Ballard
f402f515da
Merge pull request 'add tabbar' ( #389 ) from tabbar into master
...
Reviewed-on: #389
2020-11-23 16:39:09 -08:00
erinn
a0081c9d4e
fix indents
2020-11-23 16:36:50 -08:00
erinn
94381cb076
adding to new opaque tabbar
2020-11-23 16:33:14 -08:00
erinn
a0bbfa7721
add tabbar
2020-11-23 15:56:52 -08:00
erinn
4179e2798b
Merge pull request 'gcd.firstTime + SettingsList scrolls' ( #388 ) from android_tests into master
...
Reviewed-on: #388
2020-11-23 13:24:20 -08:00
Sarah Jamie Lewis
8340b7aed3
Format gcd vars to spec
2020-11-23 13:15:42 -08:00
Sarah Jamie Lewis
e74a0e8dc2
Formatting
2020-11-23 13:13:09 -08:00
Sarah Jamie Lewis
228a9b6ebd
gcd.firstTime + SettingsList scrolls
2020-11-23 13:12:00 -08:00
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
...
Reviewed-on: #387
2020-11-23 12:55:32 -08:00
Dan Ballard
46ed17eec2
gcd.torStatus; now peers get networkStatus, save as local attr, and pass to profilerow/myprofile to show online
2020-11-20 16:46:12 -08:00
erinn
a54aa8e0af
Merge pull request 'Android Deep Dive Part 1 of Many' ( #378 ) from android_tests into master
...
Reviewed-on: #378
2020-11-20 15:24:38 -08:00
Sarah Jamie Lewis
a5c96964e8
Android Bugfixxing Part 1
...
- Icons Now Show
- Zoom Slider doesn't Crash (2 causes)
- One desktop/android crash caused by Ellipsis Label (now replaced)
- One android crash caused by ButtonTextField (fixed)
- Removed some emoji handling that was unused.
2020-11-20 15:21:02 -08:00
Sarah Jamie Lewis
cb932d3ca3
All Image Changes
2020-11-20 12:33:15 -08:00
Sarah Jamie Lewis
72457d138b
Merge pull request 'gifSplash' ( #383 ) from dan/ui:gifSplash into master
...
Reviewed-on: #383
2020-11-20 12:29:39 -08:00
Dan Ballard
454d10e28c
splash pane now has new cwtch font logo and animated knot
2020-11-20 12:23:44 -08:00
Dan Ballard
aadcb0d7c6
splash pane now has new cwtch font logo and animated knot
2020-11-20 12:08:06 -08:00
Sarah Jamie Lewis
4805507014
Merge pull request 'change file logging behaviour to use cwtch dir' ( #382 ) from dan/ui:winLog into master
...
Reviewed-on: #382
2020-11-20 10:59:21 -08:00
Sarah Jamie Lewis
eb33e46e3d
Merge branch 'master' into winLog
2020-11-20 10:59:04 -08:00
Sarah Jamie Lewis
45acecf9d7
Merge pull request 'updating app icon and profile manager tweeks' ( #379 ) from dan/ui:iconTweeks into master
...
Reviewed-on: #379
2020-11-20 10:58:55 -08:00
Dan Ballard
483d765146
change file logging behaviour to use cwtch dir
2020-11-19 12:27:56 -08:00
Dan Ballard
36a4e13184
updating app icon and profile manager tweeks
2020-11-19 11:49:20 -08:00
Dan Ballard
5cb284c99c
updating app icon and profile manager tweeks
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
...
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
2020-11-17 12:10:27 -08:00
erinn
1c463f235c
Merge pull request 'search contact list' ( #366 ) from dan/ui:contactSearch into master
...
Reviewed-on: #366
2020-11-13 16:50:04 -08:00
Dan Ballard
9701380e3c
search contact list
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
...
Reviewed-on: #367
2020-11-13 12:21:45 -08:00
Dan Ballard
568b979698
allow cwtch to log to file
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
...
Reviewed-on: #363
2020-11-12 16:12:37 -08:00
Dan Ballard
162ee96a1f
ran quality.sh
2020-11-12 16:08:27 -08:00
erinn
0be9447a07
Merge pull request 'add peer / group pane' ( #361 ) from dan/ui:addPeer into master
...
Reviewed-on: #361
2020-11-12 15:46:54 -08:00
Dan Ballard
0e5d78cbb9
add peer / group pane
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
...
Reviewed-on: #360
2020-11-04 14:57:12 -08:00
Dan Ballard
5ca904b675
fix contactlist not shrinking in full mode
2020-11-04 14:55:52 -08:00
erinn
d144f0d8b0
Merge pull request 'Self-Hosted Servers Experiment' ( #359 ) from server_launch into master
...
Reviewed-on: #359
2020-11-04 14:14:52 -08:00
Sarah Jamie Lewis
a276d5732a
Self-Hosted Servers Experiment
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
...
Reviewed-on: #358
2020-11-04 13:53:27 -08:00
Dan Ballard
843790c27b
fix p2p get name sync issue; overlay offline contact portraits
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
...
Reviewed-on: #357
2020-11-03 12:48:18 -08:00
Dan Ballard
6117486808
add name on profile create
2020-11-03 12:36:38 -08:00
erinn
b80ecc0a7d
Merge pull request 'Gate Group Functionality' ( #356 ) from serverpane into master
...
Reviewed-on: #356
2020-10-29 17:30:16 -07:00
erinn
2433c667d8
Merge branch 'master' into serverpane
2020-10-29 17:30:07 -07:00
Sarah Jamie Lewis
143dd9693c
Update Cwtch Release
2020-10-29 16:20:08 -07:00
Sarah Jamie Lewis
91c182b880
Gate Group Functionality
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
...
Reviewed-on: #355
2020-10-29 15:41:36 -07:00
erinn
223936cda8
turning off unicode emoji (for now...?)
2020-10-29 15:34:41 -07:00
Dan Ballard
f2a4c61610
fix assetPath on windows ( #354 )
...
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
...
Reviewed-on: #353
2020-10-28 12:38:12 -07:00
Sarah Jamie Lewis
1b0d69dfb2
Experimental Gating + Server List Sketch
2020-10-28 12:36:55 -07:00