Dan Ballard
fa8d2007ec
Merge branch 'ebf' of cwtch.im/ui into master
2019-04-17 14:18:35 -07:00
erinn
f4518cba9f
merge
2019-04-17 14:06:19 -07:00
erinn
4494a2b168
chatoverlay scaling
2019-04-17 14:03:50 -07:00
erinn
e60b2fae0b
Merge branch 'android-notification' of dan/ui into master
2019-04-17 11:19:26 -07:00
Dan Ballard
fe5dd1e615
general purpose and ongoing android notifications
2019-04-16 14:57:23 -07:00
Dan Ballard
c7c464e21e
Merge branch 'ebf' of cwtch.im/ui into master
2019-04-16 14:10:00 -07:00
erinn
61571989e7
make most things obey ui scale
2019-04-16 12:40:19 -07:00
Sarah Jamie Lewis
5cb93c8fe9
Merge branch 'ebf201904101353' of cwtch.im/ui into master
2019-04-10 13:55:02 -07:00
erinn
6d5aad4a4d
message leaked to logs in debug mode
2019-04-10 13:53:45 -07:00
erinn
b3c5b08a74
Merge branch 'handler' of dan/ui into master
2019-04-10 12:25:08 -07:00
Dan Ballard
07e660ab30
fix cant call argument as function
2019-04-10 12:21:30 -07:00
erinn
7ce73ec89d
Merge branch 'qt512fix' of dan/ui into master
2019-04-10 10:59:47 -07:00
Dan Ballard
4b9f3f136e
fix for QT 5.12 qml not handling function pointers to handlers
2019-04-10 10:58:35 -07:00
erinn
37f5cbc9b4
Merge branch 'makefile' of dan/ui into master
2019-04-09 13:13:18 -07:00
Dan Ballard
c1e4f866e4
makefile to clean junk
2019-04-09 13:11:10 -07:00
erinn
029cd93713
Merge branch 'android-name' of dan/ui into master
2019-04-08 14:08:54 -07:00
Dan Ballard
e854d7ff11
Merge branch 'ebf201904081214' of cwtch.im/ui into master
2019-04-08 14:08:13 -07:00
Dan Ballard
5493b2f988
change android application id
2019-04-08 14:01:53 -07:00
erinn
32a61f3c56
make all overlays obey prependmessage
2019-04-08 13:57:59 -07:00
erinn
a3108c2581
faster group loading
2019-04-08 13:28:36 -07:00
Dan Ballard
493fbeba38
drone android + windows build versions
2019-03-29 14:51:35 -07:00
Dan Ballard
8a8cd9f804
drone fetch tags...
2019-03-29 13:01:43 -07:00
Dan Ballard
f425e3ee32
drone builddate and buildver for linux
2019-03-29 12:43:48 -07:00
erinn
9f6eb6dfcb
Merge branch 'version' of dan/ui into master
2019-03-29 12:39:08 -07:00
Dan Ballard
eeb167ce38
accept version at build time; display version in settings pane
2019-03-29 12:36:43 -07:00
erinn
dfef958c68
Merge branch 'i18n-tooltip' of dan/ui into master
2019-03-29 12:30:54 -07:00
erinn
9ff099418f
Merge branch 'android' of dan/ui into master
2019-03-29 12:27:49 -07:00
Dan Ballard
e1d1715023
translate tooltip
2019-03-27 12:03:13 -07:00
Dan Ballard
0f81b4430a
disable emoji parsing code on android for now to enable typing
2019-03-26 13:47:47 -07:00
Dan Ballard
90c9405b7e
Merge branch 'ebf201903261119' of cwtch.im/ui into master
2019-03-26 11:23:40 -07:00
erinn
ded921a898
add translation_fr.qm to git
2019-03-26 11:20:22 -07:00
erinn
f26fd38bf0
Merge branch 'splash' of dan/ui into master
2019-03-26 11:18:08 -07:00
Dan Ballard
abef1472d8
splash pane with custom loading progressbar; custom pre splash screen for android
2019-03-26 11:16:30 -07:00
Dan Ballard
b75b374e57
Merge branch 'ebf201903251321' of cwtch.im/ui into master
2019-03-25 13:26:32 -07:00
Sarah Jamie Lewis
1cfb38d830
Merge branch 'ebf201903251211' of cwtch.im/ui into master
2019-03-25 13:24:12 -07:00
erinn
8a30cc20a1
add fr to language switcher
2019-03-25 13:21:32 -07:00
erinn
7bb8257420
proper flag parsing
2019-03-25 12:28:14 -07:00
erinn
78d958e5f0
Merge branch 'fr' of juju/ui into master
2019-03-25 12:06:06 -07:00
erinn
71defd5ae3
Merge branch 'de' of dan/ui into master
2019-03-25 11:58:11 -07:00
Dan Ballard
34d09eb69d
DE translation from cliff
2019-03-25 11:42:13 -07:00
juju4
d45d7c24ab
add french translation
2019-03-23 08:40:51 -04:00
Dan Ballard
e0fd78be73
Merge branch 'ebf201903201404' of cwtch.im/ui into master
2019-03-20 14:16:07 -07:00
erinn
9f8863559d
allow clicking off textboxes in the control pane
2019-03-20 14:13:30 -07:00
Dan Ballard
a552fe885b
Merge branch 'ebf201903201404' of cwtch.im/ui into master
2019-03-20 14:09:35 -07:00
erinn
5ac792826a
make inplaceedittext work on focus lost
2019-03-20 14:05:34 -07:00
Dan Ballard
8b30638373
Merge branch 'ebf201903181652' of cwtch.im/ui into master
2019-03-19 11:02:59 -07:00
erinn
ce94f649d2
language switcher!
2019-03-18 16:57:53 -07:00
erinn
a19073c8c4
Merge branch 'pt_BR' of agentofuser/ui into master
...
the file also needs to be added to the qrc. i have another PR (with the language switcher!) that i'll submit momentarily.
@agentofuser thanks so much for being our first completed translation!!! :D
2019-03-18 16:55:16 -07:00
erinn
1e72a59829
Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201903181652
2019-03-18 16:52:51 -07:00
erinn
196e8fad68
language switcher
2019-03-18 16:52:46 -07:00