 erinn
|
fa430b7d7c
|
remove debug info from chatoverlay
|
2020-12-08 17:33:45 -08:00 |
 Sarah Jamie Lewis
|
4d927c133d
|
Merge pull request 'history warning, overlay model fixes, new zoom system beginnings' (#445) from historywarning into master
Reviewed-on: #445
|
2020-12-08 17:13:17 -08:00 |
|
erinn
|
0663488d6d
|
nits
|
2020-12-08 16:58:07 -08:00 |
|
erinn
|
6263dbf1fa
|
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning
|
2020-12-08 16:49:12 -08:00 |
|
erinn
|
1a556d05ce
|
history warning and overlay model fixes
|
2020-12-08 16:37:08 -08:00 |
|
erinn
|
49bee4deb1
|
translations and new assets for history warning
|
2020-12-08 16:36:41 -08:00 |
|
erinn
|
240eb56ebe
|
Merge pull request 'use log/privacy filter' (#444) from dan/ui:logPF into master
Reviewed-on: #444
|
2020-12-07 16:15:26 -08:00 |
 Dan Ballard
|
79052038e6
|
use log/privacy filter
|
2020-12-07 16:02:58 -08:00 |
|
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
Reviewed-on: #443
|
2020-12-07 15:24:33 -08:00 |
|
erinn
|
09079dd224
|
Merge branch 'master' into stateful
|
2020-12-07 15:24:21 -08:00 |
|
Dan Ballard
|
b920d3ab8b
|
Save state of root and profile panes open, and selected profile and
conversation; jump to those when reloading
|
2020-12-07 15:18:19 -08:00 |
|
erinn
|
8b6e8d2e98
|
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning
|
2020-12-03 16:26:34 -08:00 |
|
erinn
|
473e0a02d0
|
history warning and beginnings of new zoom system and listoverlay fixes
|
2020-12-03 16:24:40 -08:00 |
 Dan Ballard
|
b837757617
|
Merge pull request 'Add Group now Works (with TofuBundle)' (#442) from group-add into master
Reviewed-on: #442
|
2020-12-03 15:15:31 -08:00 |
|
Sarah Jamie Lewis
|
6292b5a1b9
|
Add Group now Works (with TofuBundle)
|
2020-12-03 15:02:06 -08:00 |
|
Dan Ballard
|
cfe0105992
|
Merge pull request 'fix resizing smaller' (#441) from resizefix into master
Reviewed-on: #441
|
2020-12-02 18:16:19 -08:00 |
|
erinn
|
bbedeb81c7
|
fix resizing smaller
|
2020-12-02 18:10:52 -08:00 |
|
erinn
|
3687ead49f
|
Merge pull request 'responsize size fixes' (#438) from dan/ui:responsive into master
Reviewed-on: #438
|
2020-12-02 15:12:02 -08:00 |
|
erinn
|
c3deeaa227
|
Merge branch 'master' into responsive
|
2020-12-02 15:11:47 -08:00 |
|
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
Reviewed-on: #439
|
2020-12-02 15:11:08 -08:00 |
|
erinn
|
79a8bfb0cf
|
Merge branch 'master' into badgeIcons
|
2020-12-02 15:10:53 -08:00 |
|
Dan Ballard
|
23eece4424
|
fix profile badges to use icons; fix myprofile not re embiggening on single pane
|
2020-12-02 15:08:50 -08:00 |
|
Sarah Jamie Lewis
|
0de8bd19bb
|
Merge pull request 'fix makefile' (#437) from dan/ui:makefile into master
Reviewed-on: #437
|
2020-12-02 13:38:08 -08:00 |
|
Sarah Jamie Lewis
|
e9b98f2aea
|
Merge branch 'master' into makefile
|
2020-12-02 13:37:56 -08:00 |
|
Dan Ballard
|
12bed09d4e
|
responsize size fixes
|
2020-12-01 17:13:42 -08:00 |
|
Dan Ballard
|
8e6f5e813a
|
fix makefile
|
2020-12-01 16:02:39 -08:00 |
|
Sarah Jamie Lewis
|
4b081a0db6
|
Merge pull request 'display tor version on settings pane' (#436) from dan/ui:torVer into master
Reviewed-on: #436
|
2020-12-01 14:39:06 -08:00 |
|
Sarah Jamie Lewis
|
a942bfbba1
|
Merge branch 'master' into torVer
|
2020-12-01 14:33:20 -08:00 |
|
Dan Ballard
|
2035e44cfd
|
display tor version on settings pane
|
2020-12-01 13:12:18 -08:00 |
|
Sarah Jamie Lewis
|
07cbb1054b
|
Merge pull request 'upgrade packaged tors to 0.4.4.6' (#435) from dan/ui:torUp into master
Reviewed-on: #435
|
2020-12-01 10:41:57 -08:00 |
|
Dan Ballard
|
0e965d630a
|
upgrade packaged tors to 0.4.4.6
|
2020-11-30 18:32:32 -08:00 |
|
Dan Ballard
|
d4d88ff541
|
drone nsis: sha256 installer
|
2020-11-28 10:43:40 -08:00 |
|
Dan Ballard
|
d0f90a9b7f
|
drone nsis: .nsi needs to be in deploy dir
|
2020-11-28 10:29:39 -08:00 |
|
Dan Ballard
|
3cdb2b2455
|
drone nsis: change windows step to leave a windows dir
|
2020-11-28 10:14:13 -08:00 |
|
Dan Ballard
|
f02083e0d6
|
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui
|
2020-11-27 18:49:06 -08:00 |
|
Dan Ballard
|
c62891b8d9
|
drone package windows makensis param error
|
2020-11-27 18:46:33 -08:00 |
|
erinn
|
04aae4d093
|
Merge pull request 'update nsis script to make installed start menu link use icon' (#434) from nsi into master
Reviewed-on: #434
|
2020-11-27 18:43:56 -08:00 |
|
erinn
|
9cc81b1f29
|
Merge branch 'master' into nsi
|
2020-11-27 18:43:42 -08:00 |
|
Dan Ballard
|
93dbc6d270
|
attempt to add nsis win installer generation to drone
|
2020-11-27 18:34:43 -08:00 |
|
Dan Ballard
|
8b004543ed
|
update nsis script to make installed start menu link use icon
|
2020-11-27 18:20:19 -08:00 |
|
erinn
|
d4e5546079
|
Merge pull request 'nsis script to make windows installer' (#432) from nsi into master
Reviewed-on: #432
|
2020-11-27 17:55:30 -08:00 |
|
erinn
|
ba7bb704cd
|
Merge branch 'master' into nsi
|
2020-11-27 17:55:06 -08:00 |
|
Dan Ballard
|
752e21f89e
|
fixed directory flatening issue
|
2020-11-27 17:36:28 -08:00 |
|
erinn
|
7aa7f67fd3
|
Merge pull request 'Fixes: #410' (#430) from user-feedback-hover into master
Reviewed-on: #430
|
2020-11-27 14:44:25 -08:00 |
|
erinn
|
6e6045d911
|
Merge branch 'master' into user-feedback-hover
|
2020-11-27 14:44:12 -08:00 |
|
Sarah Jamie Lewis
|
16ee1635f5
|
Fixes: #410
|
2020-11-27 14:42:13 -08:00 |
|
Dan Ballard
|
9aa4f6d75d
|
nsi to install cwtch, plus scripts and assets to generate it
|
2020-11-27 13:53:34 -08:00 |
|
erinn
|
38923ef814
|
Merge pull request 'Support multiline on Android' (#426) from user-feedback-elide into master
Reviewed-on: #426
|
2020-11-27 13:38:54 -08:00 |
|
erinn
|
24a7abacd1
|
Merge branch 'master' into user-feedback-elide
|
2020-11-27 13:38:46 -08:00 |
|
Sarah Jamie Lewis
|
eef74ae8b3
|
Update 'LICENSE'
|
2020-11-26 23:46:56 -08:00 |