| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update spanish translations | kruks23 | 2014-11-19 | 1 | -4/+4 |
| | | |||||
| * | Update spanish translations | kruks23 | 2014-11-18 | 1 | -2/+8 |
| | | |||||
| * | put error notification into notification service | iNPUTmice | 2014-11-18 | 4 | -0/+0 |
| | | |||||
| * | show dynamic tags in contacts activity as well | iNPUTmice | 2014-11-18 | 1 | -12/+7 |
| | | |||||
| * | properly remove conversations context menu | iNPUTmice | 2014-11-18 | 2 | -11/+7 |
| | | |||||
| * | added rendered versions of new icons | iNPUTmice | 2014-11-18 | 8 | -0/+0 |
| | | |||||
| * | context menu for conversations. fixed #630 | iNPUTmice | 2014-11-18 | 2 | -0/+12 |
| | | |||||
| * | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 1 | -1/+4 |
| | | |||||
| * | synchronized around cache clear in avatar service | iNPUTmice | 2014-11-17 | 1 | -0/+4 |
| | | |||||
| * | Merge pull request #680 from ferdev1/patch-2 | Daniel Gultsch | 2014-11-17 | 1 | -2/+2 |
| |\ | | | | | Fix string 2 | ||||
| | * | Update strings.xml | ferdev1 | 2014-11-17 | 1 | -2/+2 |
| | | | |||||
| * | | slightly modified logo / launcher icon | iNPUTmice | 2014-11-17 | 8 | -0/+0 |
| |/ | |||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-17 | 1 | -1/+1 |
| |\ | | | | | | | development | ||||
| | * | Fix string | ferdev1 | 2014-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | highlight muc members by touching their name in muc details. fixed #503 | iNPUTmice | 2014-11-17 | 1 | -1/+1 |
| |/ | |||||
| * | happy hanukkah | iNPUTmice | 2014-11-16 | 5 | -1/+30 |
| | | |||||
| * | made scan and show qr code more accessible in VerifyOtrActivity | iNPUTmice | 2014-11-16 | 3 | -5/+28 |
| | | |||||
| * | Update Spanish Translations | kruks23 | 2014-11-15 | 1 | -3/+38 |
| | | |||||
| * | Add incompatible server status | Sam Whited | 2014-11-15 | 1 | -0/+1 |
| | | |||||
| * | Add security error status | Sam Whited | 2014-11-15 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 3 | -3/+17 |
| |\ | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| | * | handled more error cases | iNPUTmice | 2014-11-15 | 1 | -0/+1 |
| | | | |||||
| | * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
| | | | |||||
| | * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 2 | -1/+5 |
| | | | |||||
| | * | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
| | | | |||||
| | * | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 1 | -0/+1 |
| | | | |||||
| | * | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-15 | 1 | -1/+2 |
| | | | |||||
| | * | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 2 | -3/+6 |
| | | | |||||
| * | | Merge branch 'feature/foreground_service' into development | iNPUTmice | 2014-11-15 | 6 | -0/+9 |
| |\ \ | | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| | * | | turn on foreground service in expert settings | iNPUTmice | 2014-11-15 | 6 | -0/+9 |
| | |/ | |||||
| * | | Merge branch 'feature/otr_verification' into development | iNPUTmice | 2014-11-15 | 3 | -60/+206 |
| |\ \ | |/ |/| | |||||
| | * | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-11 | 2 | -0/+14 |
| | | | |||||
| | * | initial smp support | iNPUTmice | 2014-11-11 | 3 | -60/+192 |
| | | | |||||
| * | | Merge pull request #666 from SamWhited/localefixes | Daniel Gultsch | 2014-11-15 | 2 | -3/+3 |
| |\ \ | | | | | | | Spelling fixes | ||||
| | * | | Spelling fixes in Italian translation | Sam Whited | 2014-11-14 | 1 | -2/+2 |
| | | | | |||||
| | * | | Spelling fix in German translation | Sam Whited | 2014-11-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make licenses info untranslatable | Sam Whited | 2014-11-14 | 1 | -1/+1 |
| |/ / | |||||
| * | | Update German language | kriztan | 2014-11-12 | 1 | -24/+0 |
| | | | | | | | deleted 'pref_about_message' | ||||
| * | | Update German language | kriztan | 2014-11-12 | 1 | -5/+34 |
| |/ | |||||
| * | formating | iNPUTmice | 2014-11-09 | 2 | -24/+9 |
| | | |||||
| * | Merge pull request #645 from betheg/about_all_libs | Daniel Gultsch | 2014-11-09 | 1 | -15/+24 |
| |\ | | | | | add all used libs to the pref_about_message | ||||
| | * | add libidn to pref_about_message. | Michael | 2014-11-09 | 1 | -0/+1 |
| | | | |||||
| | * | add all used libs to the pref_about_message. | Michael | 2014-11-09 | 1 | -15/+23 |
| | | | | | | | | | also improve the notice a bit. | ||||
| * | | Update Spanish Translations | kruks23 | 2014-11-09 | 1 | -1/+21 |
| |/ | |||||
| * | reformated license a bit | iNPUTmice | 2014-11-04 | 2 | -22/+16 |
| | | |||||
| * | Shorten license text and fix height of scrollview | Sam Whited | 2014-11-04 | 2 | -20/+7 |
| | | |||||
| * | Use normal text size and color | Sam Whited | 2014-11-04 | 1 | -1/+4 |
| | | |||||
| * | Make links clickable in about text | Sam Whited | 2014-11-04 | 2 | -4/+7 |
| | | |||||
| * | Convert about dialog to activity | Sam Whited | 2014-11-04 | 5 | -18/+40 |
| | | |||||
| * | Use real copyright symbol © | Sam Whited | 2014-11-04 | 1 | -3/+3 |
| | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |