moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-25 02:02:16 -05:00
Code Issues Releases Wiki Activity
1,221 Commits 5 Branches 73 Tags 39 MiB
e98460771b
Commit Graph

1221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iNPUTmice
9ae52a235f revised tablet ui. fixed #423 2014-10-03 15:00:29 +02:00
Daniel Gultsch
335152b191 Merge pull request #518 from isaackwan/translation_zhrCN-TW2 
Chinese Translation fixes
 2014-10-03 14:51:21 +02:00
Isaac Kwan
730f46c7b2 1) Renamed values-zh values-zh_rCN in accordance with #329 and Android conventions 
2) Added arrays.xml translations for Simplified Chinese (zh_rCN)
3) Added translations (arrays.xml and strings.xml) for Traditional Chinese (zh_rTW)
 2014-10-03 19:34:51 +08:00
iNPUTmice
0e56ff93e9 fixed possible npe 2014-10-03 11:55:38 +02:00
iNPUTmice
facd15f037 check if display is off for notifications 2014-10-02 22:17:25 +02:00
iNPUTmice
f671938e84 mark conversation as read when displayed marker from another client is received 2014-10-02 21:07:11 +02:00
iNPUTmice
cc76e15b95 avoided unecessary message searchs 2014-10-02 18:54:21 +02:00
iNPUTmice
f8be57d43f show displayed by contact on all devices 2014-10-02 18:31:19 +02:00
iNPUTmice
4b09f0e9d3 properly dismiss notifications 2014-10-02 17:36:02 +02:00
iNPUTmice
fd6f5b0e84 calculate sample size for thumbnails as well 2014-09-30 16:22:02 +02:00
Daniel Gultsch
0733a94127 Merge pull request #505 from betheg/fix_invite 
fixed muc invite with <body/>.
 2014-09-30 11:53:07 +02:00
Daniel Gultsch
511b7a53f4 notifiy only when necessary 2014-09-29 18:28:13 +02:00
Michael
c8160b010d fixed muc invite with <body/>. 2014-09-29 17:59:53 +02:00
Daniel Gultsch
87010e6094 more improvments for new notification service 2014-09-28 16:33:25 +02:00
Daniel Gultsch
bff23c2e23 new notification service. first draft 2014-09-28 15:21:56 +02:00
iNPUTmice
1ae9338fc9 made muc passwords and prefereced encryption method persistant across restarts 2014-09-27 18:16:31 +02:00
Daniel Gultsch
4a9ed0e208 Merge pull request #504 from betheg/inflate 
add false argument to inflate.
 2014-09-27 16:52:36 +02:00
Michael
1d3a6125d2 add false argument to inflate. 2014-09-27 16:45:37 +02:00
iNPUTmice
0746d87506 fixed link 2014-09-27 14:32:35 +02:00
iNPUTmice
b9183bb317 added flattr button 2014-09-27 14:31:16 +02:00
iNPUTmice
cf66e091b5 Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-27 11:47:10 +02:00
iNPUTmice
2415781ebf fixed some lint warnings. thanks @betheg 2014-09-27 11:46:56 +02:00
Daniel Gultsch
d51deb12dd Merge pull request #485 from kruks23/translation5 
Update Spanish Translations
 2014-09-27 11:38:55 +02:00
Daniel Gultsch
99c79580cd Merge pull request #487 from weiss/add-german-translations 
Add missing German translations
 2014-09-27 11:38:48 +02:00
Daniel Gultsch
37ab39b389 Merge pull request #498 from betheg/locale_folder 
fix lint-warning: Wrong locale name
 2014-09-27 11:38:08 +02:00
Daniel Gultsch
f2b8ce8cae Merge pull request #499 from betheg/hardcoded_string 
fix lint-warning: Hardcoded text
 2014-09-27 11:37:55 +02:00
iNPUTmice
8fb0fb0c0d anwser to xmpp: style uris. fixed open conversations from android address book 2014-09-27 11:37:02 +02:00
iNPUTmice
6e77343407 revised send button in landscape mode 2014-09-27 10:51:46 +02:00
Michael
1d42385e0e fix lint-warning: Hardcoded text 2014-09-26 21:21:58 +02:00
Michael
9fef0d1a99 fix lint-warning: Wrong locale name 
The Hebrew ("he") language code is rewritten as "iw"
 2014-09-26 21:06:36 +02:00
Holger Weiß
642a70765c Add missing German translations 2014-09-24 22:52:02 +02:00
iNPUTmice
92197a4796 added Aizaz AZ as translator to readme 2014-09-24 15:00:12 +02:00
kruks23
4435a790ef Update Spanish Translations 2014-09-24 11:14:47 +02:00
iNPUTmice
08949fb827 version bump to 0.7.2 2014-09-23 22:51:32 +02:00
iNPUTmice
54278febb4 changed method that determins whether or not sm is available 2014-09-23 15:36:20 +02:00
iNPUTmice
248a1693ea refactored options menu handling a bit 2014-09-23 15:06:49 +02:00
iNPUTmice
a399c0c3df changed app title in cs translation 2014-09-23 11:49:42 +02:00
iNPUTmice
b14f693c2e dont mark message as send on resend 2014-09-23 11:49:17 +02:00
iNPUTmice
12c2fde61b fixed rare npe 2014-09-23 11:48:48 +02:00
iNPUTmice
59009ded82 fixed very rare npe 2014-09-22 16:04:37 +02:00
iNPUTmice
013ba16421 formating fixes for chinese 2014-09-22 16:04:26 +02:00
iNPUTmice
42df5c82dc Merge branch 'development' of github.com:siacs/Conversations into development 2014-09-22 13:23:48 +02:00
iNPUTmice
45aede14bd fixed #452 2014-09-22 13:23:35 +02:00
Daniel Gultsch
4d3201696a Merge pull request #479 from AizazAZ/master 
Added Chinese (Simplified) Translation
 2014-09-22 11:01:55 +02:00
iNPUTmice
bb065020ff don't show time stamp within the last 6 hours of a new day 2014-09-22 11:00:46 +02:00
iNPUTmice
c2bc15f5ba added 'model' to selectable resources. fixed #461 2014-09-22 11:00:13 +02:00
AZ
2c5c499e95 Added Chinese (Simplified) Translation 2014-09-22 09:59:12 +08:00
iNPUTmice
1f91ed11fa show full date in message list, fixed #328 2014-09-21 23:16:23 +02:00
iNPUTmice
98a8fd4d05 changed message merger a bit 2014-09-21 22:58:19 +02:00
iNPUTmice
49adf4f69a changed some preference descriptions 2014-09-21 00:45:33 +02:00