243 Commits

Author	SHA1	Message	Date
iNPUTmice	2ebd92b7a7	pushing bookmarks back to server	2014-07-15 14:32:19 +02:00
iNPUTmice	3fa3d5f02b	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-14 11:48:01 +02:00
iNPUTmice	e2f886d121	fetch bookmarks from server	2014-07-14 11:47:42 +02:00
kruks23	c4d6775f7d	Update Spanish Translations	2014-07-13 13:29:06 +02:00
iNPUTmice	4e910eee59	fixed #268	2014-07-12 17:08:01 +02:00
iNPUTmice	7a26f27212	switch SearchView with custom action view	2014-07-11 23:44:59 +02:00
iNPUTmice	610df2eddc	added join conference dialog	2014-07-11 19:48:41 +02:00
iNPUTmice	0193e0291c	cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites	2014-07-11 14:07:52 +02:00
iNPUTmice	e7a0040ec5	fixed #255 and made some other improvements to the subscription mgmt	2014-07-11 13:52:27 +02:00
Daniel Gultsch	8ebd14cef4	Merge pull request #262 from kruks23/development ... Show time in messages previous days	2014-07-11 13:12:25 +02:00
iNPUTmice	a523127a80	fixed #38	2014-07-10 19:42:37 +02:00
kruks23	1da0845d52	Update Spanish Translations	2014-07-10 18:12:57 +02:00
iNPUTmice	e97b524455	added create contact dialog	2014-07-10 13:19:42 +02:00
iNPUTmice	f8763015eb	added contextual menu for contacts	2014-07-10 01:55:19 +02:00
iNPUTmice	2684ecda1e	small changes	2014-07-10 00:53:44 +02:00
iNPUTmice	7b8ed5ffbc	theming for tabs in start conversation	2014-07-10 00:53:44 +02:00
iNPUTmice	3bdf84b6a0	filter contacts and starting confercenes	2014-07-10 00:53:44 +02:00
iNPUTmice	7c3f3b2a3e	added group add button	2014-07-10 00:53:43 +02:00
iNPUTmice	c1ee9e682a	added action bar menu to start conversation	2014-07-10 00:53:43 +02:00
iNPUTmice	502a1bdb9c	changed support lib to v13. added tabs and fragments to start conversation activity	2014-07-10 00:53:43 +02:00
iNPUTmice	2c50ba1779	moved hint box to the bottom	2014-07-10 00:13:30 +02:00
iNPUTmice	da79e2cca2	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-09 21:45:21 +02:00
iNPUTmice	6e3e1d310a	unified warnings/error msgs	2014-07-09 21:45:03 +02:00
Daniel Gultsch	0372756754	Merge pull request #245 from beriain/development ... Update strings.xml and fix some strings	2014-07-08 17:00:47 +02:00
iNPUTmice	3ac70d4b86	uniformed colors. made colors a little material	2014-07-08 11:41:19 +02:00
iNPUTmice	37a8b87235	Merge branch 'development' of github.com:siacs/Conversations into development	2014-07-07 17:20:27 +02:00
Aitor Beriain	98c1f2bee7	Update strings.xml	2014-07-07 16:29:37 +02:00
Daniel Gultsch	4427b6727b	Merge pull request #256 from kruks23/development ... Update Spanish Translations	2014-07-07 15:20:54 +02:00
Daniel Gultsch	30782d2bfb	Merge pull request #257 from BenoitBouvarel/development ... French translation updated	2014-07-07 15:20:45 +02:00
Benoit Bouvarel	e8ba26e0aa	Update strings.xml	2014-07-07 15:17:25 +02:00
kruks23	11f3aa5c87	Update Spanish Translations	2014-07-07 15:15:33 +02:00
Benoit Bouvarel	f55e5feb46	French translation updated	2014-07-07 15:13:17 +02:00
iNPUTmice	37eb8e4ed9	changed icons to light	2014-07-07 13:50:31 +02:00
iNPUTmice	b0a561bac0	styled action bar green	2014-07-07 10:51:06 +02:00
iNPUTmice	99eb1743e3	small ui overhauls. unified text sizes. made text a bit smaller. moved messages more closer together	2014-07-04 16:13:52 +02:00
iNPUTmice	65d62cced4	fixed #247	2014-07-04 12:06:11 +02:00
Wenzel Pünter	1f632ca235	Update translation	2014-07-03 18:15:47 +02:00
Wenzel Pünter	6afd918990	Add missing German translations	2014-07-03 18:14:10 +02:00
iNPUTmice	aa1665e359	fixed some tiny ui glitches	2014-07-02 17:30:53 +02:00
iNPUTmice	fcc5b3674c	removed old notification icon	2014-06-30 21:07:24 +02:00
iNPUTmice	53533ca74e	added error message for #240	2014-06-30 10:36:21 +02:00
Daniel Gultsch	f7f730e804	Merge pull request #237 from kruks23/development ... Update Spanish Translations	2014-06-30 10:30:37 +02:00
iNPUTmice	d58d428874	more error handling for jingle connections	2014-06-29 13:44:59 +02:00
kruks23	069cc51661	Update Spanish Translations	2014-06-29 11:57:53 +02:00
iNPUTmice	ed3b535e6c	made warnings in chats i tiny bit smaller	2014-06-27 11:15:06 +02:00
kruks23	6332591902	Update spanish mins ago	2014-06-24 09:21:46 +02:00
iNPUTmice	2a8f9642d5	added rendering script for artwork	2014-06-24 01:35:43 +02:00
iNPUTmice	25e44cbf52	new logo	2014-06-23 21:57:53 +02:00
iNPUTmice	6409846379	removed duplicate entries	2014-06-21 22:16:42 +02:00
iNPUTmice	545cad41e6	Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development ... Conflicts: res/values-eu/strings.xml	2014-06-20 19:49:33 +02:00