Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | add share location | Christian S | 2016-05-05 | 1 | -0/+28 | |
| | | ||||||
* | | add audio recorder | Christian S | 2016-05-05 | 1 | -0/+11 | |
| | | ||||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-30 | 1 | -0/+6 | |
|\| | ||||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 1 | -0/+6 | |
| | | ||||||
* | | Merge branch 'refs/heads/siacs/master' into welcome-screen | Christian S | 2016-04-21 | 1 | -2/+12 | |
|\| | ||||||
| * | added magic create welcome screen | Daniel Gultsch | 2016-04-19 | 1 | -3/+13 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 1 | -0/+1 | |
|\| | ||||||
| * | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 1 | -0/+1 | |
| | | ||||||
| * | implement direct sharing in android 6.0. fixes #1321 | Daniel Gultsch | 2015-12-07 | 1 | -0/+9 | |
| | | ||||||
| * | users are now able to crop their avatar pictures using the android-crop | Philip Flohr | 2015-12-02 | 1 | -1/+1 | |
| | | | | | | | | library | |||||
* | | implement direct sharing in android 6.0. fixes #1321 | Daniel Gultsch | 2015-12-11 | 1 | -1/+10 | |
| | | ||||||
* | | copy commits | Christian S | 2015-11-29 | 1 | -5/+0 | |
|\| | ||||||
| * | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 1 | -5/+0 | |
| | | ||||||
* | | copy Avatar Crop patch | Christian S | 2015-11-07 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | users are now able to crop their avatar pictures | Philip Flohr | 2015-11-06 | 1 | -1/+1 | |
| |/ | ||||||
* | | Version bump | Christian S | 2015-10-31 | 1 | -1/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -0/+4 | |
|\| | ||||||
| * | Handle some orientation changes manually | saqura | 2015-10-25 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently most activities get destroyed/recreated when rotating the device. This commit prevents this from happening where it is not necessary. The most obvious improvements are: * The options menu in the EditAccountActivity does not disappear when rotating the device. * CSI inactive/active states are no longer sent on every rotate. | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-20 | 1 | -50/+53 | |
|\| | ||||||
| * | open manage account + certificate chooser when cbe mode is enabled | Daniel Gultsch | 2015-10-20 | 1 | -60/+65 | |
| | | ||||||
* | | updated AppUpdater a bit | Christian S | 2015-10-10 | 1 | -1/+2 | |
| | | ||||||
* | | copy commits | Christian S | 2015-10-10 | 1 | -0/+1 | |
|\| | ||||||
| * | introduced expert options to set status to away and xa if screen is off or ↵ | Daniel Gultsch | 2015-10-08 | 1 | -0/+1 | |
| | | | | | | | | if phone is silenced | |||||
* | | updated startup intent again | Christian S. | 2015-10-06 | 1 | -1/+1 | |
| | | ||||||
* | | updated startup intent | Christian S. | 2015-10-06 | 1 | -0/+2 | |
| | | ||||||
* | | added intent to start app after update automatically | Christian S. | 2015-10-06 | 1 | -0/+3 | |
| | | ||||||
* | | changed theme of appupdater | Christian S | 2015-09-27 | 1 | -1/+1 | |
| | | ||||||
* | | updated to version 1.6.12 beta and changelog | Christian S | 2015-09-26 | 1 | -6/+2 | |
| | | ||||||
* | | copy commits | Christian S | 2015-09-26 | 1 | -5/+1 | |
|\| | ||||||
| * | Export logs to SD card preference | fiaxh | 2015-09-21 | 1 | -0/+1 | |
| | | ||||||
* | | modified AppUpdater | Christian S | 2015-09-20 | 1 | -1/+2 | |
| | | ||||||
* | | show the update dialog and not the whole activity | Christian S | 2015-09-20 | 1 | -1/+1 | |
| | | ||||||
* | | version 1.6.9 beta | Christian S | 2015-09-06 | 1 | -13/+28 | |
|/ | | | | * in app updater | |||||
* | single task mode for start conversations activity | Daniel Gultsch | 2015-08-30 | 1 | -0/+1 | |
| | ||||||
* | remove the READ_PHONE_STATE permission. | Michael | 2015-08-23 | 1 | -0/+2 | |
| | ||||||
* | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 1 | -1/+1 | |
| | ||||||
* | Ask for key trust when sending messages | Andreas Straub | 2015-07-19 | 1 | -0/+4 | |
| | | | | | | If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED. | |||||
* | allow sharing multiple images at once. fixes #1090 | iNPUTmice | 2015-04-11 | 1 | -0/+7 | |
| | ||||||
* | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 1 | -2/+2 | |
| | ||||||
* | migrated change password into separate activity | Daniel Gultsch | 2015-01-03 | 1 | -0/+3 | |
| | ||||||
* | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 | |||||
* | Allow sending of any filetype via intent | Sam Whited | 2014-12-15 | 1 | -1/+1 | |
| | | | | Fixes #756 | |||||
* | initial smp support | iNPUTmice | 2014-11-11 | 1 | -0/+4 | |
| | ||||||
* | use proper theme for MTM | iNPUTmice | 2014-11-09 | 1 | -4/+8 | |
| | ||||||
* | Convert about dialog to activity | Sam Whited | 2014-11-04 | 1 | -23/+33 | |
| | ||||||
* | fixed merge error | iNPUTmice | 2014-11-03 | 1 | -1/+0 | |
| | ||||||
* | Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc | iNPUTmice | 2014-11-03 | 1 | -0/+1 | |
|\ | | | | | | | | | Conflicts: src/main/AndroidManifest.xml | |||||
| * | basic beam code / untested | iNPUTmice | 2014-11-03 | 1 | -22/+20 | |
| | | ||||||
* | | use different filter for nfc intents | iNPUTmice | 2014-11-03 | 1 | -1/+1 | |
| | | ||||||
* | | basic beam code / untested | iNPUTmice | 2014-11-03 | 1 | -22/+20 | |
|/ |