erinn
|
79b2febe28
|
addressing dan comments in #254
|
2020-01-10 12:58:02 -08:00 |
erinn
|
d2ed151e55
|
removing test emoji files
|
2020-01-08 14:57:25 -08:00 |
erinn
|
aa39ed3f54
|
tidying
|
2020-01-08 14:37:57 -08:00 |
erinn
|
78f4d96a9b
|
merge to master
|
2020-01-07 17:30:20 -08:00 |
erinn
|
5fb7c4a85e
|
asset manager and emoji drawer initial take
|
2020-01-07 16:26:22 -08:00 |
Dan Ballard
|
fee151cf26
|
save edit name fix
|
2019-12-18 11:29:50 -08:00 |
Sarah Jamie Lewis
|
f5f6d4b947
|
Merge branch 'pwFixes' of dan/ui into master
|
2019-12-17 17:22:45 -08:00 |
Dan Ballard
|
9397131967
|
fix password not match error; fix clearing add/edit pane on reset
|
2019-12-17 17:18:16 -08:00 |
Sarah Jamie Lewis
|
e635a3a384
|
Merge branch 'minori18n' of dan/ui into master
|
2019-12-17 15:41:53 -08:00 |
Dan Ballard
|
8d9681e130
|
upgrade cwtch 0.3.8 (tapir 0.1.14)
|
2019-12-17 15:37:41 -08:00 |
Dan Ballard
|
8e347d79b8
|
Merge branch 'master' into minori18n
|
2019-12-17 14:31:32 -08:00 |
Dan Ballard
|
a9041c6485
|
minor translations updates
|
2019-12-17 14:31:13 -08:00 |
Sarah Jamie Lewis
|
cedf39aaa6
|
Merge branch 'deleditProfile' of dan/ui into master
|
2019-12-17 14:03:42 -08:00 |
Dan Ballard
|
aa81c40e50
|
tranlations for edit and delete profiles
|
2019-12-17 13:59:33 -08:00 |
Dan Ballard
|
7e0945583e
|
go mod cwtch to 0.3.7; add profile list sorting by onion
|
2019-12-17 13:37:30 -08:00 |
Dan Ballard
|
13239c094c
|
change password
|
2019-12-17 11:32:58 -08:00 |
Dan Ballard
|
d77851a835
|
profile delete. profile version tagging. minor qml refactor (less importing widgets directly into qml namespace)
|
2019-12-10 15:44:35 -08:00 |
Sarah Jamie Lewis
|
5ca2fa6332
|
Merge branch 'add-profile' of dan/ui into master
|
2019-12-04 10:24:34 -08:00 |
Dan Ballard
|
fbecb20e05
|
Merge branch 'master' into add-profile
|
2019-11-29 17:53:27 -08:00 |
Dan Ballard
|
541f4f7da4
|
profile edit (name) and delete (non functioning cus cwtch doesnt support) ui
|
2019-11-29 17:35:57 -08:00 |
Dan Ballard
|
ba14e8ad72
|
Merge branch 'lockProfile' into add-profile
|
2019-11-20 14:23:37 -08:00 |
Sarah Jamie Lewis
|
5df3fd4cf4
|
Merge branch 'lockProfile' of dan/ui into master
|
2019-11-20 13:25:13 -08:00 |
Dan Ballard
|
1b20c9ed02
|
gcd and manager now lock gcd to qml ui events for non selected profile
|
2019-11-20 13:23:19 -08:00 |
Dan Ballard
|
d3e178474d
|
show add profile button
|
2019-11-20 13:05:50 -08:00 |
Dan Ballard
|
7a7be2777b
|
gcd and manager now lock gcd to qml ui events for non selected profile
|
2019-11-19 14:12:07 -08:00 |
Sarah Jamie Lewis
|
434907ea0d
|
Merge branch 'profileMan' of dan/ui into master
|
2019-11-19 11:26:50 -08:00 |
Dan Ballard
|
bac4accb1b
|
profile manager: screen, unlock, select, back to
Also fixing issues on switching profiles and maintaining ui state
around contact ordering and unread count
|
2019-11-16 12:47:59 -08:00 |
Sarah Jamie Lewis
|
91f397d9e1
|
Merge branch 'contact-sort' of dan/ui into master
|
2019-11-15 23:24:49 -08:00 |
Dan Ballard
|
606f7c7eb6
|
contactList: new messages make contact float to top
|
2019-11-14 17:13:42 -08:00 |
Dan Ballard
|
c77737be1d
|
Merge branch 'network_check' of cwtch.im/ui into master
|
2019-11-12 12:15:51 -08:00 |
Sarah Jamie Lewis
|
6dd346fe96
|
Alert the user when there is no internet
|
2019-11-12 10:51:29 -08:00 |
Sarah Jamie Lewis
|
54918e612f
|
Merge branch 'refactor' of dan/ui into master
|
2019-11-08 13:50:59 -08:00 |
Dan Ballard
|
35fa0adb67
|
rename packages to better align with their purposes now
|
2019-11-08 13:34:15 -08:00 |
Sarah Jamie Lewis
|
4f205f7c4f
|
Merge branch 'peerRace' of dan/ui into master
|
2019-11-06 12:37:12 -08:00 |
Dan Ballard
|
d6eebe82bd
|
fix race condition in ui/gcd vs cwtch app start
|
2019-11-06 12:32:16 -08:00 |
Sarah Jamie Lewis
|
628e414376
|
Merge branch 'addContact' of dan/ui into master
|
2019-11-05 14:34:54 -08:00 |
Dan Ballard
|
0964363b89
|
fixes for adding/imorting contacts; remove unused 'letter' class
|
2019-11-05 14:12:40 -08:00 |
Sarah Jamie Lewis
|
e2c3a82ea0
|
Merge branch 'uistate' of dan/ui into master
|
2019-11-04 10:33:39 -08:00 |
Dan Ballard
|
f0099acb2b
|
remove uistate's state; remove contact; remove trusted
|
2019-11-01 17:40:06 -07:00 |
Dan Ballard
|
30b8d9ab6d
|
merge
|
2019-10-28 14:12:05 -07:00 |
Dan Ballard
|
1bf2910b4d
|
remove 'badge'/unread treacking state from go code; now uses attributes to store in back end and maintain in front end
|
2019-10-28 14:09:19 -07:00 |
Dan Ballard
|
5bea6bdc47
|
remove 'badge'/unread treacking state from go code; now uses attributes to store in back end and maintain in front end
|
2019-10-25 12:30:04 -07:00 |
Sarah Jamie Lewis
|
1ad9d5be20
|
Merge branch 'messages' of dan/ui into master
|
2019-10-22 11:25:52 -07:00 |
Dan Ballard
|
ee30a3227d
|
remove frontend message storage
|
2019-10-22 11:14:17 -07:00 |
Sarah Jamie Lewis
|
121a62c142
|
Merge branch 'makefile' of dan/ui into master
|
2019-10-22 08:37:14 -07:00 |
Dan Ballard
|
3fd5755ed9
|
makefile updates with linux and android targets and go mod support
|
2019-10-08 11:02:34 -07:00 |
Dan Ballard
|
1773e52cbd
|
undo drone builds share fetch
|
2019-10-04 14:59:46 -07:00 |
Dan Ballard
|
a75f7778be
|
make builds share vendor fetch
|
2019-10-04 14:35:20 -07:00 |
Dan Ballard
|
b80500da35
|
update go modules, drone try to use
|
2019-10-04 13:52:17 -07:00 |
erinn
|
cf10647d4c
|
Merge branch 'reconnect' of dan/ui into master
|
2019-09-30 12:40:16 -07:00 |