Skip to content

Commit fe33a33

Browse files
committed
Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into bigEmoj
# Conflicts: # Telegram/SourceFiles/core/version.h # Telegram/lib_ui
2 parents 41b4810 + 6229c00 commit fe33a33

File tree

381 files changed

+11225
-3863
lines changed

Some content is hidden

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

381 files changed

+11225
-3863
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Clone.
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
submodules: recursive
2323

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- name: Clone.
62-
uses: actions/checkout@v4
62+
uses: actions/checkout@v5
6363
with:
6464
submodules: recursive
6565

.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
5757

5858
- name: Clone.
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v5
6060
with:
6161
submodules: recursive
6262
path: ${{ env.REPO_NAME }}

.github/workflows/mac_packaged.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
6161

6262
- name: Clone.
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v5
6464
with:
6565
submodules: recursive
6666
path: ${{ env.REPO_NAME }}

.github/workflows/master_updater.yml

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,9 @@ on:
55
types: released
66

77
jobs:
8-
updater:
8+
User-agent:
99
runs-on: ubuntu-latest
10-
env:
11-
SKIP: "0"
12-
to_branch: "master"
1310
steps:
14-
- uses: actions/checkout@v4
11+
- uses: desktop-app/action_code_updater@master
1512
with:
16-
fetch-depth: 0
17-
if: env.SKIP == '0'
18-
- name: Push the code to the master branch.
19-
if: env.SKIP == '0'
20-
run: |
21-
token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
22-
if [ -z "${token}" ]; then
23-
echo "Token is unset. Nothing to do."
24-
exit 0
25-
fi
26-
27-
url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
28-
latest_tag=$(git describe --tags --abbrev=0)
29-
echo "Latest tag: $latest_tag"
30-
31-
git remote set-url origin $url
32-
git remote -v
33-
git checkout master
34-
git merge $latest_tag
35-
36-
git push origin HEAD:refs/heads/$to_branch
37-
echo "Done!"
13+
type: "dev-to-master"

.github/workflows/snap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
steps:
4949
- name: Clone.
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@v5
5151
with:
5252
fetch-depth: 0
5353
submodules: recursive
@@ -61,7 +61,7 @@ jobs:
6161
sudo lxd waitready
6262
6363
- name: Free up some disk space.
64-
uses: endersonmenezes/free-disk-space@4cae28d0d8e716a770938d92630f23db5184f61f
64+
uses: endersonmenezes/free-disk-space@713d134e243b926eba4a5cce0cf608bfd1efb89a
6565
with:
6666
remove_android: true
6767
remove_dotnet: true

.github/workflows/user_agent_updater.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
schedule:
77
# At 00:00 on day-of-month 1.
88
- cron: "0 0 1 * *"
9-
pull_request_target:
10-
types: [closed]
119

1210
jobs:
1311
User-agent:

.github/workflows/win.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
push:
55
paths-ignore:
66
- 'docs/**'
7-
- '!docs/building-win*.md'
87
- '**.md'
8+
- '!docs/building-win*.md'
99
- 'changelog.txt'
1010
- 'LEGAL'
1111
- 'LICENSE'
@@ -23,8 +23,8 @@ on:
2323
pull_request:
2424
paths-ignore:
2525
- 'docs/**'
26-
- '!docs/building-win*.md'
2726
- '**.md'
27+
- '!docs/building-win*.md'
2828
- 'changelog.txt'
2929
- 'LEGAL'
3030
- 'LICENSE'
@@ -72,7 +72,7 @@ jobs:
7272
run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
7373

7474
- name: Clone.
75-
uses: actions/checkout@v4
75+
uses: actions/checkout@v5
7676
with:
7777
submodules: recursive
7878
path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}

Telegram/CMakeLists.txt

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,8 @@ PRIVATE
523523
data/notify/data_notify_settings.h
524524
data/notify/data_peer_notify_settings.cpp
525525
data/notify/data_peer_notify_settings.h
526+
data/notify/data_peer_notify_volume.cpp
527+
data/notify/data_peer_notify_volume.h
526528
data/stickers/data_custom_emoji.cpp
527529
data/stickers/data_custom_emoji.h
528530
data/stickers/data_stickers_set.cpp
@@ -634,6 +636,8 @@ PRIVATE
634636
data/data_report.h
635637
data/data_saved_messages.cpp
636638
data/data_saved_messages.h
639+
data/data_saved_music.cpp
640+
data/data_saved_music.h
637641
data/data_saved_sublist.cpp
638642
data/data_saved_sublist.h
639643
data/data_search_controller.cpp
@@ -813,6 +817,8 @@ PRIVATE
813817
history/view/media/history_view_poll.h
814818
history/view/media/history_view_premium_gift.cpp
815819
history/view/media/history_view_premium_gift.h
820+
history/view/media/history_view_save_document_action.cpp
821+
history/view/media/history_view_save_document_action.h
816822
history/view/media/history_view_service_box.cpp
817823
history/view/media/history_view_service_box.h
818824
history/view/media/history_view_similar_channels.cpp
@@ -876,6 +882,8 @@ PRIVATE
876882
history/view/history_view_fake_items.h
877883
history/view/history_view_group_call_bar.cpp
878884
history/view/history_view_group_call_bar.h
885+
history/view/history_view_group_members_widget.cpp
886+
history/view/history_view_group_members_widget.h
879887
history/view/history_view_item_preview.h
880888
history/view/history_view_list_widget.cpp
881889
history/view/history_view_list_widget.h
@@ -1046,6 +1054,11 @@ PRIVATE
10461054
info/reactions_list/info_reactions_list_widget.h
10471055
info/requests_list/info_requests_list_widget.cpp
10481056
info/requests_list/info_requests_list_widget.h
1057+
info/saved/info_saved_music_common.h
1058+
info/saved/info_saved_music_provider.cpp
1059+
info/saved/info_saved_music_provider.h
1060+
info/saved/info_saved_music_widget.cpp
1061+
info/saved/info_saved_music_widget.h
10491062
info/saved/info_saved_sublists_widget.cpp
10501063
info/saved/info_saved_sublists_widget.h
10511064
info/settings/info_settings_widget.cpp
@@ -1119,6 +1132,8 @@ PRIVATE
11191132
inline_bots/inline_results_widget.h
11201133
intro/intro_code.cpp
11211134
intro/intro_code.h
1135+
intro/intro_email.cpp
1136+
intro/intro_email.h
11221137
intro/intro_password_check.cpp
11231138
intro/intro_password_check.h
11241139
intro/intro_phone.cpp
@@ -1274,6 +1289,8 @@ PRIVATE
12741289
menu/menu_antispam_validator.h
12751290
menu/menu_item_download_files.cpp
12761291
menu/menu_item_download_files.h
1292+
menu/menu_item_rate_transcribe_session.cpp
1293+
menu/menu_item_rate_transcribe_session.h
12771294
menu/menu_mute.cpp
12781295
menu/menu_mute.h
12791296
menu/menu_send.cpp
@@ -1307,6 +1324,8 @@ PRIVATE
13071324
mtproto/special_config_request.cpp
13081325
mtproto/special_config_request.h
13091326
mtproto/type_utils.h
1327+
overview/overview_checkbox.cpp
1328+
overview/overview_checkbox.h
13101329
overview/overview_layout.cpp
13111330
overview/overview_layout.h
13121331
overview/overview_layout_delegate.h
@@ -1427,10 +1446,6 @@ PRIVATE
14271446
platform/platform_window_title.h
14281447
profile/profile_back_button.cpp
14291448
profile/profile_back_button.h
1430-
profile/profile_block_group_members.cpp
1431-
profile/profile_block_group_members.h
1432-
profile/profile_block_peer_list.cpp
1433-
profile/profile_block_peer_list.h
14341449
profile/profile_block_widget.cpp
14351450
profile/profile_block_widget.h
14361451
profile/profile_cover_drop_area.cpp
@@ -1625,8 +1640,6 @@ PRIVATE
16251640
ui/text/format_song_document_name.h
16261641
ui/widgets/expandable_peer_list.cpp
16271642
ui/widgets/expandable_peer_list.h
1628-
ui/widgets/label_with_custom_emoji.cpp
1629-
ui/widgets/label_with_custom_emoji.h
16301643
ui/widgets/chat_filters_tabs_strip.cpp
16311644
ui/widgets/chat_filters_tabs_strip.h
16321645
ui/widgets/peer_bubble.cpp
@@ -1659,6 +1672,8 @@ PRIVATE
16591672
window/window_adaptive.h
16601673
window/window_chat_preview.cpp
16611674
window/window_chat_preview.h
1675+
window/window_chat_switch_process.cpp
1676+
window/window_chat_switch_process.h
16621677
window/window_connecting_widget.cpp
16631678
window/window_connecting_widget.h
16641679
window/window_controller.cpp
1.31 KB
Binary file not shown.

0 commit comments

Comments
 (0)