Commit Graph

124 Commits

Author SHA1 Message Date
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
Sarah Jamie Lewis 6bca7d2a6d Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-30 20:47:39 +00:00
erinn 1f66a2637b timestamp fix 2019-01-30 12:46:31 -08:00
Sarah Jamie Lewis fdb396bb75 Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-30 20:03:24 +00:00
erinn ead985d22b idk 2019-01-30 12:01:30 -08:00
erinn 564cc91149 idk 2019-01-30 12:00:47 -08:00
erinn 99c0889a88 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf2019011411 2019-01-30 11:58:33 -08:00
erinn f86be56678 idk 2019-01-30 11:58:23 -08:00
erinn 1c9bb47083 Merge branch 'htmlescape' of cwtch.im/ui into master 2019-01-30 19:57:08 +00:00
Sarah Jamie Lewis e357bf3f4b Escaping HTML 2019-01-30 11:46:22 -08:00
Dan Ballard 65ff90c631 Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-29 18:50:07 +00:00
erinn 6ba5b7b638 tidy nam 2019-01-28 14:02:36 -08:00
erinn d019f3538f disable network access manager 2019-01-28 14:00:46 -08:00
erinn f667c1ec70 add storage eventbus calls 2019-01-28 11:57:44 -08:00
Sarah Jamie Lewis 0d72d4db7e Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-27 01:11:49 +00:00
erinn e620d48bc8 overlay framework 2019-01-26 14:54:08 -08:00
Sarah Jamie Lewis 9357f184ba Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-22 19:16:23 +00:00
erinn cea689e832 updating eventbus fields 2019-01-22 11:12:20 -08:00
erinn e19711e599 stop saving anything 2019-01-21 13:41:47 -08:00
erinn 2e908a7560 updating ui to use eventbus 2019-01-21 13:17:51 -08:00