Merge pull request #196 from wireapp/staging

release 2016-09-08
wireapp · Sep 8, 2016 · 270622b · 270622b
2 parents 587864a + cdb791f
commit 270622b
Show file tree

Hide file tree

Showing 101 changed files with 2,074 additions and 1,522 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,18 @@
+## Description
+<!--- Describe your changes -->
+
+## Screenshots
+<!--- Screenshots (if appropriate) -->
+
+## Type of change
+<!--- What type of changes does your code introduce? -->
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+
+- [ ] I have signed [Wire's contributor agreement](https://github.com/wireapp/wire#contributing-to-the-code).
+- [ ] My Pull Request contains test coverage for my changes.
diff --git a/.gitignore b/.gitignore
@@ -25,11 +25,6 @@
 aws-keys.json
 Gruntfile.js
 npm-debug.log
-strings-ar.coffee
-strings-fr.coffee
-strings-it.coffee
-strings-pt.coffee
-strings-ru.coffee
 
 # Automatically created files
 /doc

diff --git a/app/font/Wire.ttf b/app/font/Wire.ttf
diff --git a/app/page/auth.html b/app/page/auth.html
@@ -161,7 +161,7 @@
                   <input type="checkbox" id="checkbox-terms-of-use" data-bind="checked: accepted_terms_of_use" tabindex="4">
                   <label class="auth-text" for="checkbox-terms-of-use">
                     <span data-bind="l10n_text: z.string.auth_account_terms_of_use_detail" data-uie-name="do-terms-of-use"></span>
-                    <a class="auth-text-link" target="_blank" tabindex="-1"
+                    <a class="auth-text-link" rel="nofollow noopener noreferrer" target="_blank" tabindex="-1"
                        data-bind="click: clicked_on_terms, l10n_text: z.string.auth_account_terms_of_use"
                        data-uie-name="go-terms-of-use"></a>
                   </label>
@@ -272,7 +272,7 @@
           <div class="auth-headline-sub" data-bind="l10n_text: z.string.auth_history_description"></div>
           <div class="footer">
             <div class="button-group">
-              <a class="button button-outline" target="_blank"
+              <a class="button button-outline" rel="nofollow noopener noreferrer" target="_blank"
                  data-bind="l10n_href: z.string.url_support_history, l10n_text: z.string.warning_learn_more"
                  data-uie-name="do-history-learn-more"></a>
             <span class="button button-white"

diff --git a/app/page/template/_dist/app.htm b/app/page/template/_dist/app.htm
@@ -19,7 +19,6 @@
 <script src="/script/util/CountryCodes.js"></script>
 <script src="/script/util/Invite.js"></script>
 <!-- Storage -->
-<script src="/script/storage/SkipError.js"></script>
 <script src="/script/storage/StorageError.js"></script>
 <script src="/script/storage/StorageKey.js"></script>
 <script src="/script/storage/StorageRepository.js"></script>
@@ -36,6 +35,7 @@
 <script src="/script/event/EventError.js"></script>
 <script src="/script/event/EventRepository.js"></script>
 <script src="/script/event/EventTypeHandling.js"></script>
+<script src="/script/event/NotificationHandlingState.js"></script>
 <script src="/script/event/NotificationService.js"></script>
 <script src="/script/event/WebApp.js"></script>
 <script src="/script/event/WebSocketService.js"></script>
@@ -100,6 +100,7 @@
 <!-- GeoLocation -->
 <script src="/script/location/GeoLocation.js"></script>
 <!-- Conversation -->
+<script src="/script/conversation/ConversationError.js"></script>
 <script src="/script/conversation/ConversationType.js"></script>
 <script src="/script/conversation/ConversationStatus.js"></script>
 <script src="/script/conversation/ConversationUnreadType.js"></script>
@@ -202,7 +203,9 @@
 <script src="/script/components/calling/deviceToggleButton.js"></script>
 <!-- Entities -->
 <script src="/script/message/CallMessageType.js"></script>
+<script src="/script/message/StatusType.js"></script>
 <script src="/script/message/PingMessageType.js"></script>
+<script src="/script/message/ReactionType.js"></script>
 <script src="/script/message/SuperType.js"></script>
 <script src="/script/message/SystemMessageType.js"></script>
 <script src="/script/entity/message/Asset.js"></script>

diff --git a/app/page/template/modals.htm b/app/page/template/modals.htm
@@ -144,7 +144,7 @@
         <div class="modal-title" data-bind="l10n_text: z.string.warning_call_headline"></div>
       </div>
       <div class="modal-text" data-bind="l10n_text: z.string.warning_call_detail"></div>
-      <div class="modal-action button button-medium button-fluid" target="_blank" data-bind="l10n_text: z.string.warning_tell_me_how" data-uie-name="go-faq"></div>
+      <div class="modal-action button button-medium button-fluid" rel="nofollow noopener noreferrer" target="_blank" data-bind="l10n_text: z.string.warning_tell_me_how" data-uie-name="go-faq"></div>
     </div>
   </div>
 
@@ -221,7 +221,7 @@
           </label>
         </div>
       </div>
-      <div class="modal-action button button-medium button-fluid" target="_blank" data-bind="l10n_text: z.string.modal_logout_button" data-uie-name="go-logout"></div>
+      <div class="modal-action button button-medium button-fluid" rel="nofollow noopener noreferrer" target="_blank" data-bind="l10n_text: z.string.modal_logout_button" data-uie-name="go-logout"></div>
     </div>
   </div>
 
@@ -264,7 +264,7 @@
       </div>
       <div class="modal-text">
         <span data-bind="l10n_text: z.string.modal_session_reset_message_1"></span>
-        <a data-bind="l10n_href: z.string.url_support_contact_bug, l10n_text: z.string.modal_session_reset_message_link" target="_blank"></a>
+        <a data-bind="l10n_href: z.string.url_support_contact_bug, l10n_text: z.string.modal_session_reset_message_link" rel="nofollow noopener noreferrer" target="_blank"></a>
         <span data-bind="l10n_text: z.string.modal_session_reset_message_2"></span>
       </div>
       <div class="modal-close button button-medium button-fluid" data-bind="l10n_text: z.string.modal_button_ok" data-uie-name="do-close"></div>
@@ -290,7 +290,7 @@
       </div>
       <div class="modal-text">
         <span data-bind="l10n_text: z.string.modal_whitelist_screensharing_message_1"></span>
-        <a data-bind="l10n_href: z.string.url_support_screen_whitelist, l10n_text: z.string.modal_whitelist_screensharing_message_link" target="_blank"></a>
+        <a data-bind="l10n_href: z.string.url_support_screen_whitelist, l10n_text: z.string.modal_whitelist_screensharing_message_link" rel="nofollow noopener noreferrer" target="_blank"></a>
         <span data-bind="l10n_text: z.string.modal_whitelist_screensharing_message_2"></span>
       </div>
       <div class="modal-close button button-medium button-fluid" data-bind="l10n_text: z.string.modal_button_ok" data-uie-name="do-close"></div>

diff --git a/app/page/template/partials/template-message.htm b/app/page/template/partials/template-message.htm
@@ -39,7 +39,7 @@
   <div class="message-body message-location-body">
     <div class="message-location-icon icon-location"></div>
     <div class="message-location-label" data-bind="text: name"></div>
-    <a target="_blank" class="label-xs text-theme" data-bind="attr: {href: link_src}, l10n_text: z.string.conversation_location_link"></a>
+    <a class="label-xs text-theme" data-bind="attr: {href: link_src}, l10n_text: z.string.conversation_location_link" rel="nofollow noopener noreferrer" target="_blank"></a>
   </div>
 </script>
 
@@ -69,6 +69,7 @@
     </div>
   </div>
   <div class="message-body">
+
     <!-- ko foreach: {data: message.assets, as: 'asset'} -->
       <!-- ko if: asset.is_medium_image() -->
         <div class="message-asset-image" data-bind="fit_to_viewport: asset">
@@ -106,14 +107,47 @@
       <!-- /ko -->
 
       <context-menu params="entries: function() {return $parents[1].get_context_menu_entries(message)}, tag: 'message', data: message.id"
-                    class="context-menu icon-more"
+                    class="context-menu icon-more font-size-xs"
                     tabindex="-1"></context-menu>
       <!-- ko ifnot: message.timestamp == '' -->
         <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp, 'data-uie-uid': message.id}" data-uie-name="item-message-timestamp"></time>
       <!-- /ko -->
+    <!-- /ko -->
 
+    <!-- ko ifnot: message.other_likes().length -->
+      <div class="message-body-like">
+        <span class="message-body-like-icon like-button message-show-on-hover" data-bind="attr: {'data-ui-value': message.is_liked()}, css: {'like-button-liked': message.is_liked()}, style: {opacity: message.is_liked() ? 1 : ''}, click: $parent.click_on_like">
+          <span class="icon-liked"></span>
+          <span class="icon-liked"></span>
+        </span>
+      </div>
     <!-- /ko -->
+
   </div>
+  <!-- ko if: message.other_likes().length -->
+    <div class="message-footer">
+      <div class="message-footer-icon">
+        <span class="like-button" data-bind="attr: {'data-ui-value': message.is_liked()}, css: {'like-button-liked': message.is_liked()}, style: {opacity: message.is_liked() ? 1 : ''}, click: $parent.click_on_like">
+          <span class="icon-liked"></span>
+          <span class="icon-liked"></span>
+        </span>
+      </div>
+      <div class="message-footer-label cursor-pointer" data-bind="click: function() {$data.show_likes(true)}">
+        <span class="font-size-xs text-graphite" data-uie-name="message-liked-names" data-bind="text: like_caption, attr: {'data-uie-value': reactions_user_ids()}" ></span>
+        <!-- ko if: !message.show_likes() && message.other_likes().length > 5 -->
+          <span class="icon-more font-size-xs"></span>
+        <!-- /ko -->
+      </div>
+      <!-- ko if: message.show_likes() -->
+        <div class="message-footer-bottom" data-uie-name="message-liked-avatars">
+          <!-- ko foreach: message.reactions_user_ets() -->
+            <user-avatar class="user-avatar-xs" data-bubble="#participants-bubble" data-placement="vertical" params="user: $data, click: $parents[1].on_message_user_click"></user-avatar>
+          <!-- /ko -->
+          <span class="icon-close button-icon font-size-xs flex-center user-avatar-box-xs" data-bind="click: function() { $data.show_likes(false) }"></span>
+        </div>
+      <!-- /ko -->
+    </div>
+  <!-- /ko -->
 </script>
 
 <script type="text/html" id="device">
@@ -189,7 +223,7 @@
     </div>
   </div>
   <context-menu params="entries: function() {return $parent.get_context_menu_entries($data)}, tag: 'message', data: message.id"
-                class="context-menu icon-more"
+                class="context-menu icon-more font-size-xs"
                 tabindex="-1"></context-menu>
   <!-- ko ifnot: message.timestamp == '' -->
     <time class="time" data-bind="text: message.display_timestamp_short(), attr: {'data-timestamp': message.timestamp}"></time>
@@ -218,7 +252,7 @@
     <div class="message-header-label ellipsis">
       <span data-bind="html: caption"></span>
       <span>&nbsp;</span>
-      <a class="text-theme" data-bind="l10n_text: z.string.conversation_unable_to_decrypt_link, attr: {'href': link}" target="_blank"></a>
+      <a class="text-theme" data-bind="l10n_text: z.string.conversation_unable_to_decrypt_link, attr: {'href': link}" rel="nofollow noopener noreferrer" target="_blank"></a>
       <hr class="message-header-line" />
     </div>
   </div>

diff --git a/app/page/template/partials/template-user-profile.htm b/app/page/template/partials/template-user-profile.htm
@@ -37,7 +37,7 @@
           <!-- ko if: devices_found() === true -->
             <div class="user-profile-device-message">
               <div data-bind="text: device_headline"></div>
-              <a data-bind="l10n_text: z.string.people_tabs_devices_why_verify, l10n_href: z.string.url_privacy_why" target="_blank" class="text-theme"></a>
+              <a data-bind="l10n_text: z.string.people_tabs_devices_why_verify, l10n_href: z.string.url_privacy_why" rel="nofollow noopener noreferrer" target="_blank" class="text-theme"></a>
             </div>
             <div data-bind="foreach: user().devices">
               <div class="user-profile-device">
@@ -55,7 +55,7 @@
           <!-- /ko -->
           <!-- ko if: devices_found() === false -->
             <div data-bind="text: no_device_headline"></div>
-            <a data-bind="l10n_text: z.string.people_tabs_devices_learn_more, l10n_href: z.string.url_privacy" target="_blank" class="text-theme"></a>
+            <a data-bind="l10n_text: z.string.people_tabs_devices_learn_more, l10n_href: z.string.url_privacy" rel="nofollow noopener noreferrer" target="_blank" class="text-theme"></a>
           <!-- /ko -->
         </div>
       <!-- /ko -->
@@ -71,7 +71,7 @@
         <span class="user-profile-my-device-button user-profile-top-right-button button-label text-theme" data-bind="click: click_on_my_fingerprint_button, l10n_text: z.string.people_tabs_device_detail_show_my_device"></span>
         <div class="user-profile-device-detail-message">
           <div data-bind="html: detail_message"></div>
-          <a data-bind="l10n_text: z.string.people_tabs_device_detail_how_to, l10n_href: z.string.url_privacy_why" target="_blank" class="text-theme"></a>
+          <a data-bind="l10n_text: z.string.people_tabs_device_detail_how_to, l10n_href: z.string.url_privacy_why" rel="nofollow noopener noreferrer" target="_blank" class="text-theme"></a>
         </div>
         <device-card class="user-profile-device-detail-card" params="device: selected_device()"></device-card>
         <div class="user-profile-device-detail-fingerprint" data-bind="html: z.util.print_devices_id(fingerprint_remote())"></div>

diff --git a/app/page/template/self/self-about.htm b/app/page/template/self/self-about.htm
@@ -10,11 +10,11 @@
       </svg>
     </header>
     <div>
-      <a target="_blank" data-uie-name="go-wire-dot-com" data-bind="l10n_text: z.string.about_wire, l10n_href: z.string.url_wire"></a>
+      <a rel="nofollow noopener noreferrer" target="_blank" data-uie-name="go-wire-dot-com" data-bind="l10n_text: z.string.about_wire, l10n_href: z.string.url_wire"></a>
     </div>
     <ul>
-      <li><a target="_blank" data-uie-name="go-legal" data-bind="l10n_text: z.string.about_legal, l10n_href: z.string.url_legal"></a></li>
-      <li><a target="_blank" data-uie-name="go-privacy" data-bind="l10n_text: z.string.about_privacy, l10n_href: z.string.url_privacy"></a></li>
+      <li><a rel="nofollow noopener noreferrer" target="_blank" data-uie-name="go-legal" data-bind="l10n_text: z.string.about_legal, l10n_href: z.string.url_legal"></a></li>
+      <li><a rel="nofollow noopener noreferrer" target="_blank" data-uie-name="go-privacy" data-bind="l10n_text: z.string.about_privacy, l10n_href: z.string.url_privacy"></a></li>
     </ul>
     <footer data-bind="l10n_text: z.string.about_copyright + ' {{config.CURRENT_VERSION_DATE}}'"></footer>
   </div>

diff --git a/app/page/template/settings.htm b/app/page/template/settings.htm
@@ -99,8 +99,8 @@
             <!-- /ko -->
             <!-- ko if: delete_status() === 'dialog' -->
               <p data-uie-name="delete-confirm-text" data-bind="text: delete_confirm_text"></p>
-              <span class="button button-sm" data-uie-name="do-delete-account" data-bind="click: click_on_delete_send">Send</span>
-              <span class="button-label text-theme delete-cancel-button" data-uie-name="do-delete-cancel" data-bind="click: click_on_delete_cancel">Cancel</span>
+              <span class="button button-sm" data-uie-name="do-delete-account" data-bind="click: click_on_delete_send, l10n_text: z.string.modal_button_send"></span>
+              <span class="button-label text-theme delete-cancel-button" data-uie-name="do-delete-cancel" data-bind="click: click_on_delete_cancel, l10n_text: z.string.modal_button_cancel"></span>
             <!-- /ko -->
             <!-- ko if: delete_status() === 'sent' -->
               <span data-uie-name="delete-sent" data-bind="click: click_on_delete, l10n_text: z.string.preferences_email_sent"></span>