hrwx
87b1e9af00
Merge branch 'develop' of github.com:frappe/frappe into multi_timezone_support
2021-11-15 14:24:59 +00:00
Faris Ansari
ead05f062d
fix: minor website styling fixes ( #14952 )
...
* fix: move utility classes from page header wrapper
so that css is overridable in user stylesheets
* fix(website-theme): obey button rounded corners setting
- set border radius values to 0
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-11-15 16:16:19 +05:30
mergify[bot]
1e33f38353
Merge pull request #14916 from pateljannat/discussions-better-empty-state
...
style: Discussions better empty state
2021-11-12 10:44:58 +00:00
Jannat Patel
88ddb7d93c
docs: comment added
2021-11-12 15:22:50 +05:30
mergify[bot]
64a1cc43c9
Merge pull request #14958 from ChillarAnand/ipython
...
chore: Clean up requirements
2021-11-12 08:53:42 +00:00
Summayya Hashmani
88550c1672
fix(Signup Page): Last Step Page style ( #14853 )
...
* fix: template not found
* refactor: scomplete signup page layout
* refactor: Simplify code
Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-11-12 07:25:54 +00:00
Suraj Shetty
619fa164ff
Merge branch 'develop' into ipython
2021-11-12 12:26:59 +05:30
mergify[bot]
f555394070
Merge pull request #14957 from resilient-tech/fix-link
...
fix: cleaner implementation for link validation
2021-11-12 06:19:41 +00:00
mergify[bot]
ee3b9f9221
Merge pull request #14956 from shariquerik/upgrade-jquery-3_6_0
...
build: Upgrade jQuery v3.5.0 to v3.6.0
2021-11-12 06:10:22 +00:00
Suraj Shetty
bc4c1c1eff
Merge branch 'develop' into fix-link
2021-11-12 11:29:04 +05:30
mergify[bot]
5c3a1be02e
Merge pull request #14565 from shariquerik/check-ui-test
...
test: Cypress flaky test
2021-11-12 05:55:18 +00:00
Sagar Vora
0b0f896258
fix: cleaner implementation for link validation
2021-11-12 10:36:21 +05:30
mergify[bot]
07c8c1ffad
Merge pull request #14530 from resilient-tech/fix-esbuild-cleanup
...
refactor: a better way to cleanup older assets when newer ones are built
2021-11-12 04:59:58 +00:00
Suraj Shetty
66d1b08d06
Merge branch 'develop' into check-ui-test
2021-11-12 10:29:14 +05:30
Suraj Shetty
063fa5fd7c
Merge pull request #14961 from frappe/surajshetty3416-patch-1
2021-11-12 10:05:51 +05:30
Jannat Patel
3c20137972
fix: svg
2021-11-12 09:54:07 +05:30
Suraj Shetty
7c70efe9e2
Merge branch 'develop' into fix-esbuild-cleanup
2021-11-12 09:48:02 +05:30
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
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
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
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
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
990b9f0ec3
test: Changing cypress browser to chrome
2021-11-10 11:45:53 +05:30
Suraj Shetty
1141b48c2e
Merge branch 'develop' into check-ui-test
2021-11-10 11:10:32 +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
