Commit Graph

7587 Commits

Author SHA1 Message Date
Satish Gandham
ef5f7ebbd9 Merge pull request #540 from makeplane/sync/ce-ee
sync: community changes
2024-07-02 16:17:31 +05:30
Anmol Singh Bhatia
b591203da6 [WEB-1679] chore: relation and attachment icons (#5005)
* chore: attachment icon improvement

* chore: relation and dropdown icon added

* chore: code refactor
2024-07-02 16:15:42 +05:30
Prateek Shourya
78e0405971 [WEB-1801] improvement: open shortcut guide using shift+/ key combination. (#5000) 2024-07-02 16:14:42 +05:30
guru_sainath
26040144fc [WEB-1792] chore: integrated inbox issue in notification peek view and handled increment/decrement of unread notifications (#5008)
* chore: added a boolean field in notification list

* chore: notification filters changed

* chore: handled inbox notification and typo on the card items

* chore: handled notification count increment and decrement

* chore: typos and ui updates

---------

Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
2024-07-02 16:12:27 +05:30
Prateek Shourya
0fd36257d7 [WEB-1814] chore: update OIDC and SAML logo. (#5009)
* [WEB-1814] chore: update OIDC and SAML logo.

* chore: update OIDC logo.
2024-07-02 16:11:57 +05:30
gurusainath
91e0ca5ea3 Merge branch 'develop' of gurusainath:makeplane/plane-ee into develop 2024-07-02 15:51:59 +05:30
Anmol Singh Bhatia
c217185b07 chore: open on hover functionality added to custom menu (#5003) 2024-07-02 14:53:17 +05:30
Anmol Singh Bhatia
a5628c4ce1 fix: issue link count mutation (#5006) 2024-07-02 14:53:05 +05:30
Satish Gandham
c3ace3ab86 Merge pull request #539 from makeplane/sync/ce-ee
sync: community changes
2024-07-02 13:16:03 +05:30
Prateek Shourya
764e08140c [WEB-1814] chore: admin app UI & UX improvements. (#4999) 2024-07-02 12:58:45 +05:30
sriram veeraghanta
aab82ea452 Merge pull request #537 from makeplane/preview
release: v1.2.0-rc7
2024-07-01 20:47:11 +05:30
sriram veeraghanta
27abd0af2e Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 20:34:06 +05:30
sriram veeraghanta
abe6fecca0 fix: yarn lock updates 2024-07-01 20:33:35 +05:30
sriram veeraghanta
22b4d866a9 Merge pull request #538 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 20:31:15 +05:30
guru_sainath
26be5dac14 chore: handled notification error styling (#4996) 2024-07-01 20:30:14 +05:30
Dan Byler
35f78e8cfb responsive styles for recent-collborators (#4958) 2024-07-01 20:28:54 +05:30
pushya22
bd412cb546 Merge pull request #536 from makeplane/develop
Promote develop to preview
2024-07-01 19:33:47 +05:30
Satish Gandham
25cdc20c66 Merge pull request #535 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 19:32:25 +05:30
Prateek Shourya
03f7685f8b [WEB-1810] style: fix issue with screen height on all layouts when peek overview is opened. (#4994) 2024-07-01 19:30:41 +05:30
sriram veeraghanta
b73f860291 Merge pull request #533 from makeplane/preview
release: v1.2.0-rc6
2024-07-01 18:09:19 +05:30
sriram veeraghanta
109184544d Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 17:44:44 +05:30
sriram veeraghanta
2d478952d1 Merge pull request #534 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 17:43:58 +05:30
Nikhil
662ca62876 dev: add logging to saml authentication and fix oidc error (#531) 2024-07-01 17:42:08 +05:30
sriram veeraghanta
d62654e1d5 fix: upgrading turbo 2024-07-01 17:39:55 +05:30
pushya22
7bfefd0816 Merge pull request #532 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 17:33:51 +05:30
Prateek Shourya
6e379b93b4 [WEB-1802] chore: remove redirection logic from security settings page if the user password is not setup. (#4992) 2024-07-01 17:31:48 +05:30
sriram veeraghanta
bd81c78dca Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 17:27:32 +05:30
sriram veeraghanta
97600df697 Merge pull request #530 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 17:07:41 +05:30
Aaryan Khandelwal
e78263e01f [WEB-1689] fix: command enter submits the form (#4986)
* fix: command enter submits the form

* fix: build errors
2024-07-01 17:00:53 +05:30
guru_sainath
936c21d65e chore: handled Notification error (#4990) 2024-07-01 16:59:59 +05:30
sriram veeraghanta
b6a33e1973 Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 16:06:59 +05:30
sriram veeraghanta
041ef7a139 fix: build errors 2024-07-01 16:06:22 +05:30
sriram veeraghanta
0cd6b65cd6 Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 15:57:04 +05:30
sriram veeraghanta
06717e29ee Merge pull request #529 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 15:49:26 +05:30
sriram veeraghanta
c586bb9aa1 fix: merge conflicts 2024-07-01 15:49:12 +05:30
Bavisetti Narayan
e824c37f36 [WEB-1790] chore: delete view permission change (#4981)
* chore: preventing race condition

* chore: added delete view validation
2024-07-01 15:41:28 +05:30
dependabot[bot]
830d4045be chore(deps): bump djangorestframework in /apiserver/requirements (#4987)
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.15.1 to 3.15.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.15.1...3.15.2)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 15:40:13 +05:30
Aaryan Khandelwal
439d678763 fix: handle issue details error (#4979) 2024-07-01 15:25:50 +05:30
M. Palanikannan
f3347c5430 [WEB-1736] fix: drag drop task list (#4959)
* fix: drag drop issues with h4,h5,h6,images and drag handle position in tables solved

* fix: drag drop fixed for task lists

* fix: drag drop fixed for task lists

* fix: drag drop task list items
2024-07-01 15:22:23 +05:30
M. Palanikannan
fa2cfbbb1b fix: padding inside the blockquotes inside list items (#4983) 2024-07-01 15:18:21 +05:30
rahulramesha
184c3332eb modify default filter options for views (#4984) 2024-07-01 15:18:15 +05:30
guru_sainath
c2150687a6 [WEB-1792] chore: handled loader state and empty state in notification issue peekoverview (#4985)
* chore: handled loader state and empty state in notification issue peekoverview

* chore: code beautyfication
2024-07-01 15:12:03 +05:30
sriram veeraghanta
7de01a31b0 Merge branch 'develop' of github.com:makeplane/plane-ee into preview 2024-07-01 14:54:03 +05:30
sriram veeraghanta
886734fa9e Merge pull request #527 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 14:43:17 +05:30
Anmol Singh Bhatia
f2694e0be4 [WEB-1791] fix: issue delete redirection (#4980)
* fix: issue delete redirection

* fix: issue delete toast alert
2024-07-01 13:46:06 +05:30
M. Palanikannan
ab2e96a915 fix: fix multiline copy paste (#4978) 2024-07-01 13:18:35 +05:30
Satish Gandham
81b4c9c0aa Merge pull request #526 from makeplane/sync/ce-ee
sync: community changes
2024-07-01 13:03:58 +05:30
Prateek Shourya
712a3f0a80 chore: update current-plan API SWR config to avoid unwanted API calls. (#525) 2024-07-01 13:02:47 +05:30
M. Palanikannan
7d4bb3e12b Fix: image insertion in node boundaries and missing extensions (#4977)
* fix: insertion of image at node boundaries fixed

* fix: remove unecessary things

* fix: history conflicting

* fix: generate json from html properly
2024-07-01 12:49:10 +05:30
pushya22
e6c47ced9c Merge pull request #521 from makeplane/develop
Promote: Dev to Preview
2024-06-28 21:02:55 +05:30