Suraj Shetty
17c462f4ed
Merge branch 'develop' into upgrade-jquery-3_6_0
2021-11-12 09:39:31 +05:30
Suraj Shetty
d25eb3a8c7
Merge branch 'develop' into ipython
2021-11-12 09:37:53 +05:30
Suraj Shetty
a3802beca7
Merge branch 'develop' into surajshetty3416-patch-1
2021-11-12 09:31:07 +05:30
Suraj Shetty
a73f47011d
Merge pull request #14949 from ankush/hf_patch_test
2021-11-12 09:28:03 +05:30
Suraj Shetty
9e8e80d41b
fix: Reload user doctype to avoid patch failure
2021-11-12 08:51:38 +05:30
Manuel
69d19da581
Merge branch 'frappe:develop' into multiple_imap_folder
2021-11-11 17:03:12 +01:00
ChillarAnand
4ceb179699
chore: Clean up requirements
2021-11-11 20:56:47 +05:30
Shariq Ansari
192a975d7f
build: Upgrade jQuery 3.5.0 to 3.6.0
2021-11-11 19:08:17 +05:30
Suraj Shetty
df862ddc45
Merge pull request #14943 from resilient-tech/fix-validate-link
2021-11-11 17:28:32 +05:30
Shariq Ansari
eb6a93f76d
fix: ignore route conflict validation for rename_custom_client_script patch
2021-11-11 16:29:04 +05:30
Shariq Ansari
d27d880402
fix: Dashboard Chart to support Child Table Doctype. ( #13995 )
...
* fix: Dashboard Chart with child table doctype
* test: UI test
* fix: Made Parent Document Type visible if Document Type is set
2021-11-11 15:09:58 +05:30
Shariq Ansari
67aab24bd0
test: fixed failing tests
2021-11-11 14:52:31 +05:30
mtraeber
c3f78c4770
Merge branch 'develop' into multiple_imap_folder
2021-11-11 09:44:38 +01:00
Manuel
b08dcc9122
Merge branch 'frappe:develop' into develop
2021-11-11 09:41:02 +01:00
Sagar Vora
cc5c153299
fix: remove console.log
2021-11-11 13:29:38 +05:30
Shariq Ansari
520336e6ee
test: Updated control_duration.js
2021-11-11 12:40:06 +05:30
Sagar Vora
1fd53c4306
test: intercept validate_link instead of get_value
2021-11-11 12:30:30 +05:30
Sagar Vora
af41d9f8a5
fix: stricter validation
2021-11-11 12:29:49 +05:30
Ankush Menat
b70251baba
ci: user hotfix branches for patch test
2021-11-11 12:25:03 +05:30
Sagar Vora
9503e7788a
fix: restore validate_link
2021-11-11 12:24:22 +05:30
mergify[bot]
20e3ed9ff9
revert: "feat(minor): Implement __getitem__ in Base Document" (backport #14945 ) ( #14946 )
...
* Revert "feat(minor): Implement __getitem__ in Base Document (#14855 )"
This reverts commit 583a7ef23923d362c85beeabe57703c2d5b12a65.
(cherry picked from commit d165fb3d477e65f7a395118f69278f2cb5c7f4e5)
* fix: keyerror in auto email report
(cherry picked from commit aac20f5d159875a5f3c9b4a6d74beec390e617dd)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-11 12:13:52 +05:30
Shariq Ansari
15daadf5a6
test: failing test fixes
2021-11-11 11:20:50 +05:30
Shariq Ansari
8f1e7b9704
test: failing test fixes
2021-11-10 22:16:37 +05:30
Shariq Ansari
9d4410efb9
Merge branch 'frappe:develop' into check-ui-test
2021-11-10 21:21:12 +05:30
Shariq Ansari
d0865a11b5
fix: removed dislike field, updated test, removed unused icons
2021-11-10 20:56:15 +05:30
Shariq Ansari
e62f2627e0
fix: some more changes in design
2021-11-10 20:42:56 +05:30
Jannat Patel
4c122ee7d6
style: button alignment and removed unused classes
2021-11-10 17:57:52 +05:30
Jannat Patel
c63e8de2dd
style: used variables
2021-11-10 16:57:42 +05:30
mergify[bot]
318d4faed2
Merge pull request #14874 from pateljannat/github-email-issue
...
fix: Github API endpoint
2021-11-10 11:19:59 +00:00
Shariq Ansari
990797080a
test: minor fixes
2021-11-10 12:42:34 +05:30
Shariq Ansari
ede1c41f67
test: UI test for editable grid pagination
2021-11-10 12:14:47 +05:30
Shariq Ansari
990b9f0ec3
test: Changing cypress browser to chrome
2021-11-10 11:45:53 +05:30
Shariq Ansari
0441059d2c
test: Updated grid_pagination UI Test
2021-11-10 11:32:53 +05:30
Suraj Shetty
1141b48c2e
Merge branch 'develop' into check-ui-test
2021-11-10 11:10:32 +05:30
Shariq Ansari
8778128109
fix: sider fix
2021-11-09 22:16:45 +05:30
Shariq Ansari
f02d289992
feat: Editable grid/table pagination
2021-11-09 21:01:21 +05:30
Ankush Menat
9f0a0512a6
fix(ux): better empty state
2021-11-09 18:50:14 +05:30
Ankush Menat
881143c308
feat: show human readable date and version
2021-11-09 18:40:51 +05:30
Ankush Menat
a8b3effa82
chore: sider, linting issues
2021-11-09 18:40:51 +05:30
Ankush Menat
18ba79222c
test: unit tests for diff.py utils
2021-11-09 18:40:51 +05:30
Ankush Menat
a116e3b92d
feat: show colors in diffview
2021-11-09 18:40:51 +05:30
Ankush Menat
5438c4cb9f
feat: diff client/server scripts
2021-11-09 18:40:51 +05:30
Ankush Menat
0cd1b3cc83
feat: diffview for comparing fields in two version
2021-11-09 18:40:51 +05:30
mergify[bot]
6457d58ece
Merge pull request #14928 from ankush/modified_nsm
...
fix: dont update `modified` for changes due to nsm implementation
2021-11-09 12:40:42 +00:00
Ankush Menat
6a50442936
refactor(minor): better variable names
2021-11-09 17:11:41 +05:30
Ankush Menat
fb929566cc
fix: don't change modified when updating lft/rgt
...
These are implementation details and not explicitly modified by user.
IMO these `modified` value shouldn't change just because node has moved
around due to NSM change.
as
2021-11-09 17:11:39 +05:30
Jannat Patel
27126889bd
fix: string translations and background variable
2021-11-09 16:02:21 +05:30
mergify[bot]
1787128b44
Merge pull request #14926 from codescientist703/remove-chat
...
chore: Remove Chat Module
2021-11-09 10:30:57 +00:00
Shariq Ansari
cbbf09e1cc
revert: 'test: Removing cypress ui test retry'
2021-11-09 15:36:56 +05:30
codescientist703
e8c25cf0f3
fix: added socketio initialization
2021-11-09 15:09:12 +05:30
