aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-18/+7
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-7/+8
|\|
* | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-1/+1
|\ \
| * | fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-1/+1
|\ \ \ | | |/ | |/|
* | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaresteckbrief2016-03-081-1/+1
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-20/+40
|\ \ \ | | |/ | |/|
| * | don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
* | | Imports organizedsteckbrief2016-02-121-4/+1
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-3/+3
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-53/+110
|\| |
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-38/+29
| * | add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
| * | show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+7
| * | check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-5/+25
| * | properly rotate avatarsDaniel Gultsch2016-01-041-33/+38
| * | fixed avatar loading for non-file urisDaniel Gultsch2015-12-021-9/+5
| * | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-6/+33
| * | added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-1/+8
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-0/+4
| * | call StartConversationActivity in init mode only after adding the first accountDaniel Gultsch2015-05-151-1/+3
| * | fixed service discovery by properly storing and checking identitiesDaniel Gultsch2015-04-251-2/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-1/+1
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-1/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-2/+3
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-253/+0
| |/
* / Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-3/+4
|/
* init mode (first start) for StartConversationActivity (no up button) and avoi...iNPUTmice2015-02-221-4/+8
* show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-13/+13
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-1/+1
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-3/+10
* Make conversations the root projectSam Whited2014-10-221-0/+242