aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | basic arbitrary file transferiNPUTmice2014-11-1513-136/+332
| | |
* | | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-159-9/+50
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * | | added low priority and removed date in foreground noticficationiNPUTmice2014-11-151-0/+2
| | | |
| * | | turn on foreground service in expert settingsiNPUTmice2014-11-159-9/+48
| |/ /
* | | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-1510-182/+655
|\ \ \ | |/ / |/| |
| * | check if account is online before doing smpfeature/otr_verificationiNPUTmice2014-11-121-11/+24
| | |
| * | Merge branch 'feature/otr_verification' of ↵iNPUTmice2014-11-111-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| | * | small bug fixiNPUTmice2014-11-101-8/+3
| | | |
| | * | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-105-113/+158
| | | |
| | * | initial smp supportiNPUTmice2014-11-1010-122/+552
| | | |
| * | | use auto register for verify otr listenersiNPUTmice2014-11-111-9/+0
| | | |
| * | | small bug fixiNPUTmice2014-11-111-8/+3
| | | |
| * | | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-115-113/+158
| | | |
| * | | initial smp supportiNPUTmice2014-11-1110-122/+552
| | | |
* | | | Merge pull request #665 from SamWhited/issue71Daniel Gultsch2014-11-158-381/+729
|\ \ \ \ | | | | | | | | | | Add SCRAM-SHA1 support
| * | | | Improve auth error handling and state machineSam Whited2014-11-155-40/+43
| | | | |
| * | | | Add SCRAM-SHA1 supportSam Whited2014-11-149-381/+726
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* | | | | Merge pull request #666 from SamWhited/localefixesDaniel Gultsch2014-11-152-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Spelling fixes
| * | | | | Spelling fixes in Italian translationSam Whited2014-11-141-2/+2
| | | | | |
| * | | | | Spelling fix in German translationSam Whited2014-11-141-1/+1
| |/ / / /
* / / / / Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/ / / /
* | | | Added check for empty from on group chat packetKevin Rauwolf2014-11-141-0/+3
| | | |
* | | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-141-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | development
| * \ \ \ Merge pull request #653 from kriztan/patch-2Daniel Gultsch2014-11-141-5/+10
| |\ \ \ \ | | | | | | | | | | | | Update German language
| | * | | | Update German languagekriztan2014-11-121-24/+0
| | | | | | | | | | | | | | | | | | deleted 'pref_about_message'
| | * | | | Update German languagekriztan2014-11-121-5/+34
| | |/ / /
* | / / / fixed possible npe when loading null counterpart into messageiNPUTmice2014-11-141-1/+6
|/ / / /
* | | | made presences synchronizediNPUTmice2014-11-131-13/+27
| | | |
* | | | more npe checks in muc packet parseriNPUTmice2014-11-131-31/+34
| | | |
* | | | Merge pull request #656 from SamWhited/authrefactorDaniel Gultsch2014-11-125-88/+145
|\ \ \ \ | | | | | | | | | | Refactor authentication code
| * | | | Refactor authentication codeSam Whited2014-11-125-88/+145
| |/ / /
* / / / Make sure we're storing the display JID as UnicodeSam Whited2014-11-121-2/+3
|/ / /
* | | auto register/unregister listenersiNPUTmice2014-11-117-345/+289
| | |
* | | temporarliy got rid of some insane work arounds in favor of some maybe less ↵iNPUTmice2014-11-113-14/+17
|/ / | | | | | | insane work arounds
* | made Jid class parse otr session idsiNPUTmice2014-11-101-0/+10
| |
* | more refactoring for presence selection. removed getTo, getFrom and getJid ↵iNPUTmice2014-11-108-274/+283
| | | | | | | | from Element
* | formatingiNPUTmice2014-11-092-24/+9
| |
* | Merge pull request #645 from betheg/about_all_libsDaniel Gultsch2014-11-091-15/+24
|\ \ | | | | | | add all used libs to the pref_about_message
| * | add libidn to pref_about_message.Michael2014-11-091-0/+1
| | |
| * | add all used libs to the pref_about_message.Michael2014-11-091-15/+23
| | | | | | | | | | | | also improve the notice a bit.
* | | fixed private messagesiNPUTmice2014-11-091-2/+2
| | |
* | | s/getResourcepart().isEmpty()/isBareJid()/Sam Whited2014-11-095-7/+7
| | |
* | | use isBareJid instead of getResourcePart().isEmpty()iNPUTmice2014-11-092-2/+2
| | |
* | | fixed muc sender history for some cases (where the previous nick was a valid ↵iNPUTmice2014-11-092-8/+17
| | | | | | | | | | | | jid)
* | | migrated some otr stuff to new jid classesiNPUTmice2014-11-092-79/+82
| | |
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-0927-106/+102
|\ \ \ | | | | | | | | | | | | development
| * \ \ Merge pull request #642 from SamWhited/accountgetjidDaniel Gultsch2014-11-0927-106/+102
| |\ \ \ | | | | | | | | | | Rework `Account.getJid()' to return full JIDs
| | * | | Rework `Account.getJid()' to return full JIDsSam Whited2014-11-0927-106/+102
| | | | | | | | | | | | | | | | | | | | Remove `Account.getFullJid()'
* | | | | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
| | | |