Commit Graph

  • 94927c2f60 Bumped expiry date to 1 August 2016. Torsten Grote 2016-06-27 11:39:43 -03:00
  • ecbf5621f2 Merge branch '448-make-use-of-existing-translations' into 'master' Torsten Grote 2016-06-27 14:35:04 +00:00
  • 4d3a333915 Make use of Existing Translations Torsten Grote 2016-06-23 14:54:54 -03:00
  • 9ac1a13711 Merge branch '442-author-s-identicon-nickname-and-status-are-separated-in-forum-post-layout' into 'master' Ernir Erlingsson 2016-06-27 10:09:54 +00:00
  • 946d7cb3e7 Merge branch '446-addidentityhook-sometimes-not-run-for-first-identity' into 'master' Ernir Erlingsson 2016-06-27 10:00:31 +00:00
  • b71a303bf8 Deduplicate contact exchange protocol str4d 2016-05-19 13:52:01 +00:00
  • a9996b4fb1 Separate Date and Author Name in Forum Posts Torsten Grote 2016-06-23 15:24:21 -03:00
  • 9c2250277b Fix IdentityManager hooks Torsten Grote 2016-06-23 11:59:43 -03:00
  • 4176f592df Merge branch '436-automatic-personal-blogs-backend' into 'master' Torsten Grote 2016-06-23 15:05:46 +00:00
  • 91aa81041e Store and expose time a blog post was received Torsten Grote 2016-06-22 12:27:58 -03:00
  • a8f51fcb8a Backend for Automatic Personal Blogs Torsten Grote 2016-06-21 17:00:13 -03:00
  • 30fe9f6e2a Change Blog Paradigm to Short-Form Torsten Grote 2016-06-20 16:00:05 -03:00
  • 5a9615265e Merge branch '441-group-descriptor-can-be-too-long-causes-crash' into 'master' str4d 2016-06-23 09:27:48 +00:00
  • 59320f02b7 Remove MAX_GROUP_DESCRIPTOR_LENGTH Torsten Grote 2016-06-22 11:19:16 -03:00
  • 3e4be038f2 Merge branch '426-forum-improvements' into 'master' Torsten Grote 2016-06-22 14:45:44 +00:00
  • a2a5b746c5 Forum improvements Ernir Erlingsson 2016-06-15 21:24:14 +02:00
  • 08cc5500ef Merge branch 'nav-drawer-instance-restore-fix' into 'master' Torsten Grote 2016-06-21 13:59:56 +00:00
  • ee0c4c07a7 Merge branch '354-private-chat-input-field' into 'master' Torsten Grote 2016-06-21 12:10:35 +00:00
  • ac8c1c0eee synched conversation and forum input Ernir Erlingsson 2016-06-15 22:53:48 +02:00
  • 8a29207bd0 Fixing fragment instance restore Ernir Erlingsson 2016-06-13 23:06:38 +02:00
  • 192ee41600 Merge branch '403-blog-sharing-client' into 'master' Torsten Grote 2016-06-20 17:16:45 +00:00
  • 13e3eec6b3 Implement BlogSharingManager str4d 2016-06-16 05:21:57 +00:00
  • 9ae64124d3 Factor out generic sharing code from ForumSharingManger str4d 2016-06-16 04:26:49 +00:00
  • 5df2776dc2 Merge branch '78-fix-test' into 'master' Ernir Erlingsson 2016-06-17 08:31:35 +00:00
  • 19fdf3ffd0 Fix test broken by #78 str4d 2016-06-17 04:48:13 +00:00
  • e7dce02709 Merge branch '402-blog-client-implementation' into 'master' Ernir Erlingsson 2016-06-15 20:26:35 +00:00
  • f823b8ba4c Merge branch '78-trust-indicators' into '402-blog-client-implementation' Ernir Erlingsson 2016-06-15 20:17:59 +00:00
  • dc048187f5 New Trust Level Indicator Replaces The Stars Torsten Grote 2016-06-15 12:41:43 -03:00
  • da68ef78f1 Blog Client with Factory and Validator Torsten Grote 2016-06-06 17:06:43 -03:00
  • bbed673150 Merge branch '433-forum-persistance' into 'master' Torsten Grote 2016-06-15 14:11:42 +00:00
  • 69b0bec033 fix persistance Ernir Erlingsson 2016-06-14 23:53:05 +02:00
  • a11e30c2b3 Merge branch '390-change-password' into 'master' str4d 2016-06-11 22:51:24 +00:00
  • c5708ee3ce Add a UI for changing the password str4d 2016-06-10 12:58:01 +00:00
  • e96838e731 Merge branch '430-npe-in-forumsharingstatusactivity' into 'master' Torsten Grote 2016-06-08 13:49:09 +00:00
  • 6697b06530 Fix NPE in ForumSharingStatusActivity Torsten Grote 2016-06-06 12:07:38 -03:00
  • 1bb17a3979 Merge branch '309-client-layer-events-for-messaging' into 'master' Torsten Grote 2016-06-08 13:37:34 +00:00
  • 9d826631e9 Add private message to list right away, so eliminate need for an event Torsten Grote 2016-06-01 17:19:09 -03:00
  • b26acdf228 Introduce a PrivateMessageReceivedEvent and use it in the Android app Torsten Grote 2016-06-01 16:54:39 -03:00
  • 69fba1aa17 Merge branch '388-forum-sharing-race-condition' into 'master' Torsten Grote 2016-06-08 13:29:12 +00:00
  • 1a1dd80810 Merge branch '408-forum-list-unread-posts-badges' into 'master' Torsten Grote 2016-06-07 14:36:42 +00:00
  • 02f432c04e Merge branch '409-blog-fragment-in-navigation-drawer-with-tabs' into 'master' Ernir Erlingsson 2016-06-06 09:48:08 +00:00
  • 3f838b0472 Blog Fragment in Navigation Drawer with Tabs Torsten Grote 2016-06-02 19:06:53 -03:00
  • 5d06f42000 This commit adds badges to the forum list that indicate unread posts. Torsten Grote 2016-06-01 13:39:57 -03:00
  • 4acb59b22a Address Race-Condition when Two Contacts Share Same Forum Torsten Grote 2016-05-30 16:59:26 -03:00
  • bba7083660 Merge branch '422-forum-subtree-duplicates' into 'master' str4d 2016-06-02 00:27:08 +00:00
  • e3fc015ec3 fixed sub-tree duplicate bug and also wrong reply count Ernir Erlingsson 2016-06-01 14:00:31 +02:00
  • 441fce8500 fixed forum crash bug Ernir Erlingsson 2016-05-31 23:12:33 +02:00
  • a58fb72ab1 Merge branch '122-threaded-discussion-ui' into 'master' Ernir Erlingsson 2016-05-31 16:06:22 +00:00
  • 86039b81c0 Forum, nested discussions front end UI/UX, rev 2 Ernir Erlingsson 2016-04-18 11:04:43 +02:00
  • 661140f623 Merge branch '382-message-dependencies-2' into 'master' str4d 2016-05-28 00:20:39 +00:00
  • 19b6afa69f Move new methods in Database interface to match existing alphabetic sorting str4d 2016-05-28 00:17:17 +00:00
  • 7ac7fae30e Update comments str4d 2016-05-28 00:13:36 +00:00
  • d3b83a50a6 Let the ForumValidator return parent posts as dependency Torsten Grote 2016-05-24 19:41:09 -03:00
  • 5561532c5d Implement new message validation logic Torsten Grote 2016-05-23 18:40:40 -03:00
  • b03d0a206b Add Message Dependencies to Database Torsten Grote 2016-05-18 18:24:03 -03:00
  • 512940e82b Merge branch '393-message-tree' into 'master' Ernir Erlingsson 2016-05-26 11:13:06 +00:00
  • d2ba7c9b7f generic sorted message tree Ernir Erlingsson 2016-05-25 00:43:03 +02:00
  • a652f1a5d7 Merge branch '122-forum-manager' into 'master' Torsten Grote 2016-05-24 18:13:15 +00:00
  • 21b237a629 ForumManager: Added parent id to metadata and a unit test Ernir Erlingsson 2016-05-24 13:07:58 +02:00
  • 2a7990f5c4 Merge branch '334-nav-menu-button-crash' into 'master' Torsten Grote 2016-05-20 14:12:11 +00:00
  • 92d3e02c82 android.support.v7.widget.AppCompatButton -> Button to use AppCompat inflater str4d 2016-05-20 03:30:10 +00:00
  • 0e32139a89 Second part of BQP UI improvements: zxing viewfinder. 278-bqp-ui-part-2 str4d 2016-05-06 14:20:10 +01:00
  • 0d16dd0358 Merge branch '382-message-dependencies' into 'master' str4d 2016-05-20 02:49:04 +00:00
  • 3f2b85ac0d Introduce a MessageContext class for more flexibility Torsten Grote 2016-05-17 18:20:24 -03:00
  • d0852d2265 Sorry for breaking master. Don't know how that happened :( Torsten Grote 2016-05-19 21:33:38 -03:00
  • 9149b82cc4 Merge branch '398-forum-sharing-status' into 'master' Torsten Grote 2016-05-19 14:44:05 +00:00
  • b13bf66165 Add a new activity that shows sharing status of forum Torsten Grote 2016-05-13 15:36:49 -03:00
  • 8c2fd905a1 Merge branch '392-use-new-metadata-queries-for-forum-sharing' into 'master' Torsten Grote 2016-05-19 14:35:58 +00:00
  • 38a4f73cdc Handle invitations to the same forum by multiple contacts Torsten Grote 2016-05-12 17:00:14 -03:00
  • 1a175beac9 Use new metadata queries in Forum Sharing Client Torsten Grote 2016-05-12 15:26:38 -03:00
  • 7e9ff40837 Merge branch '378-replace-bdf-with-classes-for-forum-sharing-client' into 'master' Torsten Grote 2016-05-19 14:32:41 +00:00
  • bd01c3732e Also use dedicated classes to represent messages instead of BdfDictionary Torsten Grote 2016-05-12 13:48:32 -03:00
  • 9532a60f43 Use dedicated Enum for protocol Actions Torsten Grote 2016-05-12 11:51:17 -03:00
  • d2722eed92 Turn local session state into its own class instead of BdfDictionary Torsten Grote 2016-05-11 19:23:54 -03:00
  • 886c8feb34 Merge branch '395-convert-createidentityactivity-to-xml' into 'master' Torsten Grote 2016-05-19 14:24:35 +00:00
  • c7f73f9247 Merge branch '399-contact-list-unread-messages' into 'master' str4d 2016-05-19 03:45:13 +00:00
  • 35156d698f Merge branch '337-avatars' into 'master' str4d 2016-05-19 03:38:09 +00:00
  • 1366972449 Merge branch '396-convert-expiredactivity-to-xml' into 'master' str4d 2016-05-19 03:31:06 +00:00
  • 3d25c41e7a Add unread count as bubble to avatar image in contact list Torsten Grote 2016-05-13 16:35:38 -03:00
  • ba928875df Merge branch '375-extract-forumfactory-from-forummanager' into 'master' Torsten Grote 2016-05-18 14:59:29 +00:00
  • cac0f30816 Convert ExpiredActivity to XML Torsten Grote 2016-05-16 17:08:48 -03:00
  • aad9f5142b Extract ForumFactory from ForumManager Torsten Grote 2016-05-16 16:56:44 -03:00
  • 9d686e16e0 Increase Avatar border and change shadow color Torsten Grote 2016-05-13 12:40:26 -03:00
  • 2880043c07 Turn the UI of CreateIdentityActivity into XML Torsten Grote 2016-05-16 12:19:47 -03:00
  • fb85345392 Merge branch '318-conversation-avatar-animation' into 'master' Torsten Grote 2016-05-16 13:22:04 +00:00
  • 0b67ec9201 Merge branch '372-clean-up-introduction-session-states-when-removing-contact' into 'master' Torsten Grote 2016-05-16 13:18:57 +00:00
  • fcf21b7ed7 Merge branch 'gradle-upgrade' into 'master' Ernir Erlingsson 2016-05-14 19:22:42 +00:00
  • 6e545d0100 disable exit transition until we have a fix for it Torsten Grote 2016-05-13 17:25:14 -03:00
  • 69026054cd Add bulb to scene transition, make transitionName unique for each contact str4d 2016-04-28 10:38:12 +00:00
  • 62eda5cd91 Removed forums for beta release. beta-2016-05-13 akwizgran 2016-05-13 12:32:09 +01:00
  • b818d6846c Don't close keyboard after sending private message. #355 akwizgran 2016-05-13 11:55:43 +01:00
  • 950c6525f6 Bumped version to 0.12 and expiry date to 1 July 2016. akwizgran 2016-05-13 11:52:11 +01:00
  • db4b79fcae Clean up Introduction Session States Torsten Grote 2016-05-12 18:21:18 -03:00
  • e0b0187157 Merge branch '222-simple-metadata-queries' into 'master' akwizgran 2016-05-12 17:31:43 +00:00
  • 0903a3e12d Merge branch '386-rotate-crash' into 'master' akwizgran 2016-05-12 17:30:55 +00:00
  • 1528aa0d12 Code review nitpicks. akwizgran 2016-05-12 18:29:09 +01:00
  • f2ab0eff53 Simple metadata queries. #222 akwizgran 2016-05-12 17:40:11 +01:00
  • 7412ca59ac Looks like we don't need Maven Central. akwizgran 2016-05-12 14:25:00 +01:00
  • ec083d617e Upgraded Gradle to 2.13, added local Maven repo. akwizgran 2016-05-12 13:36:34 +01:00
  • af1f267d4b Merge branch '385-bqp-lan' into 'master' akwizgran 2016-05-12 11:55:56 +00:00