moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 09:42:17 -05:00
Code Issues Releases Wiki Activity
1,181 Commits 5 Branches 73 Tags 39 MiB
54e9235bfc
Commit Graph

406 Commits

Author SHA1 Message Date
kruks23
8d4ad58356 Update Spanish Translations 2014-09-09 18:45:03 +02:00
iNPUTmice
d92e8381db setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
iNPUTmice
d9c4637b31 hide encryption settings under 'expert options' 2014-09-08 22:11:48 +02:00
iNPUTmice
b23f8bd472 introduced downloadable interface. reverted some of the changes made to OTR 2014-09-08 20:09:44 +02:00
iNPUTmice
5cb11396f6 fixed sending offline pgp messages 2014-09-08 14:08:59 +02:00
iNPUTmice
58953e6193 settings to force encryption and setting for not saving messages to disk. fixed #353 2014-09-08 13:37:22 +02:00
iNPUTmice
19f98f5143 warn on missing presence subscription 2014-09-08 12:46:48 +02:00
iNPUTmice
409fdd8596 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-07 23:08:57 +02:00
iNPUTmice
449c2a544b fixed #321 - delete otr fingerprints 2014-09-07 23:08:40 +02:00
Michael
f4d86ecff3 deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. 2014-09-07 15:58:59 +02:00
iNPUTmice
0e5a0a07fd made otr a little bit more solid when there is no presence subscription 2014-09-06 18:21:31 +02:00
iNPUTmice
dc02137106 warn user if no presence subscription exists 2014-09-05 13:29:45 +02:00
iNPUTmice
6b9219c5f4 added support for password protected muc - fixed #203 and fixed #395 2014-09-03 19:35:45 +02:00
iNPUTmice
1a09a4706b added ability to disable notifications for specific conversations - fixed #322 2014-09-03 12:36:54 +02:00
iNPUTmice
3235c67e81 Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources 2014-09-02 16:50:19 +02:00
iNPUTmice
97b52abaf9 fixed #410 by removing that config option 2014-09-02 16:00:03 +02:00
iNPUTmice
0ae852a633 refactored share with activity 2014-09-02 15:51:20 +02:00
Michael
8f0882eb1c removed unused string resources. 2014-09-01 19:49:47 +02:00
Daniel Gultsch
e30599b993 Merge pull request #401 from jelmer/dutch-updates 
Update Dutch translations.
 2014-08-31 19:50:56 +02:00
Jelmer Vernooij
86b85062ad Update Dutch translations. 2014-08-31 19:45:54 +02:00
Daniel Gultsch
5ab025d008 Merge pull request #398 from betheg/fix_res 
fix: warning: string 'publish_avatar' has no default translation.
 2014-08-31 15:56:13 +02:00
iNPUTmice
8f8d4e320d experimental message merging 2014-08-31 14:29:12 +02:00
Michael
733041aee4 fix: warning: string 'publish_avatar' has no default translation. 
also altered the types of resources from array to string-array in some res-files.
 2014-08-30 17:47:17 +02:00
iNPUTmice
9be78cbbbe more swedish translations 2014-08-29 12:06:32 +02:00
iNPUTmice
33172246c9 fixed #389 2014-08-29 10:24:25 +02:00
Michael Kuhn
fc7f57cdd6 Fix some typos in the German translation. 2014-08-28 22:54:40 +02:00
iNPUTmice
85b31b8d8b fixed spelling thanks @betheg 2014-08-28 11:01:24 +02:00
iNPUTmice
12cbd07693 formating in strings file 2014-08-28 10:53:44 +02:00
iNPUTmice
d8eeab0879 Merge branch 'development' of https://github.com/beriain/Conversations into development 
Conflicts:
	res/values-eu/strings.xml
 2014-08-28 10:48:25 +02:00
Aitor Beriain
9c8b6b16d5 Update strings.xml 2014-08-27 14:48:31 +02:00
iNPUTmice
431d4ed44b translated missing string in settings 2014-08-27 09:43:53 +02:00
iNPUTmice
16eb8c3952 added swedish translations by Anders Sandblad @andersruneson 2014-08-27 09:36:47 +02:00
iNPUTmice
d617f099a1 added missing string to german translation 2014-08-26 15:35:48 +02:00
Ilia
b933a34a59 Updated to 0.6.1 
1. Different bug fixed.
2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
 2014-08-26 17:26:03 +04:00
iNPUTmice
902f6c57b1 removed deprecated strings from translations 2014-08-26 11:20:10 +02:00
Daniel Gultsch
3ed29e5a8b Merge pull request #376 from wapolinar/development 
Update strings.xml
 2014-08-25 20:25:29 +02:00
kruks23
5e7450adfa Update Spanish Translations 2014-08-25 19:49:35 +02:00
wapolinar
03a387242c Update strings.xml 
Typo in a key for the German translation.
 2014-08-25 16:51:20 +02:00
Daniel Gultsch
dce001369d Merge branch 'development' of github.com:siacs/Conversations into development 2014-08-24 17:18:10 +02:00
kriztan
eae0a0aa2c Update strings.xml 2014-08-24 17:14:47 +02:00
Daniel Gultsch
e0b759340d jump right into edit account if now accounts are configured 2014-08-23 21:31:27 +02:00
Daniel Gultsch
d504daec16 changed workflow on inital avatar publication 2014-08-23 20:00:05 +02:00
Daniel Gultsch
ee9872277d removed server compat value in favor of a (small xep list) 2014-08-23 15:56:30 +02:00
Daniel Gultsch
26d6835927 Merge pull request #373 from kruks23/translation1 
Update Spanish Translations
 2014-08-23 09:52:04 +02:00
iNPUTmice
c40c8ee910 tiny redesign for private muc messages 2014-08-22 13:22:07 +02:00
kruks23
9776618164 Update Spanish Translations 2014-08-21 17:50:07 +02:00
iNPUTmice
a269164458 added missing string resource again 2014-08-20 11:40:01 +02:00
iNPUTmice
06da080371 revised manage account activity. removed contexual action mode 2014-08-20 11:32:49 +02:00
iNPUTmice
3b79cc2f23 better error display and additional infos (stats) for the edit account activity 2014-08-19 15:06:50 +02:00
Daniel Gultsch
d74692e0a5 Merge pull request #365 from beriain/development 
Update strings.xml
 2014-08-19 15:06:52 +02:00
Aitor Beriain
9963dc63af Update strings.xml 2014-08-18 15:00:43 +02:00
kriztan
8c04649d6d Update strings.xml 2014-08-17 15:00:47 +02:00
iNPUTmice
32c3dd4f4a moved add/edit account from dialog into seperate activity 2014-08-15 17:31:24 +02:00
kriztan
4f29869607 Update strings.xml 
corrected missspelling
 2014-08-15 09:14:40 +02:00
kriztan
caaea6e830 Update strings.xml 
Added German Translations and corrected misspellings.
 2014-08-15 09:05:30 +02:00
GreenLunar
7eabefe48b Add Hebrew translation. 2014-08-14 21:04:20 +03:00
GreenLunar
e2a17b4380 Add Hebrew translation. 2014-08-14 21:00:49 +03:00
kruks23
5e8b05c31b Update Spanish Translations + publish_avatar button and menu conflict 2014-08-12 18:31:14 +02:00
iNPUTmice
b35aa3ed07 added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages. fixed #259 2014-08-10 15:27:44 +02:00
iNPUTmice
9dec8e761e changed all displays of avatars to be center crop instead of fitXY 2014-08-09 14:25:55 +02:00
iNPUTmice
937fc51b50 added warning lable if server doesn't support pubsub. refactored feature identification into seperate class 2014-08-09 10:20:16 +02:00
iNPUTmice
96a41b5b51 ability to bring default picture back with long press in publish avatar 2014-08-09 09:38:52 +02:00
iNPUTmice
313f9db1ec Merge branch 'development' of github.com:siacs/Conversations into development 2014-08-06 18:36:55 +02:00
iNPUTmice
2b4d9e8b60 fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum 2014-08-06 18:36:33 +02:00
kruks23
e8600483b2 Update Spanish Translations + gallery 2014-08-05 22:39:52 +02:00
iNPUTmice
9aba9a4059 error messages for publish avatar 2014-08-05 12:21:08 +02:00
iNPUTmice
f8b4d5f338 publish avatars 2014-08-05 01:36:17 +02:00
iNPUTmice
daab16bdef activity for future avatar publications. not working yet 2014-08-03 20:28:13 +02:00
iNPUTmice
88d1bd356c get rid of 'use phones self contact picture option' 2014-07-31 15:18:55 +02:00
iNPUTmice
990f0f6d73 refactored account array adapter into seperate class. added account image 2014-07-31 15:09:34 +02:00
iNPUTmice
27b306444b fixed #326 fixed #202 2014-07-31 13:26:05 +02:00
iNPUTmice
ba2a102c07 added swedish translation by @andersruneson 2014-07-26 10:43:37 +02:00
Jelmer Vernooij
60e94ee9b8 Update Dutch translations. 2014-07-26 04:06:55 +02:00
Michael Kuhn
1b0b847880 Update German translation. 2014-07-24 21:09:26 +02:00
Aitor Beriain
881e610636 Some corrections 2014-07-24 17:34:57 +02:00
iNPUTmice
438538e2da french translations by @BenoitBouvarel fixed #311 2014-07-24 11:48:56 +02:00
iNPUTmice
39841e6f57 fixed spanish string. wild guessed + google translate fix for basque 2014-07-24 10:16:05 +02:00
iNPUTmice
9f9dc8f5c0 added some translations back that have been removed be accident 2014-07-24 10:04:01 +02:00
iNPUTmice
76de9dba79 Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development 
Conflicts:
	res/values-ru/strings.xml
 2014-07-24 09:55:45 +02:00
Ilia
4d0d35f6bc Update strings.xml 2014-07-24 10:46:13 +04:00
Ilia
1a04b071a5 Added translations 
Added translations per issue #309 - Missing Translations
 2014-07-24 10:44:39 +04:00
iNPUTmice
3b786c34f2 removed outdated translations from languge files 2014-07-24 01:35:09 +02:00
iNPUTmice
983104f2f0 presonalized read up to this point message 2014-07-24 01:17:34 +02:00
iNPUTmice
eacf56bf37 Merge branch 'development' of github.com:siacs/Conversations into development 2014-07-22 18:58:38 +02:00
iNPUTmice
1f4ea552cd some cleanup 2014-07-22 18:58:20 +02:00
kruks23
ae532ecf20 Update Spanish Translations 2014-07-22 17:47:25 +02:00
iNPUTmice
9fcc195a6d brought settings and manage account menu items back 2014-07-22 17:23:31 +02:00
iNPUTmice
2345398652 fixed #301 2014-07-22 16:55:30 +02:00
Daniel Gultsch
9b53ebd44b Merge pull request #299 from beriain/development 
Update strings.xml
 2014-07-22 15:30:23 +02:00
Aitor Beriain
db91c15fcf Update strings.xml 2014-07-22 15:12:19 +02:00
iNPUTmice
b223784560 added hint to explain the contact has read up to this point 2014-07-21 19:54:26 +02:00
iNPUTmice
2fe20ffa8e fixed #267 2014-07-21 16:16:09 +02:00
iNPUTmice
9ddd2f195e fixed typos reported by @jelmer fixed #288 2014-07-20 12:21:04 +02:00
Daniel Gultsch
0ee7cd136a Merge pull request #289 from jelmer/dutch 
Add Dutch translations.
 2014-07-20 12:17:14 +02:00
Jelmer Vernooij
cb0a87d7ff Add Dutch translations. 2014-07-20 04:00:05 +02:00
kruks23
88857e7721 Update Spanish Translations 2014-07-18 18:36:22 +02:00
iNPUTmice
6b74c0594e show snackbar if conference was not found 2014-07-18 12:44:33 +02:00
iNPUTmice
38a9242955 brought muc invites back. + couple of bug fixes + refactoring 2014-07-17 00:03:37 +02:00
kruks23
4e321c5187 Update Spanish Translations 2014-07-16 16:31:18 +02:00
iNPUTmice
e79a34b651 redesigned muc details a little bit 2014-07-16 12:34:09 +02:00