Commit Graph

124 Commits

Author SHA1 Message Date
Sarah Jamie Lewis 7b776bde57 Merge branch 'ebf201902131852' of cwtch.im/ui into master 2019-02-14 02:58:12 +00:00
erinn 21a905eb3b Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201902131852 2019-02-13 18:53:52 -08:00
erinn 454244934a merge 2019-02-13 18:53:36 -08:00
erinn 79b4713959 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-14 02:49:20 +00:00
Sarah Jamie Lewis 25083878ab Accept/Reject Invitations and Remove Game 2 2019-02-13 18:42:13 -08:00
Sarah Jamie Lewis 0568c9744a Update 'README.md' 2019-02-13 20:40:50 +00:00
Sarah Jamie Lewis c8605a952d Update 'README.md' 2019-02-13 20:39:32 +00:00
Sarah Jamie Lewis 6c7926dbcf Update 'README.md' 2019-02-13 20:38:29 +00:00
erinn 5bdfc856a0 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 20:18:23 +00:00
Sarah Jamie Lewis 1a800a44bc Deleting Contacts, Alerting, Click to Talk 2019-02-13 00:09:04 -08:00
Sarah Jamie Lewis 1c614a9e66 Fixing HTML in ComboBox 2019-02-12 21:08:43 -08:00
erinn c7b7912ef6 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 04:38:42 +00:00
Sarah Jamie Lewis 71f87c5f70 Clear text box 2019-02-12 20:35:23 -08:00
erinn 1cdc858d00 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 04:28:49 +00:00
Sarah Jamie Lewis eaa68d1221 Removing skip one update log 2019-02-12 20:27:04 -08:00
erinn c11450e6d8 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 04:26:35 +00:00
Sarah Jamie Lewis 98b83cf51a Fixing back buttons 2019-02-12 20:25:20 -08:00
erinn 68572a8cc0 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 04:23:50 +00:00
Sarah Jamie Lewis da41f0c515 Cleanup 2019-02-12 20:10:46 -08:00
erinn 01a473175b Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 03:13:48 +00:00
Sarah Jamie Lewis 17f49370bf Delete all the things 2019-02-12 19:08:23 -08:00
erinn b4dc118198 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 02:49:26 +00:00
Sarah Jamie Lewis 73aef09e93 Update default server 2019-02-12 16:23:35 -08:00
erinn 79fdc94598 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-13 00:16:43 +00:00
Sarah Jamie Lewis 788a623b01 Window 2019-02-12 16:07:03 -08:00
Sarah Jamie Lewis cbdd329161 Merge branch 'ebf201902051208' of cwtch.im/ui into master 2019-02-12 23:20:42 +00:00
erinn ecb182197b layout improvements 2019-02-12 14:47:23 -08:00
erinn e86686f2f7 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-12 21:24:14 +00:00
Sarah Jamie Lewis 014520c26f Art 2019-02-12 13:22:14 -08:00
erinn b9211272dd Merge branch 'textfix' of cwtch.im/ui into master 2019-02-11 23:26:18 +00:00
Sarah Jamie Lewis 7b6d6c7ada TODO List 2019-02-11 15:23:17 -08:00
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