| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 17 | -102/+246 |
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java | ||||
| | * | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 17 | -102/+239 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-28 | 3 | -5/+9 |
| |\| | |||||
| | * | Merge branch 'master' of repos.thedevstack.de:conversations-plus | steckbrief | 2016-03-28 | 5 | -3/+57 |
| | |\ | |||||
| | * | | Fixes FS#170: Message Details: Status display has different Text color | steckbrief | 2016-03-28 | 2 | -4/+2 |
| | | | | |||||
| | * | | Implements FS#176: error logging for httpupload improved | steckbrief | 2016-03-28 | 1 | -1/+7 |
| | | | | |||||
| * | | | wrong import in new classtrz/1.11.2.1 | lookshe | 2016-03-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-27 | 5 | -3/+57 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fixes FS#166 - Images cannot be opened since storing in private image folder | lookshe | 2016-03-27 | 5 | -3/+57 |
| | |/ | |||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-25 | 16 | -39/+88 |
| | |\ | |/ |/| | |||||
| * | | FS#169 - Merge Conversations 1.11.2 into Conversations+ dev | lookshe | 2016-03-25 | 16 | -39/+87 |
| |\ \ | |||||
| | * | | allow to delete attachments. fixes #1539 | Daniel Gultsch | 2016-03-23 | 8 | -31/+46 |
| | | | | |||||
| | * | | only add image files to media scanner | Daniel Gultsch | 2016-03-23 | 6 | -13/+26 |
| | | | | |||||
| | * | | Typo `attempt` | licaon-kter | 2016-03-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | show room nick for /me command in sent muc messages. fixes #1773 | Daniel Gultsch | 2016-03-20 | 1 | -4/+5 |
| | | | | |||||
| | * | | be less strict when sharing EXTRA_TEXT intents | Daniel Gultsch | 2016-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | be more careful to avoid creating multiple connections | Daniel Gultsch | 2016-03-20 | 2 | -3/+8 |
| | | | | |||||
| | * | | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 2 | -4/+5 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-23 | 32 | -317/+450 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | pulled from transifex | lookshe | 2016-03-23 | 32 | -317/+450 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-22 | 2 | -26/+42 |
| |\| | | |||||
| | * | | Correct notifications to user if swiping with disabled or not connected ↵ | lookshe | 2016-03-22 | 1 | -25/+37 |
| | | | | | | | | | | | | | account (FS#159) | ||||
| | * | | Fixes FS#87 - Crash on load messages after delete account | lookshe | 2016-03-22 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-21 | 1 | -4/+19 |
| |\| | | |||||
| | * | | One more fix in Message.equals() (FS#104) | lookshe | 2016-03-21 | 1 | -4/+19 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Show file name instead of mime type (FS#102) | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -18/+14 |
| |\| | | |||||
| | * | | FS#104 - Fix Message.equals() | lookshe | 2016-03-20 | 1 | -18/+14 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 7 | -4/+15 |
| |\| | | |||||
| | * | | Fixes FS#143 - Displaying of emoticons too large | lookshe | 2016-03-20 | 7 | -4/+15 |
| | | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -59/+83 |
| |\| | | |||||
| | * | | Fixes FS#168 - Not possible to share more than one picture at once | lookshe | 2016-03-20 | 1 | -59/+83 |
| | | | | |||||
| | * | | fixed merge error | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 3 | -19/+27 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 14 | -179/+553 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1 | lookshe | 2016-03-20 | 7 | -38/+96 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| | * | | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 7 | -38/+96 |
| | |\| | | | |||||
| | | * | | | Fixes FS#167: Resized images are larger than original images | steckbrief | 2016-03-18 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of git.fucktheforce.de:conversations-plus | steckbrief | 2016-03-18 | 7 | -39/+96 |
| | | |\ \ \ | |||||
| | | | * | | | Fixes FS#164 | lookshe | 2016-03-18 | 1 | -8/+0 |
| | | | | | | | |||||
| | | | * | | | Fixes FS#156 and FS#135 (occured again) | lookshe | 2016-03-17 | 1 | -4/+10 |
| | | | | | | | |||||
| | | | * | | | completely implements FS#161 | lookshe | 2016-03-17 | 3 | -14/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | save state of treatAsDownloadable() and set on error to specified value | ||||
| | | | * | | | partially implements FS#161 | lookshe | 2016-03-16 | 2 | -17/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | do not show download button on 404 | ||||
| | | * | | | | Refs FS#140: Rework message display | steckbrief | 2016-03-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | hide own avatar in message display | ||||
| * | | | | | | fixed merge errors | lookshe | 2016-03-20 | 5 | -21/+29 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | Merge tag '1.11.1' into trz/merge_1.11.1 | lookshe | 2016-03-17 | 14 | -179/+553 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml | ||||
| | * | | | made it possible to share text files | Daniel Gultsch | 2016-03-16 | 1 | -7/+8 |
| | | | | | |||||
| | * | | | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 3 | -30/+69 |
| | | | | | | | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
| | * | | | Check if path for URI is accessible | fiaxh | 2016-03-15 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider | ||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |