aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* also hide encryption options in MUCsChristian S2015-08-081-0/+1
* add config option to hide all encryption modesChristian S2015-08-082-0/+2
* modified avatar sizesChristian S2015-08-083-493/+474
* modified image preview size and avatar sizeChristian S2015-08-081-4/+4
* added one more well-known file typeChristian S2015-08-081-0/+1
* modified settingsChristian S2015-08-081-2/+2
* copy commitsChristian S2015-08-0818-544/+675
|\
| * 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
* | Merge pull request #18 from siacs/developmentChristian S.2015-08-0324-71/+14
|\|
| * sync translations with transifexDaniel Gultsch2015-08-0324-71/+14
* | copy commitsChristian S2015-08-0253-1373/+1722
|\|
| * 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
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-019-116/+138
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-0110-138/+223
| * Provide process function for key transport messageAndreas Straub2015-07-314-19/+84
| * Refactor axolotl message processing workflowAndreas Straub2015-07-317-157/+121
| * Reformat codeAndreas Straub2015-07-313-86/+87
| * Change to new wire protocol versionAndreas Straub2015-07-315-73/+112
| * added missing carbon column message table create statementDaniel Gultsch2015-07-311-0/+1
| * improved 'next encryption' selectionDaniel Gultsch2015-07-316-73/+69
| * removed expert setting to 'force encryption'. merged certifcate and encryptio...Daniel Gultsch2015-07-312-83/+75
| * Fix session logic: enforce same type of encryptionAndreas Straub2015-07-302-25/+34
| * fixed some colors in message adapterDaniel Gultsch2015-07-305-28/+33
| * use gcm for file encryption over httpDaniel Gultsch2015-07-296-104/+127
| * Reset lock color for non-axolotl messagesAndreas Straub2015-07-291-0/+2
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-297-13/+34
| * Rerender message bubbles on encryption changeAndreas Straub2015-07-291-0/+1
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-294-7/+32
| * Fix NPE: consider unknown keys UNDECIDEDAndreas Straub2015-07-291-1/+2
| * Color plaintext messages in encrypted sessions redAndreas Straub2015-07-291-0/+30
| * Improve trust toggle responsivenessAndreas Straub2015-07-291-6/+1
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-2910-709/+760
| * add new received message bubble drawableDaniel Gultsch2015-07-2915-0/+0
| * show http downloaded images in notificationDaniel Gultsch2015-07-291-2/+3
| * removed recursion in message.getMerged*()Daniel Gultsch2015-07-281-13/+19
| * changed logging. (work around logcat null pointerDaniel Gultsch2015-07-282-2/+1
| * log reason for message failureDaniel Gultsch2015-07-281-0/+7
| * set time on resend to current timeDaniel Gultsch2015-07-281-1/+2
| * rewrote dns fallbackDaniel Gultsch2015-07-242-9/+9