sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,015 Commits 5 Branches 297 Tags 50 MiB
Commit Graph

1015 Commits

Author SHA1 Message Date
Daniel Gultsch aa68045c58 offline sending of pgp fixed 2014-05-16 13:42:20 +02:00
Daniel Gultsch c8f8bab2a1 formating 2014-05-16 13:18:52 +02:00
Daniel Gultsch 1cf1e62e30 fixed null in shared link 2014-05-16 12:07:58 +02:00
Daniel Gultsch afd1ba657a Merge pull request #117 from BenoitBouvarel/development 
French translation + hard-coded string > @string
 2014-05-16 11:55:17 +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
Daniel Gultsch 13d73a196c fixed npe 2014-05-15 10:27:36 +02:00
kruks23 ad19100b9d Update Spanish Translations 2014-05-14 19:18:07 +02:00
Daniel Gultsch ca7e24c30d hiding the prepare image toast after error or success 2014-05-14 18:43:58 +02:00
Daniel Gultsch 08a26d2772 fixed possible npe 2014-05-14 18:39:59 +02:00
Daniel Gultsch f4eebd091c fixed #105 2014-05-14 18:32:58 +02:00
Daniel Gultsch 81d2760505 made message parser non static 2014-05-14 12:56:34 +02:00
Daniel Gultsch 1f600be4dd code clean up 2014-05-14 11:49:43 +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 bc87f59600 version bump 2014-05-13 17:57:10 +02:00
Daniel Gultsch a1a90a03e0 added presence selection 2014-05-13 17:42:23 +02:00
Daniel Gultsch 888de850cf Merge branch 'development' into feature/take_picture 2014-05-13 17:23:58 +02:00
Daniel Gultsch a3d241020a Merge branch 'beriain-development' into development 2014-05-13 17:22:45 +02:00
Daniel Gultsch c0f5b26d1a Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development 2014-05-13 17:22:06 +02:00
Daniel Gultsch f1bdf1d4c5 Merge branch 'development' into feature/take_picture 2014-05-13 17:11:36 +02:00
Daniel Gultsch 71545f4f66 code cleanup 2014-05-13 17:11:27 +02:00
Beriain efac008ffb Fix 2014-05-13 16:52:35 +02:00
Daniel Gultsch 9492e28902 takeing pictures over intent 2014-05-13 16:48:39 +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 a8010e7133 Merge branch 'development' into feature/take_picture 2014-05-13 15:40:59 +02:00
Daniel Gultsch 84e79040df static method for providing content uri 2014-05-13 15:37:11 +02:00
Daniel Gultsch 6dfd885d34 submenu for attach file 2014-05-13 15:25:04 +02:00
Daniel Gultsch 7e66731960 ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination 2014-05-13 14:49:09 +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 ad9b9b9096 fixed npe in tag writer 2014-05-13 10:23:26 +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 4be8280beb marked version 0.2 - skipping beta 2014-05-12 15:40:03 +02:00
Daniel Gultsch 2fe9bbecdb added changelog entry 2014-05-12 15:05: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
Daniel Gultsch 20dfc32e2b Merge pull request #93 from kruks23/development 
Spanish Translation
 2014-05-10 11:46:44 +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