[PR #2530] [MERGED] chore: merge remote-tracking branch 'main' into develop #5281

New issue

Closed

opened 2026-03-23 22:18:02 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:18:02 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/2530
Author: @richardshiue
Created: 5/14/2023
Status: ✅ Merged
Merged: 5/15/2023
Merged by: @appflowy

Base: develop ← Head: merge-main

📝 Commits (10+)

db8d030 feat: show unscheduled events in calendar toolbar (#2411)
5d0a349 fix: default include time (#2444)
a2e9d63 chore: bump version 0.1.4 (#2455)
06f056a chore: Update README.md
6731037 fix: wrong day of week (#2468)
4a1714b feat: select which properties to show in calendar (#2482)
2b72821 feat: improve sidebar item dragged appearance (#2471)
151ee89 fix: show delete icon for document icon properly (#2475)
f0a4b4b feat: add hover effect on an event card (#2487)
bd5250a chore: update editor v0.1.12 and format the readme (#2489)

📊 Changes

30 files changed (+516 additions, -473 deletions)

View changed files

📝 .github/workflows/release.yml (+1 -1)
📝 CHANGELOG.md (+22 -0)
📝 README.md (+5 -3)
📝 frontend/Makefile.toml (+1 -1)
📝 frontend/appflowy_flutter/assets/translations/en.json (+3 -1)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart (+23 -39)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart (+34 -22)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart (+8 -5)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_setting.dart (+25 -0)
📝 frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dart (+103 -7)
📝 frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/container/card_container.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart (+20 -2)
📝 frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_editor.dart (+14 -5)
📝 frontend/appflowy_flutter/lib/plugins/document/document_page.dart (+3 -0)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/cover/emoji_popover.dart (+41 -46)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/emoji_picker/emoji_menu_item.dart (+23 -19)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/section.dart (+4 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart (+2 -0)
📝 frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj (+1 -0)

...and 10 more files

📄 Description

Submitting this PR since there are some messy conflicts due to diversion in the date calculation logic. I've tried my best to make sure that there aren't mitigations, but more testing is welcome.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/2530 **Author:** [@richardshiue](https://github.com/richardshiue) **Created:** 5/14/2023 **Status:** ✅ Merged **Merged:** 5/15/2023 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `develop` ← **Head:** `merge-main` --- ### 📝 Commits (10+) - [`db8d030`](https://github.com/AppFlowy-IO/AppFlowy/commit/db8d030a85df2fa25e5df39d59ed718786bdae84) feat: show unscheduled events in calendar toolbar (#2411) - [`5d0a349`](https://github.com/AppFlowy-IO/AppFlowy/commit/5d0a3492364b5f3dbefa3bf7b59a4a960ae6b01d) fix: default include time (#2444) - [`a2e9d63`](https://github.com/AppFlowy-IO/AppFlowy/commit/a2e9d63f63d0aebdb354a366983d16c01c7cfd74) chore: bump version 0.1.4 (#2455) - [`06f056a`](https://github.com/AppFlowy-IO/AppFlowy/commit/06f056aa4b19dba0fc9169667b32cb1785afaaa4) chore: Update README.md - [`6731037`](https://github.com/AppFlowy-IO/AppFlowy/commit/6731037a8c77502172c0ad23eda2c51e47befa34) fix: wrong day of week (#2468) - [`4a1714b`](https://github.com/AppFlowy-IO/AppFlowy/commit/4a1714b537983b2cec7a4a1c9f4b6c57a7f19bf1) feat: select which properties to show in calendar (#2482) - [`2b72821`](https://github.com/AppFlowy-IO/AppFlowy/commit/2b7282195b0496fa23d21231ca78a575944d59a2) feat: improve sidebar item dragged appearance (#2471) - [`151ee89`](https://github.com/AppFlowy-IO/AppFlowy/commit/151ee8985598a3467168a1dd458bf3a5a7e163f7) fix: show delete icon for document icon properly (#2475) - [`f0a4b4b`](https://github.com/AppFlowy-IO/AppFlowy/commit/f0a4b4b77d9e88637dd04a4a2377396b825f2b94) feat: add hover effect on an event card (#2487) - [`bd5250a`](https://github.com/AppFlowy-IO/AppFlowy/commit/bd5250ae2f02d18f4ea7d7e0fce867e40ad9ee26) chore: update editor v0.1.12 and format the readme (#2489) ### 📊 Changes **30 files changed** (+516 additions, -473 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/release.yml` (+1 -1) 📝 `CHANGELOG.md` (+22 -0) 📝 `README.md` (+5 -3) 📝 `frontend/Makefile.toml` (+1 -1) 📝 `frontend/appflowy_flutter/assets/translations/en.json` (+3 -1) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart` (+23 -39) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart` (+34 -22) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart` (+8 -5) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_setting.dart` (+25 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dart` (+103 -7) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/container/card_container.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart` (+20 -2) 📝 `frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_editor.dart` (+14 -5) 📝 `frontend/appflowy_flutter/lib/plugins/document/document_page.dart` (+3 -0) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/cover/emoji_popover.dart` (+41 -46) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/emoji_picker/emoji_menu_item.dart` (+23 -19) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/app/section/section.dart` (+4 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/menu.dart` (+2 -0) 📝 `frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj` (+1 -0) _...and 10 more files_ </details> ### 📄 Description Submitting this PR since there are some messy conflicts due to diversion in the date calculation logic. I've tried my best to make sure that there aren't mitigations, but more testing is welcome. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>