aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-061-1/+1
|\
| * opt-in to send last userinteraction in presenceDaniel Gultsch2016-06-041-1/+1
* | Share link to invite user to start over with Pix-Art MessengerChristian Schneppe2016-06-021-0/+16
* | integrate image- and video playerChristian Schneppe2016-05-281-12/+16
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-271-4/+21
|\|
| * refactored toasts shown when adhoc creating mucsDaniel Gultsch2016-05-271-3/+20
| * make newly created conferences private by defaultDaniel Gultsch2016-05-261-1/+1
* | catch exception on videopreviewChristian Schneppe2016-05-221-18/+22
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-9/+15
|\|
| * show hint in subject quick edit. only show subject as presetDaniel Gultsch2016-05-221-9/+15
* | detect length of video fileChristian Schneppe2016-05-211-14/+20
* | make thumbs biggerChristian Schneppe2016-05-211-8/+8
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-201-2/+2
|\|
| * offer offline members to be invited againDaniel Gultsch2016-05-171-1/+1
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-3/+1
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-121-0/+3
* | changed colors to standard from @color and add border to imagesChristian Schneppe2016-05-201-4/+4
* | use glide as image loader and add a simple video previewChristian Schneppe2016-05-201-122/+29
* | try out some faster image loaderChristian Schneppe2016-05-171-4/+22
* | check if pgpengine is still bound before using itDaniel Gultsch2016-05-131-0/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-7/+32
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-7/+32
* | blue themeMatthias Rieber2016-05-051-1/+1
* | go directly to the user account via menuChristian S2016-05-051-1/+5
* | set manually_change_presence to true as defaultChristian S2016-04-301-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-16/+22
|\|
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * removed unused config variablesDaniel Gultsch2016-04-271-13/+0
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+15
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-0/+4
|\|
| * check max http file size when attaching filesDaniel Gultsch2016-04-011-0/+4
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-3/+4
|\|
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-201-3/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-0/+1
|\|
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-1/+1
|\|
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+15
|\|
| * rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| * changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-0/+14
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-3/+14
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-5/+4
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-0/+25
|\|
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-0/+14
| * Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-26/+2
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-2/+26
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+11
* | copy commitsChristian S2016-01-041-0/+2
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 15:20:23 +0000