Skip to content

Commit 37cbcd5

Browse files
committed
Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into telegramdesktop-dev
2 parents 30af6ce + ec427ad commit 37cbcd5

File tree

541 files changed

+14764
-5151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+14764
-5151
lines changed

.github/workflows/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
8787
docker run --rm \
8888
-v $PWD:/usr/src/tdesktop \
89-
-e DEBUG=1 \
89+
-e CONFIG=Debug \
9090
tdesktop:centos_env \
9191
/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
9292
-D CMAKE_C_FLAGS_DEBUG="" \

.github/workflows/mac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
macos:
4343
name: MacOS
44-
runs-on: macos-12
44+
runs-on: macos-13
4545

4646
strategy:
4747
matrix:

.github/workflows/mac_packaged.yml

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
7474
7575
xcodebuild -version > CACHE_KEY.txt
76+
brew list --versions >> CACHE_KEY.txt
7677
echo $MANUAL_CACHING >> CACHE_KEY.txt
7778
echo "$GITHUB_WORKSPACE" >> CACHE_KEY.txt
7879
if [ "$AUTO_CACHING" = "1" ]; then

.github/workflows/no-response.yml

+29-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,38 @@ on:
99
- cron: '0 0 * * *'
1010

1111
jobs:
12-
noResponse:
12+
waiting-for-answer:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: lee-dohm/no-response@v0.5.0
1616
with:
1717
token: ${{ github.token }}
18-
# Label requiring a response
1918
responseRequiredLabel: waiting for answer
19+
20+
needs-user-action:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: lee-dohm/no-response@v0.5.0
24+
with:
25+
token: ${{ github.token }}
26+
responseRequiredLabel: needs user action
27+
28+
cant-reproduce:
29+
if: github.event_name != 'issue_comment'
30+
runs-on: ubuntu-latest
31+
steps:
32+
- uses: lee-dohm/no-response@v0.5.0
33+
with:
34+
token: ${{ github.token }}
35+
responseRequiredLabel: cant reproduce
36+
closeComment: >
37+
This issue has been automatically closed because no developer succeeded to
38+
reproduce the issue with the given reproduction steps. With only the
39+
information that is currently in the issue, we don't have enough
40+
information to take action. Please reach out if you find what's missing to
41+
reproduce the issue so that we can investigate further.
42+
43+
44+
Note that GitHub is a developer communication platform. If you're an ordinary
45+
user seeking for help, get to support crew via `Settings -> Ask question` in
46+
the application.

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ include(cmake/options.cmake)
6060

6161
if (NOT DESKTOP_APP_USE_PACKAGED)
6262
if (WIN32)
63-
set(qt_version 5.15.11)
63+
set(qt_version 5.15.12)
6464
elseif (APPLE)
65-
set(qt_version 6.2.6)
65+
set(qt_version 6.2.7)
6666
endif()
6767
endif()
6868
include(cmake/external/qt/package.cmake)

LEGAL

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
This file is part of Telegram Desktop,
1+
This file is part of rabbitGram Desktop,
22
the desktop application for the Telegram messaging service.
33

4-
Copyright (c) 2023 xmdnusr and RabbitsInIT Team.
4+
Copyright (c) 2023-2024 xmdnusr.
55

66
rabbitGram Desktop is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by

Telegram/CMakeLists.txt

+10-5
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ PRIVATE
406406
chat_helpers/tabbed_section.h
407407
chat_helpers/tabbed_selector.cpp
408408
chat_helpers/tabbed_selector.h
409+
chat_helpers/ttl_media_layer_widget.cpp
410+
chat_helpers/ttl_media_layer_widget.h
409411
core/application.cpp
410412
core/application.h
411413
core/base_integration.cpp
@@ -513,6 +515,7 @@ PRIVATE
513515
data/data_groups.h
514516
data/data_histories.cpp
515517
data/data_histories.h
518+
data/data_lastseen_status.h
516519
data/data_location.cpp
517520
data/data_location.h
518521
data/data_media_rotation.cpp
@@ -609,6 +612,8 @@ PRIVATE
609612
dialogs/dialogs_row.h
610613
dialogs/dialogs_search_from_controllers.cpp
611614
dialogs/dialogs_search_from_controllers.h
615+
dialogs/dialogs_search_tags.cpp
616+
dialogs/dialogs_search_tags.h
612617
dialogs/dialogs_widget.cpp
613618
dialogs/dialogs_widget.h
614619
dialogs/ui/dialogs_layout.cpp
@@ -671,8 +676,6 @@ PRIVATE
671676
history/view/controls/history_view_ttl_button.h
672677
history/view/controls/history_view_voice_record_bar.cpp
673678
history/view/controls/history_view_voice_record_bar.h
674-
history/view/controls/history_view_voice_record_button.cpp
675-
history/view/controls/history_view_voice_record_button.h
676679
history/view/controls/history_view_webpage_processor.cpp
677680
history/view/controls/history_view_webpage_processor.h
678681
history/view/media/history_view_call.cpp
@@ -748,6 +751,8 @@ PRIVATE
748751
history/view/reactions/history_view_reactions_strip.h
749752
history/view/reactions/history_view_reactions_tabs.cpp
750753
history/view/reactions/history_view_reactions_tabs.h
754+
history/view/history_view_about_view.cpp
755+
history/view/history_view_about_view.h
751756
history/view/history_view_bottom_info.cpp
752757
history/view/history_view_bottom_info.h
753758
history/view/history_view_contact_status.cpp
@@ -1012,6 +1017,7 @@ PRIVATE
10121017
media/audio/media_audio.h
10131018
media/audio/media_audio_capture.cpp
10141019
media/audio/media_audio_capture.h
1020+
media/audio/media_audio_capture_common.h
10151021
media/audio/media_audio_ffmpeg_loader.cpp
10161022
media/audio/media_audio_ffmpeg_loader.h
10171023
media/audio/media_audio_loader.cpp
@@ -1227,8 +1233,6 @@ PRIVATE
12271233
platform/mac/touchbar/mac_touchbar_manager.mm
12281234
platform/mac/touchbar/mac_touchbar_media_view.h
12291235
platform/mac/touchbar/mac_touchbar_media_view.mm
1230-
platform/win/audio_win.cpp
1231-
platform/win/audio_win.h
12321236
platform/win/file_utilities_win.cpp
12331237
platform/win/file_utilities_win.h
12341238
platform/win/launcher_win.cpp
@@ -1252,7 +1256,6 @@ PRIVATE
12521256
platform/win/windows_autostart_task.h
12531257
platform/win/windows_toast_activator.cpp
12541258
platform/win/windows_toast_activator.h
1255-
platform/platform_audio.h
12561259
platform/platform_file_utilities.h
12571260
platform/platform_launcher.h
12581261
platform/platform_integration.cpp
@@ -1427,6 +1430,8 @@ PRIVATE
14271430
ui/widgets/level_meter.h
14281431
ui/countryinput.cpp
14291432
ui/countryinput.h
1433+
ui/dynamic_thumbnails.cpp
1434+
ui/dynamic_thumbnails.h
14301435
ui/filter_icons.cpp
14311436
ui/filter_icons.h
14321437
ui/filter_icon_panel.cpp
63.6 KB
Binary file not shown.
776 Bytes
1.39 KB
2.07 KB
561 Bytes
1011 Bytes
919 Bytes
753 Bytes
212 Bytes
267 Bytes
368 Bytes
283 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
634 Bytes
1.14 KB
1.68 KB
692 Bytes
1.31 KB
1.92 KB
614 Bytes
1.07 KB
1.58 KB
593 Bytes
374 Bytes
690 Bytes
528 Bytes

Telegram/Resources/icons/win_quit.png

406 Bytes
686 Bytes
952 Bytes

0 commit comments

Comments
 (0)