aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-7/+22
|\
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-121-0/+3
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-3/+3
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-1/+6
| * added magic create welcome screenDaniel Gultsch2016-04-191-3/+10
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-2/+3
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-1/+0
|\| |
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-5/+6
|\ \ \ | | |/ | |/|
| * | don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+1
| * | prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-44/+43
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-5/+24
|\ \ \ | | |/ | |/|
| * | don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-021-2/+1
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-5/+25
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-0/+2
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-0/+5
|\ \ \ | | |/ | |/|
| * | added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-51/+71
|\| |
| * | don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+13
| * | let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-1/+3
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-9/+12
| * | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+1
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+2
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-4/+6
|\| |
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-4/+6
* | | Unused imports / methods removedsteckbrief2016-02-241-19/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-5/+2
|\| |
| * | removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| * | only show load more messages button when mam is availableDaniel Gultsch2016-02-141-0/+1
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-1/+7
|\| |
| * | prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+6
| * | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
* | | Imports organizedsteckbrief2016-02-121-4/+3
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-5/+0
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-32/+44
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-225/+540
|\| |
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-2/+2
| * | added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| * | Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-161-1/+4
| |\ \
| | * | fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| * | | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| |/ /
| * | hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| * | fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
| * | check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-15/+1
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-43/+80
| * | show trust keys activties if own keys are undecidedDaniel Gultsch2016-01-041-4/+5
| * | only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-2/+3
| * | splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| * | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+55
| * | hide prepare file toast after preparing the fileDaniel Gultsch2015-12-061-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 19:55:37 +0000