aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-111-123/+127
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-111-123/+290
|\
| * fixed some npesDaniel Gultsch2015-07-161-4/+11
| * made lock button reflect encryption status of the next messages instead of th...Daniel Gultsch2015-07-121-16/+10
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-1/+12
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-4/+7
| * added choose picture as another quick action. fixes #1221Daniel Gultsch2015-05-261-0/+3
| * fixed with attaching wrong files when returning to activity and background se...Daniel Gultsch2015-05-211-1/+1
| * added fall back package id for voice recorder pluginDaniel Gultsch2015-05-201-0/+1
| * handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-121-0/+6
| * don't reinit conversation when coming back to activity. avoids unnecessary sc...Daniel Gultsch2015-05-121-3/+1
| * clean up in attachment chooser code. fixed #1168Daniel Gultsch2015-05-041-51/+51
| * open market if share location plugin isn't installedDaniel Gultsch2015-05-041-0/+15
| * replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-021-6/+17
| * made material icons smaller (24dp)Daniel Gultsch2015-04-281-1/+1
| * revert undo timeout to a more reasonable valueDaniel Gultsch2015-04-281-1/+1
| * handle returning from camera without pictureDaniel Gultsch2015-04-271-0/+3
| * some code clean up to fix some rare NPE’sDaniel Gultsch2015-04-191-4/+4
| * increased undo delayiNPUTmice2015-04-171-1/+1
| * shut up linteriNPUTmice2015-04-131-0/+1
| * allow sharing multiple images at once. fixes #1090iNPUTmice2015-04-111-40/+69
| * Enable end-conversation by swipe gestureBrianBlade2015-04-081-9/+94
* | whatsapp-like smiley implementationlookshe2015-04-121-7/+8
* | differ between received and read messagelookshe2015-04-111-4/+0
|/
* display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-47/+91
* init mode (first start) for StartConversationActivity (no up button) and avoi...iNPUTmice2015-02-221-8/+26
* launch edit account activity when starting Conversations for the first time (...iNPUTmice2015-02-191-5/+9
* limit ui refresh rateiNPUTmice2015-02-171-33/+16
* refresh list view more ofteniNPUTmice2015-02-171-1/+1
* use time instead of uptime for unmuteiNPUTmice2015-02-121-3/+1
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2015-01-291-2/+7
|\
| * Use Material Design Icons on API 21+Sam Whited2015-01-291-2/+7
* | properly clear notifications. fixed #921iNPUTmice2015-01-291-2/+8
|/
* always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-21/+1
* Add block/unblock to contact details menuSam Whited2015-01-211-4/+0
* Add download button on notification if applicableSam Whited2015-01-161-6/+14
* sending read marker when resuming activity and conversation is openiNPUTmice2015-01-151-1/+4
* Add option to swap enter/emoticon keySam Whited2015-01-141-21/+24
* don't crash when selecting a conversation by uuid did not workDaniel Gultsch2015-01-101-16/+20
* fixed regression in tablet uiDaniel Gultsch2015-01-091-0/+2
* Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-091-0/+4
* more muc optionsDaniel Gultsch2015-01-071-9/+2
* reset next encryption when archiving conversationsDaniel Gultsch2015-01-071-1/+0
* run invalidateOptionsMenu on uiThreadDaniel Gultsch2015-01-061-1/+1
* record voice and attachment refactorDaniel Gultsch2015-01-031-64/+48
* put Conversations into background mode earlierDaniel Gultsch2015-01-021-5/+25
* improved OTR verification part oneDaniel Gultsch2015-01-021-0/+37
* fixed npe in block menu itemDaniel Gultsch2014-12-301-1/+1
* Add ability to change password on serverSam Whited2014-12-251-1/+1
* Fix NPEs in blocking codeSam Whited2014-12-221-1/+3