aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Version set to beta-6trz/beta-6steckbrief2017-01-041-2/+2
* Fixed NPE in FileParams.setKeyAndIvsteckbrief2017-01-041-11/+13
* Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-0422-312/+579
* Adjusted maven URLtrz/beta-4steckbrief2017-01-021-1/+1
* versioncode and versionname updated in build.gradlesteckbrief2016-11-111-2/+2
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-20100-846/+3421
|\
| * Fixes FS#29: Own Avatar not loadedsteckbrief2016-09-291-3/+9
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-2938-631/+790
| * Fixes FS#230: Uncaught NullPointerException in DNSHelpersteckbrief2016-08-261-7/+12
| * Fixes conditions for cplus db upgradessteckbrief2016-08-231-2/+2
| * Javadoc added and access to xmppConnectionService movedsteckbrief2016-08-232-5/+14
| * Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-234-9/+41
| * Confirmation dialog added before sending delete command for remote filesteckbrief2016-08-236-23/+84
| * services.filetransfer.httpupload moved to new namespace services.filetransfer...steckbrief2016-08-2311-11/+11
| * xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ...steckbrief2016-08-2315-28/+22
| * Improved error handling for httpuploadsteckbrief2016-08-221-4/+7
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-2225-16/+550
| * Merge remote-tracking branch 'remotes/origin/filetransfer'steckbrief2016-08-2246-205/+1679
| |\
| | * Related to FS#131, FS#129, FS#220:steckbrief2016-06-0614-83/+472
| | * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-2939-199/+1165
| | * Fixed javadoc of HttpUploadHintsteckbrief2016-05-261-1/+11
| | * Fixed javadoc of PubSub Element Generation/Parsingsteckbrief2016-05-263-5/+114
| * | Implements FS#227: Store password encrypted in internal databasesteckbrief2016-07-165-4/+280
| |/
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-0913-111/+140
|\|
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
* | version name set to beta-3trz/beta-3steckbrief2016-05-021-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-2322-71/+560
|\|
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-238-48/+138
| * Related to FS#134: check if oldversion is smaller then new version on upgradi...steckbrief2016-04-231-2/+1
| * Removed download decision MUST if the message contains jabber:x:oob:oob/urlsteckbrief2016-04-191-3/+0
| * Persist Message.treatAsDownloadablesteckbrief2016-04-192-2/+15
| * Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-193-0/+9
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1870-312/+638
| |\
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1717-38/+393
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-1810-80/+94
|\ \ \ | | |/ | |/|
| * | Implements FS#137: build flavorssteckbrief2016-04-184-50/+89
| * | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-182-8/+1
| * | Related to FS#199: Removed unnecessary build configuration variable to hide d...steckbrief2016-04-182-6/+3
| * | Related to FS#199: Removed unnecessary differentiation between a conversation...steckbrief2016-04-183-16/+1
* | | Merge commit 'remotes/origin/trz/rename~4' into trz/rebasesteckbrief2016-04-180-0/+0
|\| |
| * | removed unused stringlookshe2016-04-171-1/+0
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1771-275/+573
| |\ \ | |/ / |/| |
* | | @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1771-310/+573
|\ \ \
| * | | version bump to 1.11.7 + changelog1.11.7Daniel Gultsch2016-04-142-2/+7
| * | | always notify by default in conferencesDaniel Gultsch2016-04-142-3/+1
| * | | removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
| * | | add setting for quick sharingDaniel Gultsch2016-04-143-17/+51
| * | | removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
| * | | create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-132-3/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:11:55 +0000