Alpha version 1.2.5:

- When viewing a photo from an album, you'll see other pictures from the same group as thumbnails in the lower part of the screen. - When composing an album paste additional media from the clipboard. - Bug fixes and other minor improvements.
Sea-n · Dec 29, 2017 · 719f342 · 719f342
1 parent 2df4d19
commit 719f342
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 15 deletions.
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="1.2.4.0" />
+    Version="1.2.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.2.4.0"
+            VALUE "FileVersion", "1.2.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2017"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.2.4.0"
+            VALUE "ProductVersion", "1.2.5.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.2.4.0"
+            VALUE "FileVersion", "1.2.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2017"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.2.4.0"
+            VALUE "ProductVersion", "1.2.5.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
@@ -65,7 +65,18 @@ std::map<int, const char*> AlphaLogs() {
 		"when sharing multiple photos and videos.\n"
 
 		"\xE2\x80\x94 Bug fixes and other minor improvements."
-	}
+	},
+	{
+		1002005,
+		"\xE2\x80\x94 When viewing a photo from an album, "
+		"you'll see other pictures from the same group "
+		"as thumbnails in the lower part of the screen.\n"
+
+		"\xE2\x80\x94 When composing an album paste "
+		"additional media from the clipboard.\n"
+
+		"\xE2\x80\x94 Bug fixes and other minor improvements."
+	},
 	};
 }
 

diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
@@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #define BETA_VERSION_MACRO (0ULL)
 
-constexpr int AppVersion = 1002004;
-constexpr str_const AppVersionStr = "1.2.4";
+constexpr int AppVersion = 1002005;
+constexpr str_const AppVersionStr = "1.2.5";
 constexpr bool AppAlphaVersion = true;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/build/version b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         1002004
+AppVersion         1002005
 AppVersionStrMajor 1.2
-AppVersionStrSmall 1.2.4
-AppVersionStr      1.2.4
+AppVersionStrSmall 1.2.5
+AppVersionStr      1.2.5
 AlphaChannel       1
 BetaVersion        0
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+1.2.5 alpha (29.12.17)
+
+- When viewing a photo from an album, you'll see other pictures from the same group as thumbnails in the lower part of the screen.
+- When composing an album paste additional media from the clipboard.
+- Bug fixes and other minor improvements.
+
 1.2.4 alpha (26.12.17)
 
 - Group media into an album when sharing multiple photos and videos.