2176 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
iNPUTmice	3216813e49	made version codes ready for release candidate in beta channel	2015-01-29 23:56:04 +01:00
iNPUTmice	3a52f31824	don't count when attempt failed completly	2015-01-29 23:35:31 +01:00
iNPUTmice	6c3ea7f2bd	Merge branch 'development' of https://github.com/siacs/Conversations into development	2015-01-29 23:26:41 +01:00
Daniel Gultsch	26bc2d387f	Merge pull request #923 from SamWhited/material-design-icons ... Start experimenting with material design icons	2015-01-29 23:28:41 +01:00
iNPUTmice	f2bf64d19d	Merge branch 'development' of https://github.com/siacs/Conversations into development	2015-01-29 23:20:01 +01:00
Sam Whited	48604a6620	Use Material Design Icons on API 21+	2015-01-29 15:28:26 -05:00
iNPUTmice	0eeead495f	properly clear notifications. fixed #921	2015-01-29 13:20:18 +01:00
Daniel Gultsch	c237a55093	Merge pull request #941 from SamWhited/snackbar_ordering ... Show errors before mute snackbar	2015-01-28 13:08:26 +01:00
iNPUTmice	3c64839daf	fixed broken caps	2015-01-28 00:28:00 +01:00
Sam Whited	8cbf610bb2	Show errors before mute snackbar ... See #939	2015-01-27 08:49:03 -05:00
iNPUTmice	f8b662e7f8	muc tics for consistency	2015-01-26 01:25:47 +01:00
iNPUTmice	2a14a0d9b8	changed version code and version name to 1.0-beta2	2015-01-26 00:50:06 +01:00
iNPUTmice	91e85d2faf	adapt caps on whether or not message confirmation is on	2015-01-26 00:48:56 +01:00
iNPUTmice	94086bb9b7	don't put ejabberds status code muc messages into an actual conversation	2015-01-26 00:26:16 +01:00
iNPUTmice	f0d428a56d	made connect time out more failsave	2015-01-25 20:52:53 +01:00
Daniel Gultsch	4afdd6480a	Merge pull request #930 from betheg/otr ... otr: switch to the otr-state the partner alternate.	2015-01-25 20:53:29 +01:00
Daniel Gultsch	1559144701	Merge pull request #933 from betheg/mergeable ... fix mergable() for /me command.	2015-01-25 19:30:00 +01:00
Michael	29331e49b9	fix mergable() for /me command.	2015-01-25 16:58:06 +01:00
iNPUTmice	14fc520ec0	updated translations	2015-01-25 16:36:57 +01:00
iNPUTmice	82a74fabc9	set jingle file transfer to offer after iq offer has returned	2015-01-25 16:32:59 +01:00
Daniel Gultsch	e5700f075c	Merge pull request #932 from svetlemodry/development ... Czech translation	2015-01-25 16:29:16 +01:00
Jaroslav Lichtblau	0f3fb3ab43	Czech translation ... for "hide offline" added	2015-01-25 16:18:09 +01:00
Daniel Gultsch	48dbf57c1a	Merge pull request #931 from betheg/gradle_plugin ... update android gradle plugin to 1.0.1	2015-01-25 15:55:43 +01:00
Michael	56dec46491	update android gradle plugin to 1.0.1	2015-01-25 15:12:00 +01:00
Michael	7800647885	otr: switch to the otr-state the partner alternate. ... should also fixed #877	2015-01-25 13:07:31 +01:00
Daniel Gultsch	90d06d38d6	Merge pull request #927 from betheg/otr_query_message ... MessageParser: fix the regex for otr query messages.	2015-01-25 01:07:09 +01:00
Michael	8041d23cb1	MessageParser: fix the regex for otr query messages.	2015-01-24 16:19:58 +01:00
Daniel Gultsch	7769d305e6	Merge pull request #924 from andersruneson/changeonlinecolor ... Changed online color to green instead of primary	2015-01-24 00:28:29 +01:00
iNPUTmice	b9af38464e	fixed mam to work with muc	2015-01-24 00:22:51 +01:00
Anders Sandblad	cbebd14dbd	Changed online color to green instead of primary	2015-01-23 22:28:10 +01:00
iNPUTmice	ed3d76bcf6	mentioned hide offline feature in the changelog	2015-01-22 00:08:48 +01:00
iNPUTmice	4e50098e31	show checkbox to hide offline contacts	2015-01-21 17:24:02 +01:00
iNPUTmice	2dc69eea68	fixed bug in find conference in database method	2015-01-21 16:18:57 +01:00
iNPUTmice	00c74503ab	deal with user entering full jids in join conference dialog	2015-01-21 16:18:38 +01:00
iNPUTmice	be9af442ef	always allow access to contact details. provide add button in contact details	2015-01-21 15:31:40 +01:00
Sam Whited	764ef3c8cd	Add block/unblock to contact details menu ... See #889	2015-01-21 13:07:36 +01:00
Daniel Gultsch	818c0e609c	Merge pull request #908 from betheg/otr4j ... otr4j: update to 0.22	2015-01-21 11:48:42 +01:00
Daniel Gultsch	7df6ae9ef8	Merge pull request #912 from SamWhited/update-foreground-notification ... Add color / category to foreground notification	2015-01-21 11:48:36 +01:00
Sam Whited	e42e0f88e1	Add color / category to foreground notification	2015-01-20 20:32:27 -05:00
iNPUTmice	7839438f51	changed message duplicate finder	2015-01-20 22:54:58 +01:00
iNPUTmice	6dc53c2b35	fixed missing image preview	2015-01-20 22:54:26 +01:00
iNPUTmice	04f4680582	fixed up button on v21 devices	2015-01-20 22:53:45 +01:00
Michael	fa7d748c3f	otr4j: update to 0.22	2015-01-20 18:01:39 +01:00
iNPUTmice	32a16137df	Fixed action bar search for Android 5.0	2015-01-20 14:53:47 +01:00
Daniel Gultsch	a93dd1b0c4	Merge pull request #905 from svetlemodry/development ... Czech translation updated	2015-01-20 11:25:43 +01:00
Jaroslav Lichtblau	7e4053abff	Czech translation updated ... for Conversations	2015-01-19 19:07:43 +01:00
Daniel Gultsch	ea37fb9ffa	Merge pull request #904 from SamWhited/remove-ssl ... Remove legacy SSL support	2015-01-19 17:15:57 +01:00
Sam Whited	503237087f	Remove legacy SSL support	2015-01-19 11:02:13 -05:00
iNPUTmice	1e607d7b1b	don't trim bodies	2015-01-19 12:15:27 +01:00
iNPUTmice	c5d087ad55	fetched translations from transifex	2015-01-19 12:14:55 +01:00