aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Ask to uninstall the plugins because the features are directly integratedChristian S2016-05-061-3/+70
* add audio recorderChristian S2016-05-051-5/+5
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-3/+3
|\
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-3/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-1/+6
|\|
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-1/+6
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-3/+10
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-3/+10
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-6/+8
|\|
| * 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 'siacs/master' into developmentChristian S2016-04-031-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 'siacs/master' into developmentChristian S2016-03-171-0/+5
|\|
| * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
* | remove old codeChristian S2016-03-131-10/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-1/+13
|\|
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+13
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-10/+15
|\|
| * 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
* | bug fixesChristian S2016-02-271-2/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-6/+7
|\|
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-4/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-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
* | optimized subtitle in MUCsChristian S2016-02-061-21/+18
* | match new presence modificationsChristian S2016-02-041-2/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-16/+22
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-3/+3
|\|
| * 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
* | make actionbar title/subtitle clickableChristian S2016-01-231-23/+70
* | Merge branch 'siacs/master' into developmentChristian S2016-01-171-4/+13
|\|
| * 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
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-11/+12
|\|
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
* | Merge branch 'siacs/master' into developmentChristian S2016-01-151-1/+1
|\|
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-57/+79
|\|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 05:00:45 +0000