moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-14 19:42:17 -05:00
Code Issues Releases Wiki Activity
2,306 Commits 5 Branches 73 Tags 39 MiB
51aeeb766c
Commit Graph

2306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iNPUTmice
ddb76b0e73 fixed rare npe 2014-10-05 14:05:46 +02:00
Daniel Gultsch
f7f7a73ce7 Merge pull request #524 from betheg/muc_errors_conditions 
MUC: differentiated a few more errors.
 2014-10-05 13:18:28 +02:00
Daniel Gultsch
bf893bee08 Merge pull request #523 from betheg/leaked_window 
fixed an 'activity has leaked window'
 2014-10-05 13:18:18 +02:00
Michael
54e9235bfc MUC: differentiated a few more errors. 2014-10-05 12:31:49 +02:00
iNPUTmice
4a260baa12 fixed #510 2014-10-05 12:05:27 +02:00
iNPUTmice
26ce62f365 end otr session instead of only resetting 2014-10-05 11:14:50 +02:00
iNPUTmice
45bd0449fb sending initial ping before going online after login/resume to ensure that all presences and messages have been loaded 2014-10-05 10:46:31 +02:00
Michael
5250ef536f fixed an 'activity has leaked window' 2014-10-04 18:32:05 +02:00
iNPUTmice
5371dd025a no dns retry after nosrv error 2014-10-04 14:33:14 +02:00
iNPUTmice
d5e62ffe89 added missing status messages after message scroll 2014-10-04 14:32:51 +02:00
iNPUTmice
79315bdd61 reset pending subscription request 2014-10-04 14:32:11 +02:00
iNPUTmice
0929621b57 minor ui tweak 2014-10-04 14:31:44 +02:00
iNPUTmice
18409946c6 implemented ping (xep-0199) fixed #517 2014-10-03 19:24:10 +02:00
iNPUTmice
131f2aad76 minor graphic tweaks in copy otr fingerprint to clipboard 2014-10-03 16:33:45 +02:00
Michael
9a4b48d1ec let's own otr-fingerprint copy to clipboard. 2014-10-03 16:20:39 +02:00
iNPUTmice
d51b41590c fixed chinese translations 2014-10-03 16:16:51 +02:00
iNPUTmice
0e12272c5b bug fixes 2014-10-03 15:01:36 +02:00
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
Sam Whited
503d9e7a1e Remove full stop in description for consistency 2014-09-29 13:03:53 -04:00
Sam Whited
15e30e50aa Fix typos in string resource 2014-09-29 12:49:26 -04: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
ae3ff5757d Merge pull request #495 from svetlemodry/master 
added missing Czech strings
 2014-09-27 11:38:34 +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