aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into developmentDaniel Gultsch2015-08-192-1/+7
|\
| * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-163-34/+35
|\|
| * increased version codeDaniel Gultsch2015-08-161-1/+1
| * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
* | version bump to 1.7.0-alpha to start new development cycleDaniel Gultsch2015-08-151-2/+2
* | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
|\ \ | |/ |/|
| * fully depend on smDaniel Gultsch2015-08-157-86/+76
* | version bump to 1.6.0Daniel Gultsch2015-08-151-2/+2
* | Merge branch 'development'Daniel Gultsch2015-08-153-0/+48
|\ \
| * | Update license string with librariesAndreas Straub2015-08-151-0/+4
| * | Display error message if all contact keys purgedAndreas Straub2015-08-153-0/+44
| |/
* | Merge branch 'development'Daniel Gultsch2015-08-15201-1239/+6933
|\|
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| * Merge pull request #1329 from hlad/server_info_http_uploadDaniel Gultsch2015-08-153-0/+28
| |\
| | * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| |/
| * version bump to 1.6.0-beta.2Daniel Gultsch2015-08-111-2/+2
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-105-25/+32
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-103-3/+10
| * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-102-38/+61
| * Merge pull request #1324 from fiaxh/omemo_logoDaniel Gultsch2015-08-092-0/+274
| |\
| | * OMEMO logofiaxh2015-08-092-0/+274
| |/
| * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| * decreased right hand side padding in contact keysDaniel Gultsch2015-08-081-1/+3
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-088-26/+25
| * removed dead codeDaniel Gultsch2015-08-081-10/+0
| * don't request ack for iq stanzas before stream managment is initializedDaniel Gultsch2015-08-081-2/+2
| * Increase number of published prekeys for releaseAndreas Straub2015-08-071-1/+1
| * request server-ACKs for iq stanzasDaniel Gultsch2015-08-061-33/+37
| * fail old/invalid iq stanzas on bindDaniel Gultsch2015-08-061-0/+13
| * hide multi-end and otr encryption in conferencesDaniel Gultsch2015-08-061-2/+3
| * Improve TrustKeysActivity slider responsivenessAndreas Straub2015-08-051-11/+11
| * added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-053-0/+4
| * changed text selection colorDaniel Gultsch2015-08-053-0/+3
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-039-33/+112
| * sync translations with transifexDaniel Gultsch2015-08-0324-71/+14
| * version bump for ShortcutBadgerDaniel Gultsch2015-08-031-1/+1
| * added changelog for version 1.6Daniel Gultsch2015-08-011-0/+6
| * version bump to 1.6.0-betaDaniel Gultsch2015-08-011-2/+2
| * lets try jpeg for a whileDaniel Gultsch2015-08-011-1/+1
| * temporarily renamed new encryption method to 'Multi-End' until a better name ...Daniel Gultsch2015-08-011-10/+10
| * use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-012-2/+8
| * fixed calculated file size in http slot requestDaniel Gultsch2015-08-011-15/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:13:03 +0000