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

1678 Commits

Author SHA1 Message Date
iNPUTmice 664c9c434f avoiding resource conflicts 2014-09-03 14:57:40 +02:00
iNPUTmice f1494f83ff fixed pgp signature creation 2014-09-03 13:06:06 +02:00
iNPUTmice 5ae62f18b4 fixed pgp signature creation 2014-09-03 13:05:22 +02:00
iNPUTmice 1a09a4706b added ability to disable notifications for specific conversations - fixed #322 2014-09-03 12:36:54 +02:00
iNPUTmice 1f378bffc8 made emoticon parsing enableable - default false 2014-09-03 09:15:07 +02:00
iNPUTmice c1453db5df Merge branch 'betheg-unused_resources' into development 2014-09-02 16:51:05 +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
Dominik Schürmann 9dd15131e1 Update README 2014-09-02 16:12:35 +02:00
Dominik Schürmann bba03f2f2f Update README 2014-09-02 16:11:46 +02:00
Dominik Schürmann 3bcf7266c3 Update README 2014-09-02 16:11:07 +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
iNPUTmice 567827ffca fixed #406 2014-09-02 11:31:56 +02:00
iNPUTmice c62937016b rotate avatars 
Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java
 2014-09-02 11:31:39 +02:00
iNPUTmice 2c9b2e6bf8 fixed #406 2014-09-02 11:27:43 +02:00
iNPUTmice f888b167c6 rotate avatars 2014-09-02 11:19:05 +02:00
Daniel Gultsch 6045bcc2eb Merge pull request #408 from emdete/unicode_emoticons 
add all whitespaces in regex
 2014-09-02 10:39:13 +02:00
M. Dietrich a7b3aa343e add all whitespaces in regex 2014-09-02 01:18:25 +02:00
Daniel Gultsch 6291ebf1a3 Merge pull request #380 from emdete/unicode_emoticons 
add translation from ascii to unicode emoticons
 2014-09-01 23:58:00 +02:00
M. Dietrich 546082147a transform ascii to emoticons (on display only) 2014-09-01 23:48:42 +02:00
Michael 8f0882eb1c removed unused string resources. 2014-09-01 19:49:47 +02:00
iNPUTmice d42ea45b1c fixed #403 2014-09-01 14:03:21 +02:00
iNPUTmice a7881754f5 fixed #403 2014-09-01 13:51:49 +02:00
Daniel Gultsch 0ffdb03aa3 Merge pull request #402 from emdete/remove_poormans_tostring 
optimize string operations a bit
 2014-09-01 10:58:26 +02:00
M. Dietrich 2acf510ea9 optimize string operations a bit 2014-09-01 10:40:45 +02:00
Dominik Schürmann 8b36d28668 Changelog 2014-08-31 23:49:34 +02:00
Dominik Schürmann 575b9d2279 Add userIds to OpenPgpSignatureResult 2014-08-31 23:48:21 +02:00
Dominik Schürmann eda2470c4d Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib 2014-08-31 23:39:59 +02:00
Dominik Schürmann e0be0f648a Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN 2014-08-31 23:39:56 +02:00
iNPUTmice 271b0f9c58 updated readme 2014-08-31 22:37:34 +02:00
Gayaz Yusipov 5b24534ab6 Contact presenceName property 2014-08-31 23:14:05 +04:00
iNPUTmice 3558fa5f5b deleted unnecessary log 2014-08-31 21:02:14 +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
iNPUTmice 94389ac22a show merged time and status in message adapter 2014-08-31 18:55:15 +02:00
iNPUTmice bda7724e31 improvements for merge conditions 2014-08-31 18:21:46 +02:00
iNPUTmice 28fa48704d add missing blank before nick 2014-08-31 17:48:00 +02:00
Daniel Gultsch 4793081c2c Merge pull request #400 from xsrc/development 
Smarter nickname highlight insert in confernces
 2014-08-31 17:40:29 +02:00
Bahtiar `kalkin-` Gadimov 3e3451bcff Smarter nickname highlight insert in confernces 2014-08-31 17:24:52 +02:00
iNPUTmice 1ac5be4855 some code cleanup 2014-08-31 16:28:21 +02:00
Daniel Gultsch 8d456085e5 Merge pull request #391 from betheg/fix_typo 
fix forgotten spelling.
 2014-08-31 15:56:41 +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 1cc16161ef require encrypted to be the same for messages to get merged 2014-08-31 15:54:53 +02:00
iNPUTmice 8f8d4e320d experimental message merging 2014-08-31 14:29:12 +02:00
Dominik Schürmann fb3c754ea8 Merge pull request #1 from Flowdalic/flow 
Add my Real-name to the Copyright statement
 2014-08-30 18:56:17 +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
Florian Schmaus d15482c22a Add my Real-name to the Copyright statement 
of ParcelFileDescriptorUtil.
 2014-08-30 15:19:43 +02:00
Michael 969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-30 14:00:53 +02:00
Gayaz Yusipov ec6220969d XEP-0172 2014-08-30 14:26:46 +04:00
iNPUTmice 9eafb10086 version bump to 0.7-alpha 2014-08-30 09:26:01 +02:00