Danilo Bargen пре 7 година
родитељ
комит
135a8d411e
6 измењених фајлова са 27 додато и 90 уклоњено
  1. 21 84
      CHANGELOG.md
  2. 1 1
      package-lock.json
  3. 1 1
      package.json
  4. 1 1
      public/i18n/de.json
  5. 1 1
      public/i18n/en.json
  6. 2 2
      src/config.ts

+ 21 - 84
CHANGELOG.md

@@ -3,105 +3,48 @@
 This changelog lists the most important changes for each released version. For
 the full log, please refer to the git commit history.
 
-### [v2.0.0-beta.8][v2.0.0-beta.8] (2018-07-24)
+### [v2.0.0][v2.0.0] (2018-08-02)
 
-Changes:
-
-* [change] Upgraded a lot of dependencies ([#522][i522])
-* [change] Some minor protocol changes ([#528][i528])
-
-### [v2.0.0-beta.7][v2.0.0-beta.7] (2018-07-03)
-
-Changes:
-
-* [feature] Show a message when copying text to the clipboard ([#517][i517])
-* [change] Hide battery icon after 1 minute without connectivity
-* [change] Disable flashing of "low battery" icon due to browser
-  performance issues ([#519][i519])
-* [bug] Fix a lot of UI performance issues ([#480][i480])
-
-### [v2.0.0-beta.6][v2.0.0-beta.6] (2018-06-26)
-
-Changes:
-
-* [feature] Show three blue dots for verified Threema Work contacts
-* [feature] Implement non-work indicator for Threema Work users
-* [feature] Add message timeout state
-* [feature] Show a title text for all message state icons
-* [bug] Ignore status messages when marking as unread
-* [bug] Fix "unread messages" indicator
-
-### [v2.0.0-beta.5][v2.0.0-beta.5] (2018-06-12)
-
-Changes:
-
-* [feature] Implement "copy to clipboard" functionality
-* [bug] Fix closing of chat when deleting conversation
-* [bug] Fix bug when processing messages that were sent when not connected
-* [bug] Improve scrolling behavior
-
-Contributors:
-
-- [@heckenmann][@heckenmann]
-
-### [v2.0.0-beta.4][v2.0.0-beta.4] (2018-06-11)
-
-Changes:
-
-* [change] iOS: Status bar should stay green on connection loss
-* [bug] When entering the wrong password, re-enable the input field
-* [bug] Clear all "isTyping" flags when connection is lost
-* [bug] Handle unknown battery status
-* [bug] German translation fixes
-
-Contributors:
-
-- [@JanRei][@JanRei]
-
-### [v2.0.0-beta.3][v2.0.0-beta.3] (2018-06-05)
-
-Changes:
-
-* [feature] Hide inactive IDs in contact list ([#4][i4])
-* [change] Link version number at the bottom of the webapp to changelog
-* [bug] Properly sort contacts
-* [bug] Fix error message when adding an invalid contact identity
-
-### [v2.0.0-beta.2][v2.0.0-beta.2] (2018-06-04)
-
-Changes:
+This release changes the protocol version from 1 to 2. It provides preliminary
+support for iOS devices (currently in beta). It also improves the performance
+and responsiveness of Threema Web.
 
-* [change] Update icon / favicon for various platforms ([#503][i503])
-* [bug] Fix mime type handling for audio messages
-* [bug] Prevent double-download of audio messages
-
-### [v2.0.0-beta.1][v2.0.0-beta.1] (2018-05-29)
-
-This is the first beta release with support for Threema Web on iOS devices. It
-also changes the protocol version from 1 to 2.
+For the detailed list of changes, see the list below.
 
 Changes:
 
-* [feature] Add support for iOS ([#58][i58])
+* [feature] Add preliminary support for iOS / Safari, currently in Beta ([#58][i58])
 * [feature] Allow viewing and editing your own profile ([#221][i221])
 * [feature] Show message events ([#32][i32])
 * [feature] Large single emoji ([#97][i97])
 * [feature] Show distribution list members ([#472][i472])
 * [feature] Add "Navigate to" entry to location message context menu
-* [feature] Add support for Safari 11+ (with iOS devices only)
 * [feature] Implement support for new per-conversation notification settings
+* [feature] Hide inactive IDs in contact list ([#4][i4])
+* [feature] Implement "copy to clipboard" functionality
+* [feature] Show three blue dots for verified Threema Work contacts
+* [feature] Implement non-work indicator for Threema Work users
 * [change] Threema Web protocol version upgrade from 1 to 2
 * [change] When downloading media, filename now contains timestamp
+* [bug] Fix a lot of UI performance issues ([#480][i480])
 * [bug] Saving profile without setting picture won't reset it anymore ([#154][i154])
 * [bug] Fix race condition in password field ([#445][i445])
+* [bug] When entering the wrong password, re-enable the input field
 * [bug] Fix broken conversation preview ([#393][i393])
 * [bug] Make message caption mouse-selectable ([#303][i303])
+* [bug] Fix error message when adding an invalid contact identity
+* [bug] Fix closing of chat when deleting conversation
+* [bug] Improve scrolling behavior ([#18][i18])
+* [bug] Fix "unread messages" indicator
 
 Contributors:
 
+- [@heckenmann][@heckenmann]
 - [@IndianaDschones][@IndianaDschones]
+- [@JanRei][@JanRei]
 - [@ovalseven8][@ovalseven8]
 
+
 ### [v1.8.2][v1.8.2] (2018-02-21)
 
 Changes:
@@ -389,6 +332,7 @@ First public release.
 [i8]: https://github.com/threema-ch/threema-web/issues/8
 [i11]: https://github.com/threema-ch/threema-web/issues/11
 [i17]: https://github.com/threema-ch/threema-web/issues/17
+[i18]: https://github.com/threema-ch/threema-web/issues/18
 [i20]: https://github.com/threema-ch/threema-web/issues/20
 [i29]: https://github.com/threema-ch/threema-web/issues/29
 [i32]: https://github.com/threema-ch/threema-web/issues/32
@@ -532,14 +476,7 @@ First public release.
 [i522]: https://github.com/threema-ch/threema-web/issues/522
 [i528]: https://github.com/threema-ch/threema-web/issues/528
 
-[v2.0.0-beta.8]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.7...v2.0.0-beta.8
-[v2.0.0-beta.7]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.6...v2.0.0-beta.7
-[v2.0.0-beta.6]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.5...v2.0.0-beta.6
-[v2.0.0-beta.5]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.4...v2.0.0-beta.5
-[v2.0.0-beta.4]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.3...v2.0.0-beta.4
-[v2.0.0-beta.3]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.2...v2.0.0-beta.3
-[v2.0.0-beta.2]: https://github.com/threema-ch/threema-web/compare/v2.0.0-beta.1...v2.0.0-beta.2
-[v2.0.0-beta.1]: https://github.com/threema-ch/threema-web/compare/v1.8.2...v2.0.0-beta.1
+[v2.0.0]: https://github.com/threema-ch/threema-web/compare/v1.8.2...v2.0.0
 [v1.8.2]: https://github.com/threema-ch/threema-web/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/threema-ch/threema-web/compare/v1.8.0...v1.8.1
 [v1.8.0]: https://github.com/threema-ch/threema-web/compare/v1.7.0...v1.8.0

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "description": "Threema Webclient",
   "scripts": {
     "build": "npm run build:js && npm run build:css",

+ 1 - 1
public/i18n/de.json

@@ -43,7 +43,7 @@
         "VERSION": "Version",
         "BACKGROUND_IMAGE": "Hintergrundbild",
         "NEW_VERSION": "Neue Version von Threema Web",
-        "NEW_VERSION_DETAILS": "Diese Version von Threema Web setzt <strong>Threema 3.45 für Android</strong> voraus. Falls Sie eine ältere Threema-Version verwenden, <strong>aktualisieren Sie bitte die App</strong>.<br><br>Wenn Sie die Threema-App nicht aktualisieren können, nutzen Sie vorübergehend die archivierte Version von Threema Web: <a href=\"https://web.threema.ch/archive/1.8.2/\">web.threema.ch/archive/1.8.2</a>",
+        "NEW_VERSION_DETAILS": "Diese Version von Threema Web setzt <strong>Threema 3.5 für Android</strong> voraus. Falls Sie eine ältere Threema-Version verwenden, <strong>aktualisieren Sie bitte die App</strong>.<br><br>Wenn Sie die Threema-App nicht aktualisieren können, nutzen Sie vorübergehend die archivierte Version von Threema Web: <a href=\"https://web.threema.ch/archive/1.8.2/\">web.threema.ch/archive/1.8.2</a>",
         "NOTIFICATION_IOS_BETA": "iOS Beta-User? Bitte benutzen Sie <a href=\"https://web-beta.threema.ch/\">web-beta.threema.ch</a>.",
         "NOTIFICATION_NEW_RELEASE": "Eine neue Version von Threema Web wurde veröffentlicht. Bitte aktualisieren Sie Ihre App oder verwenden Sie die <a href=\"https://web.threema.ch/archive/1.8.2/\">letzte Version</a>."
     },

+ 1 - 1
public/i18n/en.json

@@ -43,7 +43,7 @@
         "VERSION": "Version",
         "BACKGROUND_IMAGE": "Background Image",
         "NEW_VERSION": "New Threema Web Version",
-        "NEW_VERSION_DETAILS": "This version of Threema Web requires <strong>Threema 3.45 for Android</strong>. If you are using an older Threema version, <strong>please update the app</strong>.<br><br>If you are unable to update the Threema app, you can temporarily use the archived version of Threema Web: <a href=\"https://web.threema.ch/archive/1.8.2/\">web.threema.ch/archive/1.8.2</a>",
+        "NEW_VERSION_DETAILS": "This version of Threema Web requires <strong>Threema 3.5 for Android</strong>. If you are using an older Threema version, <strong>please update the app</strong>.<br><br>If you are unable to update the Threema app, you can temporarily use the archived version of Threema Web: <a href=\"https://web.threema.ch/archive/1.8.2/\">web.threema.ch/archive/1.8.2</a>",
         "NOTIFICATION_IOS_BETA": "Using the iOS beta? Please go to <a href=\"https://web-beta.threema.ch/\">web-beta.threema.ch</a>.",
         "NOTIFICATION_NEW_RELEASE": "A new version of Threema Web was released. Make sure to update your app or use the <a href=\"/archive/1.8.2/\">previous version of Threema Web</a>."
     },

+ 2 - 2
src/config.ts

@@ -12,10 +12,10 @@ export default {
     VERSION_MOUNTAIN_IMAGE_URL: 'https://commons.wikimedia.org/wiki/File:Die_Mythen.jpg',
     VERSION_MOUNTAIN_HEIGHT: 1898,
     PREV_PROTOCOL_LAST_VERSION: '1.8.2',
-    GIT_BRANCH: 'ios',
+    GIT_BRANCH: 'master',
 
     // SaltyRTC
-    SALTYRTC_HOST: 'saltyrtc-beta.threema.ch',
+    SALTYRTC_HOST: null,
     SALTYRTC_HOST_PREFIX: 'saltyrtc-',
     SALTYRTC_HOST_SUFFIX: '.threema.ch',
     SALTYRTC_PORT: 443,