aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-207-27/+118
|\
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-295-30/+72
| * Javadoc added and access to xmppConnectionService movedsteckbrief2016-08-231-3/+11
| * Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-232-9/+39
| * Confirmation dialog added before sending delete command for remote filesteckbrief2016-08-235-15/+59
| * services.filetransfer.httpupload moved to new namespace services.filetransfer...steckbrief2016-08-231-1/+1
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-3/+8
| * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-293-5/+7
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-3/+4
|\|
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-094-9/+11
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-12/+9
|\|
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-231-5/+3
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-184-10/+52
| |\
| | * Related to FS#199: Removed unnecessary differentiation between a conversation...steckbrief2016-04-182-4/+1
| | * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-175-11/+56
| | |\ | |_|/ |/| |
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-12/+9
| |/
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-072-6/+76
|\|
| * Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-072-6/+75
| * Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-068-78/+56
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-056-10/+43
| |\ | |/ |/|
| * Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
| * Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
| * Logging for FS#80 to identify calling methodlookshe2016-03-301-0/+2
| * Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
| * Removed unnecessary importsteckbrief2016-03-291-1/+0
| * Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| * Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-295-69/+24
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-292-2/+4
|\|
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2912-86/+50
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
|\|
| * Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-281-2/+23
| |\
| | * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-2/+23
| * | Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-255-13/+32
| |\ | |/ |/|
| * Correct notifications to user if swiping with disabled or not connected accou...lookshe2016-03-221-25/+37
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
|\|
| * Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
| * fixed merge errorlookshe2016-03-201-1/+1
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-202-19/+25
| |\ | |/ |/|
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-204-59/+100
| |\
| * | Fixes FS#164lookshe2016-03-181-8/+0
| * | completely implements FS#161lookshe2016-03-171-1/+9
| * | once again: FS#34 - review all calls for String.trim()lookshe2016-03-141-1/+1
* | | fixed merge errorslookshe2016-03-201-1/+1
| |/ |/|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-6/+3
|\|
| * Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-7/+4
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-3/+3
| |\ | |/ |/|
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+1
|\|
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-114-17/+8