aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* changed updater a bitChristian S2016-04-231-66/+64
* changed hidden password fieldChristian S2016-04-231-2/+3
* make password invisible in edit account viewChristian S2016-04-221-0/+4
* modified welcome screenChristian S2016-04-212-28/+3
* Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-214-4/+163
|\
| * added magic create welcome screenDaniel Gultsch2016-04-194-4/+163
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-2/+25
|\|
| * add setting for quick sharingDaniel Gultsch2016-04-141-2/+25
* | disallow account deactivationChristian S2016-04-152-38/+2
* | make foreground service always enabledChristian S2016-04-151-2/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-142-2/+19
|\|
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+17
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-3/+6
|\|
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* | Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-093-9/+22
|\|
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-092-1/+4
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-2/+11
| * prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | add option to only allow one account and set it to trueChristian S2016-04-041-3/+3
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-036-10/+42
|\|
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-022-5/+4
| * check max http file size when attaching filesDaniel Gultsch2016-04-013-6/+39
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-311-1/+1
| * save otr fingerprint in messageDaniel Gultsch2016-03-312-3/+3
* | fixed crashes during updates on Android 6Christian S2016-03-301-35/+56
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-7/+25
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-7/+25
* | Merge pull request #80 from siacs/masterChristian S2016-03-203-5/+6
|\|
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | Merge branch 'siacs/master' into developmentChristian S2016-03-174-42/+80
|\|
| * made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| * fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
* | remove old codeChristian S2016-03-131-10/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-03-134-5/+31
|\|
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-1/+14
* | show always buttons instead of links for filesChristian S2016-03-051-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-03-053-30/+74
|\|
| * Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...Daniel Gultsch2016-03-041-0/+10
| |\
| | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| * | show host in file size checkerDaniel Gultsch2016-03-041-1/+14
| * | don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
| * | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
* | | Merge branch 'siacs/master' into developmentChristian S2016-03-0411-102/+206
|\| |