Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | copy commits | Christian S | 2015-07-20 | 155 | -544/+4973 |
|\ | |||||
| * | Start TrustKeysActivity if no keys are TRUSTED | Andreas Straub | 2015-07-20 | 3 | -10/+21 |
| * | Do not display clear devices button if not online | Andreas Straub | 2015-07-20 | 1 | -0/+1 |
| * | Add purge axolotl key option | Andreas Straub | 2015-07-20 | 6 | -38/+99 |
| * | Fix getNumTrustedKeys | Andreas Straub | 2015-07-20 | 1 | -2/+4 |
| * | pulled new translations from transifex | Daniel Gultsch | 2015-07-20 | 2 | -1/+6 |
| * | attempt to fix the delay problem | Daniel Gultsch | 2015-07-20 | 5 | -53/+39 |
| * | changed sizes of avatars and padding in new message bubbles | Daniel Gultsch | 2015-07-20 | 15 | -30/+29 |
| * | changed message bubble appearance | Raphael Pohl | 2015-07-20 | 29 | -97/+521 |
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhere | Daniel Gultsch | 2015-07-20 | 14 | -76/+66 |
| * | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2015-07-20 | 1 | -1/+0 |
| |\ | |||||
| | * | Remove duplicate dependency | Andreas Straub | 2015-07-20 | 1 | -1/+0 |
| * | | fixed monospace font and android L | Daniel Gultsch | 2015-07-20 | 5 | -6/+13 |
| |/ | |||||
| * | Merge branch 'CryptoNextBeta' into development | Andreas Straub | 2015-07-20 | 82 | -308/+3315 |
| |\ | |||||
| | * | Lock TrustKeys if no trusted keys are available | Andreas Straub | 2015-07-20 | 3 | -4/+48 |
| | * | Optimize imports | Andreas Straub | 2015-07-20 | 47 | -195/+167 |
| | * | Use MD style for key trust toggle switch | Andreas Straub | 2015-07-20 | 2 | -7/+1 |
| | * | Fix set/remove OnUpdateBlocklistListener | Andreas Straub | 2015-07-20 | 1 | -5/+5 |
| | * | Fix axolotl database migration | Andreas Straub | 2015-07-20 | 1 | -2/+5 |
| | * | Remove device list from EditAccount | Andreas Straub | 2015-07-19 | 2 | -65/+0 |
| | * | Add clear devices to overflow menu in EditAccount | Andreas Straub | 2015-07-19 | 3 | -3/+17 |
| | * | Ask for key trust when sending messages | Andreas Straub | 2015-07-19 | 11 | -57/+580 |
| | * | Encrypt files for HTTP upload in encrypted chats | Andreas Straub | 2015-07-19 | 2 | -3/+7 |
| | * | Refactor trust key ui and show in account details | Andreas Straub | 2015-07-19 | 8 | -58/+154 |
| | * | Send correct body for HTTP files | Andreas Straub | 2015-07-19 | 1 | -1/+7 |
| | * | Handle file transmission properly in axolotl | Andreas Straub | 2015-07-19 | 1 | -4/+12 |
| | * | Remove unneccessary code | Andreas Straub | 2015-07-19 | 1 | -2/+1 |
| | * | Fix trust status for outgoing messages | Andreas Straub | 2015-07-19 | 5 | -28/+43 |
| | * | Don't merge messages with different trust statuses | Andreas Straub | 2015-07-19 | 1 | -1/+7 |
| | * | Fix copying of axolotl keys to clipboard | Sam Whited | 2015-07-19 | 1 | -1/+1 |
| | * | Add refresh icon to v21 theme | Sam Whited | 2015-07-19 | 7 | -1/+1 |
| | * | Disable Axolotl option if not usable | Andreas Straub | 2015-07-19 | 2 | -33/+10 |
| | * | Show trust status of messages' originating session | Andreas Straub | 2015-07-19 | 2 | -0/+17 |
| | * | Add key trust toggle to ContactDetailsActivity | Andreas Straub | 2015-07-19 | 13 | -10/+52 |
| | * | Ensure that available sessions are always used | Andreas Straub | 2015-07-19 | 1 | -9/+30 |
| | * | Fix setIdentityKeyTrust update statement | Andreas Straub | 2015-07-19 | 1 | -2/+2 |
| | * | Fix IdentityKey storage model | Andreas Straub | 2015-07-19 | 1 | -2/+6 |
| | * | Fix and expand key regeneration function | Andreas Straub | 2015-07-19 | 1 | -9/+18 |
| | * | Display trust status in ContactDetailsActivity | Andreas Straub | 2015-07-19 | 2 | -3/+18 |
| | * | Overhauled Message tagging | Andreas Straub | 2015-07-19 | 5 | -88/+138 |
| | * | Postpone initAccountService until roster loaded | Andreas Straub | 2015-07-19 | 1 | -3/+1 |
| | * | Fix getSubDeviceSessions SQL query | Andreas Straub | 2015-07-19 | 1 | -1/+1 |
| | * | Display axolotl chat message hint | Andreas Straub | 2015-07-19 | 2 | -0/+4 |
| | * | Use full int range for device IDs | Andreas Straub | 2015-07-19 | 1 | -1/+1 |
| | * | Clean up unused constant | Andreas Straub | 2015-07-19 | 1 | -1/+0 |
| | * | Make some fields final | Andreas Straub | 2015-07-19 | 1 | -3/+3 |
| | * | Clean up logging | Andreas Straub | 2015-07-19 | 5 | -67/+75 |
| | * | Add basic PEP managemend UI to EditAccountActivity | Andreas Straub | 2015-07-19 | 5 | -4/+266 |
| | * | Fix devicelist update handling | Andreas Straub | 2015-07-19 | 2 | -0/+6 |
| | * | Refactor axolotl database recreation | Andreas Straub | 2015-07-19 | 1 | -8/+14 |