Commit Graph

  • da89f11419 Merge branch '882-feedmanagerimpl-logs-rss-feed-urls' into 'master' akwizgran 2017-01-02 10:52:04 +00:00
  • a9663875f4 Update expiry date and translations Torsten Grote 2016-12-30 12:13:43 -02:00
  • 804966ede6 Do not log information from RSS feeds Torsten Grote 2016-12-29 13:07:18 -02:00
  • f0f22b42e5 Make sure contact name is initialized when needed Torsten Grote 2016-12-21 13:13:00 -02:00
  • 59316ae3c4 Fix memory leaks caused by periodic view refreshing tasks. akwizgran 2016-12-28 14:44:16 +00:00
  • 79c78518fb Fix potential NPE when getting soft reference. akwizgran 2016-12-28 13:47:33 +00:00
  • 460b524e4b Merge branch 'record-reading-tests' into 'master' Torsten Grote 2016-12-21 17:14:16 +00:00
  • 48e949c9f8 Merge branch '742-use-unique-request-ids-across-the-app' into 'master' akwizgran 2016-12-21 15:33:03 +00:00
  • 924398c829 Use unique request codes across the app Torsten Grote 2016-12-21 12:22:50 -02:00
  • 8619b044ce Merge branch '469-handle-background-errors' into 'master' akwizgran 2016-12-21 14:46:53 +00:00
  • 3c3731a562 Merge branch '876-group-invitation-not-marked-unavailable' into 'master' akwizgran 2016-12-21 14:43:38 +00:00
  • b54984b542 Unit tests for RecordReaderImpl. akwizgran 2016-12-21 14:39:56 +00:00
  • 2390f767f5 Unit tests for KeyAgreementTransport. akwizgran 2016-12-21 14:08:21 +00:00
  • 0a9840997f This adds a handleDbException() method to BaseActivity Torsten Grote 2016-12-21 12:06:20 -02:00
  • 6a94785d9a Mark invitation unavailable to answer when creator dissolved the group Torsten Grote 2016-12-20 17:15:00 -02:00
  • 79fc41477c Merge branch '628-bring-protocols-into-line-with-spec' into 'master' akwizgran 2016-12-21 12:52:43 +00:00
  • efb89adf41 Merge branch '793-show-open-button-after-accepting-invitations' into 'master' Torsten Grote 2016-12-20 14:07:13 +00:00
  • c04580e321 Don't open unsubscribed shareables Torsten Grote 2016-12-16 17:58:23 -02:00
  • 2ef9b8f4b6 Show open button in private conversation after accepting invitations Torsten Grote 2016-12-13 10:28:25 -02:00
  • d63d15329c Merge branch '814-enable-QrScanner-after-QrCode-was-created' into 'master' akwizgran 2016-12-19 19:28:14 +00:00
  • 5345db0b6b Address review comments Torsten Grote 2016-12-16 10:15:59 -02:00
  • 501980d8fe Bring protocols in line with spec Torsten Grote 2016-12-14 13:00:43 -02:00
  • cc5c000278 Merge branch '738-older-devices-show-overflow-icon-on-some-screens-but-not-others' into 'master' akwizgran 2016-12-16 11:58:18 +00:00
  • cb6037d42d fixed memory leak 851-recyclerview-refresher Ernir Erlingsson 2016-12-16 09:44:31 +01:00
  • 3ce0131b8c Merge branch '828-update-briar-logo-in-app' into 'master' akwizgran 2016-12-15 23:25:40 +00:00
  • 008e4f760a Merge branch '795-use-different-notification-icons-for-different-features' into 'master' akwizgran 2016-12-15 23:16:36 +00:00
  • fc44268b22 Removed translations of unused strings. akwizgran 2016-12-15 11:03:29 +00:00
  • de0a7c75ed Merge branch '697-include-commit-id-in-crash-reports-and-feedback' into 'master' akwizgran 2016-12-15 23:06:24 +00:00
  • 1c6be2fb78 Include Commit ID in crash reports and feedback Torsten Grote 2016-12-13 15:41:57 -02:00
  • 09b0a8b161 Use different notification icons for different features Torsten Grote 2016-12-13 15:07:43 -02:00
  • a6d053a0ea Update all logos Torsten Grote 2016-12-15 15:19:38 -02:00
  • e7a26c42a4 Merge branch '285-plugins-should-throw-exceptions-for-startup-errors' into 'master' akwizgran 2016-12-15 14:33:35 +00:00
  • bb5fc35e17 Removed translations of unused strings. akwizgran 2016-12-15 10:56:04 +00:00
  • ea4e2f09c8 Revert dagger update Torsten Grote 2016-12-14 16:52:38 -02:00
  • ffc9fdbb92 Plugins throw exceptions for startup errors Torsten Grote 2016-12-14 09:52:47 -02:00
  • 074f5c2faf Fix imports in HashTest. akwizgran 2016-12-14 17:09:15 +00:00
  • 7666b210e4 Ignore results from the QrScanner if task is not ready goapunk 2016-12-14 13:35:59 +01:00
  • ab3fcb6219 Merge branch 'add-crypto-hash-test' into 'master' akwizgran 2016-12-14 16:14:18 +00:00
  • b7e35ff780 Merge branch '778-move-unit-tests-into-their-respective-modules' into 'master' akwizgran 2016-12-14 15:57:45 +00:00
  • 3c2428449d Moved test utility classes into test package. akwizgran 2016-12-14 15:42:41 +00:00
  • 25a4caec2a Add Unit tests for CryptoComponent#hash() Torsten Grote 2016-12-14 13:14:47 -02:00
  • db71472501 Also show overflow icon on devices with menu key by using Toolbar Torsten Grote 2016-12-14 11:17:04 -02:00
  • 1081a08ea9 Move all unit tests to their modules and remove briar-tests Torsten Grote 2016-12-12 17:06:30 -02:00
  • 32be148c7a Merge branch '646-shared-with-subtitle-groups' into 'master' akwizgran 2016-12-13 18:01:48 +00:00
  • 78000375df Merge branch '155-notification-icon' into 'master' Torsten Grote 2016-12-13 17:24:05 +00:00
  • 66f8978bb6 Make notification icon less similar to superuser icon. akwizgran 2016-12-13 13:03:24 +00:00
  • 45b5040254 Add sharing information to private group ActionBar subtitle Torsten Grote 2016-12-12 11:42:31 -02:00
  • 378a8f0a10 Merge branch '813-add-online-status-and-creator-information-to-group-memberlist' into 'master' Torsten Grote 2016-12-12 15:36:02 +00:00
  • 562866494b Add creator and online information to group member list Torsten Grote 2016-12-06 10:00:18 -02:00
  • c9cb085a0a Merge branch '777-move-integration-tests-into-their-respective-modules' into 'master' akwizgran 2016-12-12 15:08:26 +00:00
  • 97d4c68f43 Move integration tests to their proper packages Torsten Grote 2016-12-08 11:35:13 -02:00
  • 4226ba40c2 Merge branch '570-consistent-use-of-animations' into 'master' Torsten Grote 2016-12-09 16:49:26 +00:00
  • 3df3d19a07 Address review comments Torsten Grote 2016-12-09 14:40:20 -02:00
  • e3dcc62509 Use back transition when backing out of creating private group Torsten Grote 2016-12-08 17:38:08 -02:00
  • db3c3eee44 Move OnBlogPostClickListener from activity to fragment Torsten Grote 2016-12-08 17:31:48 -02:00
  • 5a522d64df Don't show splash screen when signed in Torsten Grote 2016-12-08 15:54:01 -02:00
  • 68b216d580 Make animations more consistent Torsten Grote 2016-11-30 17:02:48 -02:00
  • d5c6fcc85b Fix merge accident after renaming event Torsten Grote 2016-12-09 14:12:27 -02:00
  • a099104d08 Merge branch '646-shared-with-subtitle-forums' into 'master' Torsten Grote 2016-12-09 16:06:21 +00:00
  • 787b3399f7 Merge branch '646-shared-with-subtitle' into 'master' akwizgran 2016-12-09 16:04:04 +00:00
  • 4e159bbb1f Add sharing info to ForumActivity action bar subtitle Torsten Grote 2016-12-07 12:07:29 -02:00
  • 7c6232db9d Address review comments (rename event, fix annotations, final field) Torsten Grote 2016-12-09 13:54:39 -02:00
  • 6cf1480d2d Merge branch '766-unit-tests-for-peer-protocol-engine' into 'master' Torsten Grote 2016-12-08 16:14:34 +00:00
  • 2679e6932f Add unit tests for PeerProtocolEngine Torsten Grote 2016-12-06 17:20:32 -02:00
  • 17e149e517 Merge branch '766-unit-tests-for-invitee-protocol-engine' into 'master' akwizgran 2016-12-08 15:42:05 +00:00
  • d5734f90f7 new event handler structure 752-780-activity-leaks-and-event-handlers Ernir Erlingsson 2016-12-07 23:11:09 +01:00
  • d04dda1566 Add sharing information to toolbar subtitle of blogs Torsten Grote 2016-12-05 16:39:34 -02:00
  • 5588855667 Fix intent of some CreatorProtocolEngine unit tests Torsten Grote 2016-12-07 15:07:01 -02:00
  • 7df6abbcbe Merge branch '810-fix-sharing-status-screens' into 'master' Torsten Grote 2016-12-07 16:52:29 +00:00
  • 001f5faeaa Two small review details: comment and initializing boolean Torsten Grote 2016-12-07 14:49:57 -02:00
  • ba1a19d236 Address review issues Torsten Grote 2016-12-07 14:31:12 -02:00
  • b7ce7de42a Add unit tests for InviteeProtocolEngine Torsten Grote 2016-12-05 09:54:12 -02:00
  • 3f6a8f9341 Merge branch '808-introduction-client-logs-contact-names' into 'master' akwizgran 2016-12-07 15:49:14 +00:00
  • 9495163016 Merge branch 'onboarding-dialog-style' into 'master' akwizgran 2016-12-07 15:47:12 +00:00
  • 7f5a5d40dc Remove verbose logging from introduction client Torsten Grote 2016-12-06 15:36:54 -02:00
  • 98dd8ec7f7 Fix Sharing Status screens Torsten Grote 2016-12-05 14:26:42 -02:00
  • 27c2ee8d89 Merge branch '548-require-a-label-for-hashing' into 'master' akwizgran 2016-12-06 11:07:58 +00:00
  • b98ab93e77 Merge branch '283-die-bluetooth-die' into 'master' Torsten Grote 2016-12-06 11:02:19 +00:00
  • 81337fe7ad Introduce Dialog Theme for Onboarding Torsten Grote 2016-12-05 14:48:37 -02:00
  • cdd234dfe3 Ensure key agreement tasks finish if they ignore interrupts. akwizgran 2016-12-02 12:25:28 +00:00
  • 062ed4ef4b Require a label for hashing Torsten Grote 2016-12-02 18:44:24 -02:00
  • 9c22ea8434 Merge branch '766-unit-tests-for-creator-protocol-engine' into 'master' akwizgran 2016-12-05 09:59:40 +00:00
  • 9458b185f8 Add unit test for CreatorProtocolEngine Torsten Grote 2016-12-01 17:30:06 -02:00
  • c2b06536ad Merge branch 'identity-manager-unit-tests' into 'master' akwizgran 2016-12-02 10:35:15 +00:00
  • 878b52ef2c Merge branch '771-create-bramble-modules' akwizgran 2016-12-01 21:48:03 +00:00
  • a9ddb0019e Add missing IdentityManager unit tests Torsten Grote 2016-12-01 13:21:09 -02:00
  • 2d7cb7b279 Updated Transifex config. akwizgran 2016-12-01 10:19:24 +00:00
  • f25d33b0c8 Move stray resources to the right place. akwizgran 2016-12-01 10:18:42 +00:00
  • 906dd1bd06 Added .gitignore files for new modules. akwizgran 2016-12-01 10:08:46 +00:00
  • ad6016d428 Updated java.library.path. akwizgran 2016-11-23 14:58:42 +00:00
  • f6d23b4d1a Merge branch '705-blog-pager-race-conditions' into 'master' akwizgran 2016-11-30 11:21:03 +00:00
  • aa064e853a Merge branch '760-integration-tests-for-private-group-invitation-protocol' into 'master' akwizgran 2016-11-30 11:19:05 +00:00
  • 8a139eaf5d Tightened up test expectations. akwizgran 2016-11-30 11:17:57 +00:00
  • d51f73151f Fixed a bug in the group invitation protocol, added tests. akwizgran 2016-11-30 11:12:04 +00:00
  • 6c90204c6e Fixed a broken unit test. akwizgran 2016-11-30 11:07:30 +00:00
  • f8266d8a02 Tightened up some tests. akwizgran 2016-11-30 10:21:27 +00:00
  • f245b04726 Fixed a failing test. akwizgran 2016-11-30 10:16:39 +00:00
  • 67d9f3a7c2 Add integration tests for GroupInvitationManager Torsten Grote 2016-11-22 18:22:31 -02:00
  • 24d68c4f5b Merge branch '727-refactor-integration-tests' into 'master' akwizgran 2016-11-29 18:28:11 +00:00
  • edbd7f4eeb Addressed review comments. akwizgran 2016-11-29 18:27:19 +00:00