Commit Graph

193 Commits

Author SHA1 Message Date
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
Sarah Jamie Lewis 61bad4775a Merge branch 'ebf2019011411' of cwtch.im/ui into master 2019-01-14 19:50:22 +00:00
erinn e191de86dd merge 2019-01-14 11:45:28 -08:00
erinn f5c8a44423 fix ui scaler. fix font colours on kde. fix p2p settings crash. 2019-01-14 11:40:04 -08:00
erinn 6b8db197d1 Merge branch 'logging' of dan/ui into master 2018-12-18 19:43:22 +00:00
Dan Ballard 276daca8d5 migrating to libricochet-go's new logging 2018-12-05 08:05:39 -08:00
erinn ae7e3e5c4e renaming bounce to cwtch.im/app 2018-11-28 14:14:02 -08:00
erinn fe5f83c3f7 Merge branch 'bugfix' of erinn/bounce into master 2018-11-28 21:32:07 +00:00
Sarah Jamie Lewis 6654785516 Showing group nickname 2018-11-28 13:29:32 -08:00
erinn f5f28da7aa Merge branch 'bugfix' of erinn/bounce into master 2018-11-28 20:59:32 +00:00
Sarah Jamie Lewis 7a8e102b2a Saving Messages 2018-11-28 12:34:49 -08:00
erinn 45da4d33cb Merge branch 'bugfix' of erinn/bounce into master 2018-11-28 19:36:22 +00:00
Sarah Jamie Lewis b5875453fb Fixing Null Contact Issue 2018-11-28 11:22:37 -08:00
erinn 9cb11162cf initial commit 2018-11-26 13:57:28 -08:00
erinn 8a9ba6d154 initial commit 2018-11-21 16:01:17 -08:00
erinn 690a71308e initial commit 2018-10-30 22:43:22 -07:00
erinn a006f4a968 initial commit 2018-10-30 12:50:41 -07:00
erinn b3ef6f91ee initial commit 2018-10-30 12:48:37 -07:00
erinn a4c79eb544 Merge branch 'cwtchApp' of dan/bounce into master 2018-10-30 19:48:08 +00:00
Dan Ballard 91ebd8b5be invote cwtch App so as tor manager starts properly 2018-10-30 11:48:46 -07:00
erinn 1011d4a4f9 initial commit 2018-10-29 11:00:21 -07:00
erinn 65c50a50b0 initial commit 2018-10-27 19:49:14 -07:00
erinn 8983f41438 remove qmlc files from git 2018-10-26 12:29:58 -07:00
erinn 5c73cd8b3f initial commit 2018-10-24 17:13:03 -07:00
erinn 50590096ed initial commit 2018-10-23 11:52:13 -07:00