moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-14 04:55:04 -05:00
Code Issues Releases Wiki Activity
747 Commits 5 Branches 73 Tags 39 MiB
4d0d35f6bc
Commit Graph

256 Commits

Author SHA1 Message Date
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
Aitor Beriain
b16bc24c71 Update strings.xml 2014-06-18 17:15:59 +02:00
kruks23
febf23de1f Rounded minutes ago and last seen + Update Spanish Translations 2014-06-15 18:27:20 +02:00
iNPUTmice
eb7ed78605 moved last seen to contact details 2014-06-13 11:50:47 +02:00
iNPUTmice
592aded106 finished offline otr 2014-06-12 23:04:28 +02:00
iNPUTmice
285ffa86e7 fixed scrolling issues 2014-06-10 17:01:19 +02:00
iNPUTmice
28b7a6c92a don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable 2014-06-09 21:25:01 +02:00
Daniel Gultsch
d0a338f814 Merge pull request #188 from DerHamster/worktest 
small fix ( zerfifikat -> zertifikat )
 2014-06-09 20:24:51 +02:00
iNPUTmice
c92db4e113 updated languages 2014-06-09 20:22:43 +02:00
eric
79f09ccf61 small fix ( zerfifikat -> zertifikat ) 2014-06-09 20:19:08 +02:00
Aitor Beriain
9f48555a18 Update strings.xml 2014-06-09 16:11:30 +02:00
kruks23
777edca0e1 Update Spanish Translations 2014-06-09 01:01:56 +02:00
iNPUTmice
71886ed2ab localized date. rounded minutes, hours and dates in last seen 2014-06-07 13:57:03 +02:00
iNPUTmice
3fd371cd53 fixed last_seen_now 2014-06-06 19:39:55 +02:00
iNPUTmice
fc656c5571 removed presence from last seen 2014-06-06 19:37:34 +02:00
iNPUTmice
e820c98cb7 Merge branch 'development' of github.com:siacs/Conversations into development 2014-06-06 11:39:33 +02:00
iNPUTmice
5fe926b645 basic last seen feature. no peristancy just yet. no polish 2014-06-06 11:39:17 +02:00
Daniel Gultsch
356a5724f6 Merge pull request #178 from kruks23/development 
Update Spanish Translations
 2014-06-05 11:52:07 +02:00
iNPUTmice
a583471af8 read marker is now a little less in your face 2014-06-05 01:57:00 +02:00
kruks23
a4e06db14f Update Spanish Translations 2014-06-05 00:07:43 +02:00
iNPUTmice
83e919f8af experimental gui to display read status 2014-06-04 21:40:17 +02:00
iNPUTmice
7e4e7426ee received and displayed messages (xep 333) are now marked properly 2014-06-04 18:44:15 +02:00
iNPUTmice
cedc1f40b3 answer to xep 184 message receipts. fixes #95 2014-06-03 15:48:51 +02:00
Alethea Rose Butler
5881fc0412
Fixed typo in source "sefl" -> "self" 2014-06-01 17:45:20 -04:00
iNPUTmice
32a21e1ab9 unified crypto messages and made lock icon work for conferences 2014-06-01 19:08:42 +02:00
iNPUTmice
8ea73feec4 added warning when public keys are missing 2014-06-01 18:52:27 +02:00
iNPUTmice
1a4b1f8a2f show dialog when no contact in a muc has pgp support 2014-06-01 11:24:35 +02:00
iNPUTmice
5d0e1374b2 OpenPGP key display in muc details is now prettier and linked to openkeychain 2014-06-01 10:22:42 +02:00
Alethea Butler
3e9627dc50 Capitalized openPGP -> OpenPGP 2014-05-31 00:11:47 -04:00
Daniel Gultsch
6f2a0c0107 Merge pull request #160 from alethea/development 
Spelling and changed "unsuccessful delivery" to "delivery failed"
 2014-05-30 12:36:38 +02:00
Alethea Butler
cb127add56 Changed "unsuccessful delivery" to "delivery failed" 2014-05-30 02:04:24 -04:00
Alethea Butler
732848fc0e Added question mark to remove_contact_text 2014-05-30 02:03:24 -04:00
kruks23
75b14a1d5c More harcoded translations + updated Spanish 2014-05-29 18:17:21 +02:00
Daniel Gultsch
3e3967b785 Merge pull request #147 from kruks23/development 
Fix Contact Status width in contact details
 2014-05-26 18:46:51 +02:00
Daniel Gultsch
a858992586 Merge pull request #152 from beriain/development 
Update basque translation
 2014-05-26 18:46:12 +02:00
iNPUTmice
a0d21211e1 fixed #151 2014-05-26 18:44:26 +02:00
Aitor Beriain
10aa935331 Update strings.xml 
Some strings were untranslated in the previous commit
 2014-05-26 17:30:15 +02:00
Aitor Beriain
c4e45458fb Update strings.xml 2014-05-26 17:27:03 +02:00
kruks23
1b6a07e380 Fix Contact Status width in contact details 2014-05-24 15:37:54 +02:00
Daniel Gultsch
7f825f8027 error msg on offline subscription changes 2014-05-24 11:17:55 +02:00
kruks23
d74faa3f7c More harcoded translations + Spanish 2014-05-24 00:17:42 +02:00
kruks23
d6fd0343ae Title activities translations + contacts translations + update Spanish Translations 2014-05-23 16:20:49 +02:00
Daniel Gultsch
a2ae6e80fa Merge pull request #143 from nachovfranco/mycommits 
Galician translation
 2014-05-23 09:57:20 +02:00
kruks23
950165033b Contact details translations + update spanish translations 2014-05-22 22:58:25 +02:00
nachovfranco
e26c60b9ca Galician translation 2014-05-22 13:10:23 +02:00
Daniel Gultsch
a9d384875b added missing strings 2014-05-21 20:37:55 +02:00
Daniel Gultsch
543d776986 Merge pull request #131 from beriain/development 
Update and fix basque translation
 2014-05-20 20:37:40 +02:00
kruks23
aba1ca7918 Update Spanish Translations + harcoded just_now 2014-05-20 18:49:58 +02:00
Beriain
2b50c9912b Update and fix basque translation 2014-05-20 16:35:02 +02:00
Daniel Gultsch
ff6e51356f Merge pull request #128 from kruks23/development 
Update Spanish Translations
 2014-05-20 11:52:11 +02:00
Daniel Gultsch
a582d44dba added search icon 2014-05-20 10:15:47 +02:00
Daniel Gultsch
993477cd83 reworked roster/contact handling. might break some stuff. not sycing to disk yet 2014-05-19 15:15:09 +02:00
kruks23
7994b6866b Update Spanish Translations 2014-05-18 19:33:38 +02:00
Daniel Gultsch
590e2403ab bind and session request more compatible 2014-05-18 17:32:20 +02:00
Daniel Gultsch
7fc7201abb cleaned up edit account dialog a little 2014-05-18 11:49:44 +02:00
Daniel Gultsch
736e09fbb5 added record audio button 2014-05-17 19:21:16 +02:00
Daniel Gultsch
a32d95cdd3 fixed #66 2014-05-17 12:10:58 +02:00
Daniel Gultsch
cab9b10e35 spelling 2014-05-17 12:02:14 +02:00
kruks23
e50f009004 Update Spanish Translations + harcoded pref_advanced_settings 2014-05-16 22:35:58 +02:00
Daniel Gultsch
225447f2f5 updated german translation 2014-05-16 16:16:35 +02:00
Daniel Gultsch
c8f8bab2a1 formating 2014-05-16 13:18:52 +02:00
Benoit Bouvarel
3d0f08e319 French translation + hard-coded string > @string 2014-05-16 01:13:07 +02:00
Daniel Gultsch
3426df21c1 Merge pull request #109 from kruks23/development 
Update Spanish Translations
 2014-05-15 12:07:41 +02:00
kruks23
ad19100b9d Update Spanish Translations 2014-05-14 19:18:07 +02:00
Daniel Gultsch
f4eebd091c fixed #105 2014-05-14 18:32:58 +02:00
Daniel Gultsch
65e7294802 Merge branch 'development' into feature/take_picture 2014-05-14 00:09:38 +02:00
Daniel Gultsch
ebae779d73 one more entry to strings file 2014-05-13 18:06:56 +02:00
Daniel Gultsch
888de850cf Merge branch 'development' into feature/take_picture 2014-05-13 17:23:58 +02:00
Beriain
efac008ffb Fix 2014-05-13 16:52:35 +02:00
Beriain
8d27d0c44a Merge https://github.com/siacs/Conversations into development 2014-05-13 16:46:03 +02:00
Beriain
1150f47add Update basque translation and include preferences 2014-05-13 16:42:26 +02:00
Daniel Gultsch
6dfd885d34 submenu for attach file 2014-05-13 15:25:04 +02:00
Daniel Gultsch
3cd369fb7b german translation 2014-05-13 13:51:13 +02:00
Daniel Gultsch
f38c7b22fd further translations 2014-05-13 11:23:11 +02:00
Daniel Gultsch
cce12af766 fixed french language 2014-05-13 10:18:59 +02:00
Daniel Gultsch
32d2efd459 Merge pull request #88 from BenoitBouvarel/development 
Translation into French
 2014-05-12 23:29:26 +02:00
Daniel Gultsch
dee1ba3bdd Merge pull request #101 from kruks23/development 
Preferences Spanish Translations
 2014-05-12 23:28:19 +02:00
kruks23
ae768598fe Preferences Spanish Translations 2014-05-12 23:22:47 +02:00
alvar
cb706e9e82 Fix a typo in catalan translation 2014-05-12 23:15:18 +02:00
alvar
d07139d3c4 Translation into catalan language 2014-05-12 23:14:58 +02:00
Daniel Gultsch
ecea4a5cd2 fixed parsing error on missing %s 2014-05-12 23:12:01 +02:00
Beriain
3858715ccf Update basque translation 2014-05-12 17:19:00 +02:00
Beriain
75f7695087 Merge https://github.com/siacs/Conversations into development 2014-05-12 17:09:32 +02:00
Daniel Gultsch
3455d10a4a Better error handling if attach file doesnt work (on permission denied) 
and unified encrypted and unencrypted file attachment
 2014-05-12 14:59:46 +02:00
iNPUTmice
4d0bf7971e transfered preferences descritpions into strings.xml 2014-05-11 13:55:15 +02:00
kruks23
fcc021aa94 Delete styles.xml 2014-05-10 11:26:53 +02:00
kruks23
1f32089ec0 Merge remote-tracking branch 'origin/development' into development 
Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml
 2014-05-10 11:23:56 +02:00
kruks23
3d913c2e0e Translation into spanish. 2014-05-10 11:23:04 +02:00