Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-11 | 2 | -7/+5 | |
| |\| | | | ||||||
| | * | | | Merge pull request #1482 from SafwatHalaby/readme | Daniel Gultsch | 2015-10-10 | 1 | -5/+3 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Added OMEMO to Readme | Safwat Halaby | 2015-10-10 | 1 | -5/+3 | |
| | |/ / | ||||||
| | * | | Merge pull request #1480 from SafwatHalaby/patch-1 | Andreas Straub | 2015-10-10 | 1 | -1/+1 | |
| | |\ \ | ||||||
| | | * | | Update build system in README | Safwat Halaby | 2015-10-10 | 1 | -1/+1 | |
| | |/ / | ||||||
| | * | | Merge pull request #1478 from SafwatHalaby/patch-1 | Daniel Gultsch | 2015-10-10 | 1 | -1/+1 | |
| | |\ \ | ||||||
| | | * | | Fixed a typo in string.xml | Safwat Halaby | 2015-10-10 | 1 | -1/+1 | |
| | |/ / | ||||||
| * / / | prevent null pointer when trying to display device fingerprints of not existi... | Daniel Gultsch | 2015-10-11 | 1 | -0/+3 | |
| |/ / | ||||||
| * | | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 8 | -44/+156 | |
* | | | make success false as standard | Christian S. | 2015-10-14 | 1 | -1/+1 | |
* | | | check if update server answers successfully... | Christian S. | 2015-10-14 | 1 | -1/+7 | |
* | | | changelog | Christian S | 2015-10-13 | 1 | -0/+1 | |
* | | | changed update url | Christian S | 2015-10-13 | 1 | -1/+1 | |
* | | | updated german strings | Christian S | 2015-10-10 | 1 | -2/+2 | |
* | | | updated changelog | Christian S | 2015-10-10 | 1 | -3/+5 | |
* | | | version 1.6.13 beta | Christian S | 2015-10-10 | 1 | -1/+1 | |
* | | | show encryption in ui | Christian S | 2015-10-10 | 1 | -2/+2 | |
* | | | update missing strings | Christian S | 2015-10-10 | 2 | -0/+10 | |
* | | | updated AppUpdater a bit | Christian S | 2015-10-10 | 5 | -73/+52 | |
* | | | copy commits | Christian S | 2015-10-10 | 9 | -34/+136 | |
|\| | | ||||||
| * | | do not dismiss editAccountActivity when still trying to register new account | Daniel Gultsch | 2015-10-09 | 1 | -1/+3 | |
| * | | catch exception when unregistering receivers that have not been registered be... | Daniel Gultsch | 2015-10-08 | 1 | -3/+11 | |
| * | | removed oob element from file messages | Daniel Gultsch | 2015-10-08 | 1 | -1/+0 | |
| * | | introduced expert options to set status to away and xa if screen is off or if... | Daniel Gultsch | 2015-10-08 | 7 | -28/+122 | |
* | | | changed log outputs of updater and delete old... | Christian S | 2015-10-10 | 2 | -17/+29 | |
* | | | startet development of version 1.6.13 | Christian S | 2015-10-07 | 2 | -2/+7 | |
* | | | Merge branch 'Update_Startup' into development | Christian S | 2015-10-07 | 5 | -4/+23 | |
|\ \ \ | ||||||
| * \ \ | Merge remote-tracking branch 'origin/Update_Startup' into Update_Startup | Christian S | 2015-10-07 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * | | | Added more info to alertbox | Christian S | 2015-10-07 | 4 | -4/+18 | |
| | * | | | added intent to start app after update automatically | Christian S | 2015-10-07 | 1 | -0/+5 | |
| * | | | | update Updater | Christian S | 2015-10-06 | 2 | -2/+12 | |
| * | | | | Update strings.xml | Christian S. | 2015-10-06 | 1 | -1/+1 | |
| * | | | | Update strings.xml | Christian S. | 2015-10-06 | 1 | -1/+1 | |
| * | | | | added changelog to JSON object in updater | Christian S. | 2015-10-06 | 1 | -1/+2 | |
| * | | | | Added more info to alertbox | Christian S. | 2015-10-06 | 1 | -1/+3 | |
| * | | | | updated strings for updater | Christian S. | 2015-10-06 | 1 | -0/+1 | |
| * | | | | updated German strings for updater | Christian S. | 2015-10-06 | 1 | -1/+1 | |
| * | | | | 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 | |
| |/ / / | ||||||
* | | | | Merge branch 'siacs/master' into development | Christian S | 2015-10-07 | 16 | -297/+435 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | add xhtml image tag to unencrypted image urls. add oob tag to all files that ... | Daniel Gultsch | 2015-10-07 | 1 | -2/+18 | |
| * | | do mam query after join | Daniel Gultsch | 2015-10-06 | 1 | -1/+3 | |
| * | | Use MAM for MUC initial history retrieval | saqura | 2015-10-06 | 2 | -28/+66 | |
| * | | Properly check for MUC MAM support | saqura | 2015-10-06 | 1 | -6/+8 | |
| * | | Show whether MAM is supported in MUCs | saqura | 2015-10-06 | 3 | -2/+47 | |
| * | | changed store path for files | Daniel Gultsch | 2015-10-06 | 1 | -20/+10 | |
| * | | clean up log exporting service. properly end service after exporting | Daniel Gultsch | 2015-10-06 | 1 | -102/+106 | |
| * | | clear notification and activate grace period when receiving chat marker from ... | Daniel Gultsch | 2015-10-06 | 1 | -1/+5 | |
| * | | pulled translations from transifex | Daniel Gultsch | 2015-10-05 | 6 | -132/+153 |