 erinn
|
2362682a9f
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-11 22:44:25 +00:00 |
 Sarah Jamie Lewis
|
316f9246c0
|
Set ScalingLabel to default to PlainText
|
2019-02-11 14:42:50 -08:00 |
|
Sarah Jamie Lewis
|
48f558272f
|
Merge branch 'ebf201902051208' of cwtch.im/ui into master
|
2019-02-11 21:44:44 +00:00 |
|
erinn
|
ab18797ccd
|
Merge branch 'ebf201902051208' of git.openprivacy.ca:cwtch.im/ui into ebf201902051208
|
2019-02-11 13:38:15 -08:00 |
|
erinn
|
a9ffb9f47b
|
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201902051208
|
2019-02-11 13:33:20 -08:00 |
|
erinn
|
3eaa4cdf9b
|
bugfixen
|
2019-02-11 13:33:07 -08:00 |
|
erinn
|
c18de8f4c9
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-11 21:07:49 +00:00 |
|
Sarah Jamie Lewis
|
f668aa7b7d
|
Fixing Acks
|
2019-02-11 13:05:01 -08:00 |
|
erinn
|
ec18895605
|
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201902051208
|
2019-02-11 12:23:51 -08:00 |
|
erinn
|
aa3c833c25
|
.
|
2019-02-11 12:23:31 -08:00 |
|
Sarah Jamie Lewis
|
41b1db2e08
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-11 20:20:23 +00:00 |
|
Sarah Jamie Lewis
|
d4a601279c
|
Fixing no show text
|
2019-02-11 12:20:12 -08:00 |
|
Sarah Jamie Lewis
|
05d9ae1e83
|
Merge branch 'bulletfix' of cwtch.im/ui into master
|
2019-02-11 20:19:55 +00:00 |
|
Sarah Jamie Lewis
|
401dcc9580
|
Fixing Bulletin Reply
|
2019-02-05 13:09:56 -08:00 |
|
erinn
|
0e88349ae6
|
Merge branch 'bulletfix' of cwtch.im/ui into master
|
2019-02-05 20:48:07 +00:00 |
|
Sarah Jamie Lewis
|
e39f14dd10
|
Implement Clear() on Bulletin
|
2019-02-05 12:47:06 -08:00 |
|
erinn
|
098273e480
|
ok
|
2019-02-05 12:30:09 -08:00 |
|
erinn
|
bac22f7551
|
who knows what this change is. git is terrible
|
2019-02-05 12:29:28 -08:00 |
|
erinn
|
e7c628edcd
|
who knows what this change is. git is terrible
|
2019-02-05 12:09:31 -08:00 |
|
erinn
|
23d0b36e83
|
Merge branch 'resizebug' of cwtch.im/ui into master
|
2019-02-05 19:56:37 +00:00 |
|
Sarah Jamie Lewis
|
676ca69481
|
Prevent Crash on Resize
|
2019-02-05 11:53:58 -08:00 |
|
Sarah Jamie Lewis
|
1200714005
|
Merge branch 'ebf201902041640' of cwtch.im/ui into master
|
2019-02-05 00:46:41 +00:00 |
|
erinn
|
ec004afc1a
|
support changing peer/group contact names
|
2019-02-04 16:41:18 -08:00 |
|
erinn
|
eb3f6c9e32
|
Merge branch 'blankchat' of cwtch.im/ui into master
|
2019-02-04 23:38:52 +00:00 |
|
Sarah Jamie Lewis
|
35778ae4ae
|
Prevent Sending Blank Messages, fix htmlescape & bug
|
2019-02-04 15:29:14 -08:00 |
|
erinn
|
e7d4cc298d
|
Merge branch 'ack' of cwtch.im/ui into master
|
2019-02-04 23:09:51 +00:00 |
|
Sarah Jamie Lewis
|
98b96189f9
|
Fixing Positioning Issues
|
2019-02-04 15:06:00 -08:00 |
|
Sarah Jamie Lewis
|
cd5bfec43c
|
Merge branch 'ebf201902041458' of cwtch.im/ui into master
|
2019-02-04 23:05:22 +00:00 |
|
erinn
|
abec1f205e
|
Merge branch 'cleanup-tor' of dan/ui into master
|
2019-02-04 23:01:51 +00:00 |
|
erinn
|
1f687cb616
|
various layout fixes
|
2019-02-04 15:00:12 -08:00 |
 Dan Ballard
|
a692a996ac
|
call acn.Close so tor proceess is shut down
|
2019-02-04 14:34:16 -08:00 |
|
erinn
|
7d74264360
|
Merge branch 'ack' of cwtch.im/ui into master
|
2019-02-04 22:31:11 +00:00 |
|
Sarah Jamie Lewis
|
fcada3123a
|
Acknlowedgements
|
2019-02-04 14:22:58 -08:00 |
|
erinn
|
9a0dafceff
|
Merge branch 'uifix' of cwtch.im/ui into master
|
2019-02-04 19:59:45 +00:00 |
|
Sarah Jamie Lewis
|
d58b1545e3
|
Fixing resizing issues
|
2019-02-04 11:58:31 -08:00 |
|
erinn
|
7609cc3d04
|
Merge branch 'ebf201902022052' of cwtch.im/ui into master
|
2019-02-04 18:48:53 +00:00 |
|
erinn
|
829dee1d5e
|
remove minimum window size
|
2019-02-04 10:46:59 -08:00 |
|
erinn
|
6238402d33
|
Merge branch 'puzzlegame' of cwtch.im/ui into master
|
2019-02-04 00:30:45 +00:00 |
|
Sarah Jamie Lewis
|
b39157b338
|
Puzzle Game
|
2019-02-03 16:27:30 -08:00 |
|
Sarah Jamie Lewis
|
9787e9292a
|
Merge branch 'ebf201902022052' of cwtch.im/ui into master
|
2019-02-03 04:53:38 +00:00 |
|
erinn
|
7421197b8f
|
load groups faster
|
2019-02-02 20:52:29 -08:00 |
|
erinn
|
ba9d712f54
|
Merge branch 'bullet' of cwtch.im/ui into master
|
2019-02-03 01:29:11 +00:00 |
|
Sarah Jamie Lewis
|
67bb1e2b8d
|
Trivial Change
|
2019-02-02 17:27:13 -08:00 |
|
erinn
|
51f3f8e966
|
Merge branch 'htmlescape1' of cwtch.im/ui into master
|
2019-02-03 01:24:54 +00:00 |
|
erinn
|
73eb5a6ef5
|
save contacts
|
2019-02-02 17:19:51 -08:00 |
|
Sarah Jamie Lewis
|
ef287938d9
|
Fully working bulletin prototype
|
2019-02-02 16:04:41 -08:00 |
|
erinn
|
f4ab436993
|
change toolbar title
|
2019-02-01 16:28:05 -08:00 |
|
Sarah Jamie Lewis
|
6652d57018
|
Deleting
|
2019-02-01 16:17:11 -08:00 |
|
Sarah Jamie Lewis
|
95f674c064
|
Bulletin
|
2019-02-01 16:12:44 -08:00 |
|
Sarah Jamie Lewis
|
7c6a1ab8f1
|
Forbid pasting HTML
|
2019-01-30 13:40:51 -08:00 |