archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • bcf0d929dd Avoid unnecessary text change on activate account button steckbrief 2016-03-29 22:30:13 +02:00
  • 1d5d94080a Introduction of a TextViewUtil to easily set attributes for TextViews steckbrief 2016-03-29 22:28:19 +02:00
  • e388dfc0b8 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-29 11:53:34 +02:00
  • 6244834096 Implements FS#173: Move access to colors to separate helper class steckbrief 2016-03-29 11:43:22 +02:00
  • 77b1f2138e Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-28 23:20:44 +02:00
  • 0c0676b7db Merge branch 'master' of repos.thedevstack.de:conversations-plus steckbrief 2016-03-28 23:19:19 +02:00
  • f2e361d273 Fixes FS#170: Message Details: Status display has different Text color steckbrief 2016-03-28 23:17:24 +02:00
  • eda5a98448 Implements FS#176: error logging for httpupload improved steckbrief 2016-03-28 23:15:24 +02:00
  • d115f38361 Merge pull request #1784 from kriztan/patch-2 Daniel Gultsch 2016-03-28 14:15:35 +02:00
  • 1d458e8ab3 Update ShortcutBadger to version 1.1.4 Christian S 2016-03-27 20:02:36 +02:00
  • 27ca7f72d1 wrong import in new class trz/1.11.2.1 lookshe 2016-03-27 17:27:06 +02:00
  • 0fab4767fd Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-27 17:18:52 +02:00
  • fd6f0a842b adjusted changelog and corrected wrong version in build.gradle due to merge lookshe 2016-03-27 17:17:07 +02:00
  • a3bfd4a302 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-27 14:46:54 +02:00
  • 903bf55b5e Merge branch 'trz/rename' (early part) into trz/rebase lookshe 2016-03-27 14:45:46 +02:00
  • 9773b16a98 Fixes FS#166 - Images cannot be opened since storing in private image folder lookshe 2016-03-27 14:41:25 +02:00
  • 711ab9f2b1 Merge branch 'trz/rebase' into trz/rename lookshe 2016-03-25 20:13:51 +01:00
  • d25ab854da Merge branch 'trz/rebase' (early part) into trz/rename lookshe 2016-03-25 20:06:01 +01:00
  • 27c16b4b9a FS#169 - Merge Conversations 1.11.2 into Conversations+ dev lookshe 2016-03-25 20:04:37 +01:00
  • 46be514b4d version bump to 1.11.2 and changelog 1.11.2 Daniel Gultsch 2016-03-23 19:24:54 +01:00
  • a9b66e3ea5 allow to delete attachments. fixes #1539 Daniel Gultsch 2016-03-23 19:23:22 +01:00
  • 86d16b030b Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-23 13:41:58 +01:00
  • f306292ed6 deleted unused library (FS#51) lookshe 2016-03-23 13:40:53 +01:00
  • f3bebf5927 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-23 13:17:45 +01:00
  • 977ffc5f48 pulled from transifex lookshe 2016-03-23 13:16:05 +01:00
  • 281cb65046 only add image files to media scanner Daniel Gultsch 2016-03-23 12:20:09 +01:00
  • 564113669e update build deps Daniel Gultsch 2016-03-23 12:04:23 +01:00
  • 0baa2dd03e Merge pull request #1780 from licaon-kter/patch-1 Daniel Gultsch 2016-03-22 11:00:37 +01:00
  • 6ba90ec43c Typo attempt licaon-kter 2016-03-22 11:54:45 +02:00
  • 4085f2a80e Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-22 00:58:52 +01:00
  • 02f958ce76 Correct notifications to user if swiping with disabled or not connected account (FS#159) lookshe 2016-03-22 00:46:18 +01:00
  • c0267bb8f6 Fixes FS#87 - Crash on load messages after delete account lookshe 2016-03-22 00:16:54 +01:00
  • de3894f77c Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-21 03:12:34 +01:00
  • 47b982524e One more fix in Message.equals() (FS#104) lookshe 2016-03-21 03:11:02 +01:00
  • dd8dac73d2 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 20:16:35 +01:00
  • 00fc37b326 changed configuration to conversations+ project (FS#32) lookshe 2016-03-20 20:13:59 +01:00
  • 1d9a840c0b Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 17:57:22 +01:00
  • 9bcacdb8b9 Show file name instead of mime type (FS#102) lookshe 2016-03-20 17:56:01 +01:00
  • a8db6be4eb Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 17:37:44 +01:00
  • 135c8567a5 show room nick for /me command in sent muc messages. fixes #1773 Daniel Gultsch 2016-03-20 17:33:42 +01:00
  • ea6564c81a FS#104 - Fix Message.equals() lookshe 2016-03-20 17:28:39 +01:00
  • ac09011690 be less strict when sharing EXTRA_TEXT intents Daniel Gultsch 2016-03-20 17:25:16 +01:00
  • 7df24407dc be more careful to avoid creating multiple connections Daniel Gultsch 2016-03-20 17:24:41 +01:00
  • b51ce43d36 don't show v\omemo keys as such if not enabled Daniel Gultsch 2016-03-20 17:24:15 +01:00
  • d1e2023bd9 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 16:15:43 +01:00
  • 90bbe035e9 Fixes FS#143 - Displaying of emoticons too large lookshe 2016-03-20 16:15:17 +01:00
  • 50dad467ee Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 15:14:42 +01:00
  • d535496598 Merge branch 'trz/rename' (early part) into trz/rebase lookshe 2016-03-20 15:14:36 +01:00
  • 89082f1c68 Fixes FS#168 - Not possible to share more than one picture at once lookshe 2016-03-20 13:04:27 +01:00
  • a92ef6f077 fixed merge error lookshe 2016-03-20 02:33:15 +01:00
  • 75c8a4a695 Merge branch 'trz/rebase' (early part) into trz/rename lookshe 2016-03-20 02:31:09 +01:00
  • ad8e8344c0 Merge branch 'trz/rebase' (early part) into trz/rename lookshe 2016-03-20 02:29:46 +01:00
  • 6de11f38ea Merge branch 'trz/rebase' (early part) into trz/rename lookshe 2016-03-20 02:27:01 +01:00
  • c9b7ed3d3f Merge branch 'trz/rebase' into trz/merge_1.11.1 trz/merge_1.11.1 lookshe 2016-03-20 02:14:45 +01:00
  • d89d7a3000 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-20 02:13:20 +01:00
  • 98e61f189c fixed merge errors lookshe 2016-03-20 01:59:41 +01:00
  • b99714161b Fixes FS#167: Resized images are larger than original images steckbrief 2016-03-18 17:19:37 +01:00
  • f5b684ab6b Merge branch 'master' of git.fucktheforce.de:conversations-plus steckbrief 2016-03-18 17:13:36 +01:00
  • 6758676691 Fixes FS#164 lookshe 2016-03-18 09:08:18 +01:00
  • b5d1ee194c Fixes FS#156 and FS#135 (occured again) lookshe 2016-03-17 23:08:58 +01:00
  • cb55d2af52 completely implements FS#161 save state of treatAsDownloadable() and set on error to specified value lookshe 2016-03-17 22:14:49 +01:00
  • fb00372269 Merge tag '1.11.1' into trz/merge_1.11.1 lookshe 2016-03-17 15:56:54 +01:00
  • 0de9c2aa23 partially implements FS#161 do not show download button on 404 lookshe 2016-03-16 18:45:18 +01:00
  • c4b1f6171d version bump to 1.11.1 and changelog 1.11.1 Daniel Gultsch 2016-03-16 18:12:36 +01:00
  • b17ca3543f made it possible to share text files Daniel Gultsch 2016-03-16 18:09:19 +01:00
  • 48be5af55f reworked sharewith activity to stay open during sharing closing the activity prematuraly caused uri permissions to be revoked Daniel Gultsch 2016-03-16 10:46:33 +01:00
  • 323d31ba05 Merge pull request #1767 from fiaxh/path_file_accessible Daniel Gultsch 2016-03-16 10:44:13 +01:00
  • eaddfa7fd1 Check if path for URI is accessible 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 fiaxh 2016-03-15 11:09:28 +01:00
  • 25d3aba4d7 Merge branch 'trz/rename' into trz/rebase lookshe 2016-03-15 09:18:03 +01:00
  • 76a1937745 once again: FS#34 - review all calls for String.trim() lookshe 2016-03-14 23:39:44 +01:00
  • 678bc7b4d4 removed requirement of external component for http upload Daniel Gultsch 2016-03-14 12:16:36 +01:00
  • 815c534da8 pulled translations from transifex Daniel Gultsch 2016-03-13 17:43:43 +01:00
  • 0af8ee341c simplified getUsers(max) code Daniel Gultsch 2016-03-13 17:42:17 +01:00
  • 1153e6120d added logging in case fragment wasn't attached Daniel Gultsch 2016-03-13 17:41:38 +01:00
  • 290f53f4a6 fixed recursive call instead of call to super in PublishProfileActivity Daniel Gultsch 2016-03-13 17:38:59 +01:00
  • 74582979b3 Refs FS#140: Rework message display hide own avatar in message display steckbrief 2016-03-13 16:25:19 +01:00
  • 340272ba84 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-12 21:22:44 +01:00
  • 86afdc7aaf Merge commit 'remotes/origin/trz/rename~1' into trz/rebase steckbrief 2016-03-12 21:21:32 +01:00
  • a95d2d9134 Fixes FS#155: Check FileHelper vs. FileUtils steckbrief 2016-03-12 21:14:55 +01:00
  • 14c2c72bc1 Merge branch 'trz/rebase' into trz/rename lookshe 2016-03-12 15:51:17 +01:00
  • 2a486c667a Merge branch 'trz/rebase' (early part) into trz/rename lookshe 2016-03-12 15:46:09 +01:00
  • dc26c95b40 fixed possible NPE lookshe 2016-03-12 15:36:54 +01:00
  • 3dc635c6fd small bugfixes lookshe 2016-03-12 15:04:07 +01:00
  • e72f409197 removed duplicated source lookshe 2016-03-12 14:15:39 +01:00
  • bf49abe865 Added method to get body from message if hasMeCommand and harmonized extraction of fileextension (FS#38) lookshe 2016-03-12 02:28:22 +01:00
  • 3041cc74ce Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-11 23:51:10 +01:00
  • a444402644 Fixes FS#51: Change toggle in Account Management back to standard steckbrief 2016-03-11 23:44:59 +01:00
  • 864bb77883 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-11 21:34:10 +01:00
  • bfc5000b6a Fixes FS#139: Do not merge messages at all steckbrief 2016-03-11 21:31:30 +01:00
  • 817d344521 log reason for bind failure Daniel Gultsch 2016-03-11 09:01:40 +01:00
  • 9548f43998 close cursor in caps db query Daniel Gultsch 2016-03-11 09:01:27 +01:00
  • 8585231be2 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-10 23:03:19 +01:00
  • 27c9c0aa21 Fixes FS#157: Trigger loading messages from MAM in MUC does not end steckbrief 2016-03-10 22:54:13 +01:00
  • 58ddfef266 Fixes FS#158: user decision dialog heading configurable and translateable steckbrief 2016-03-10 21:13:59 +01:00
  • 7eb736227e mention mod_smacks_offline and ejabberds settings in readme Daniel Gultsch 2016-03-10 14:47:55 +01:00
  • 07c2aba59b Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase steckbrief 2016-03-08 23:34:56 +01:00
  • 9af0794911 Merge remote branch 'master' steckbrief 2016-03-08 23:21:44 +01:00
  • a5243a8160 Fixes FS#145: Dialog for decision in Android 5 steckbrief 2016-03-08 23:13:36 +01:00
  • 85bb3f537a incremented version code lookshe 2016-03-08 22:47:54 +01:00
  • a6442dd3ac Merge branch 'trz/rename' into trz/rebase trz/1.11.0.1 lookshe 2016-03-08 22:24:47 +01:00