Commit graph

24483 commits

Author SHA1 Message Date
Faris Ansari
f8ca990a83 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-16 11:26:43 +05:30
mergify[bot]
ad65ad43c4
Merge pull request #13211 from prssanna/dependant-property-fix
fix: check if parentfield also exists
2021-05-16 03:08:42 +00:00
Leela vadlamudi
e48827a34a
Merge pull request #13220 from CaseSolvedUK/workspace-onlyfor-v13
fix: Allow only_for for Cards
2021-05-16 07:52:34 +05:30
Leela vadlamudi
19f4a73f8a
Merge pull request #13229 from josephalbaph/patch-9
fix: Invalid escape sequence
2021-05-16 07:16:38 +05:30
Leela vadlamudi
817a614648
Merge pull request #13228 from josephalbaph/patch-10
fix: Invalid escape sequence
2021-05-16 07:09:26 +05:30
Leela vadlamudi
788e0c2bcc
Merge pull request #13227 from josephalbaph/patch-11
fix: Invalid escape sequence
2021-05-16 07:08:59 +05:30
mergify[bot]
f5f20dcc40
Merge pull request #13231 from josephalbaph/patch-12
fix: DeprecationWarning: invalid escape sequence \<
2021-05-16 01:17:53 +00:00
Joseph Marie Alba
a13d208a28
fix: DeprecationWarning: invalid escape sequence \(
Python 3 interprets string literals as Unicode strings, and therefore \( is treated as an escaped Unicode character.

Declare RegEx pattern as a raw string instead by prepending r
2021-05-16 06:20:44 +08:00
Joseph Marie Alba
9795545fb6
fix: DeprecationWarning: invalid escape sequence \<
Python 3 interprets string literals as Unicode strings, and therefore your \< and \> are treated as an escaped Unicode character.

Declare your RegEx pattern as a raw string instead by prepending r
2021-05-16 06:13:14 +08:00
Joseph Marie Alba
62d81b7610
Python 3 issue with re
Python 3 interprets string literals as Unicode strings, and therefore \s is treated as an escaped Unicode character.

Declare RegEx pattern as a raw string instead by prepending r
2021-05-16 05:59:47 +08:00
Joseph Marie Alba
95bb5e5599
Python 3 issue with re
Python 3 interprets string literals as Unicode strings, and therefore \s is treated as an escaped Unicode character.

Declare your pattern as a raw string instead by prepending r
2021-05-16 05:55:35 +08:00
Joseph Marie Alba
c795a70897
Python 3 issue in re
Python 3 interprets string literals as Unicode strings, and therefore \d is treated as an escaped Unicode character.

Declare RegEx pattern as a raw string instead by prepending r or double escape \d
2021-05-16 05:52:05 +08:00
mergify[bot]
d84d02349c
Merge pull request #13212 from prssanna/grid-fix
fix: check if grid_rows exists
2021-05-14 06:39:35 +00:00
casesolved-co-uk
291ff654f8 fix: Allow only_for for Cards 2021-05-13 12:16:19 +00:00
gavin
6365037b81
Merge pull request #13145 from gavindsouza/misc-fixes-py3-1
fix: Misc fixes
2021-05-13 14:00:28 +05:30
prssanna
b75a1629fa fix: check if grid_rows exists 2021-05-13 13:58:26 +05:30
prssanna
ce24b0bb14 fix: check if parentfield also exists 2021-05-13 13:17:02 +05:30
mergify[bot]
6dd6d4c3e1
Merge pull request #13199 from rovertzxd/fix-svg-uploads
fix: svg files upload
2021-05-13 07:08:56 +00:00
Gavin D'souza
7930b84b71 Revert "fix(build): Use NamedTemporaryFile from mktemp"
This reverts commit 085290630e.
Breaks via https://github.com/frappe/frappe/pull/13145/checks?check_run_id=2573309928
2021-05-13 12:28:22 +05:30
Prssanna Desai
4b0e627c94
Merge pull request #13203 from prssanna/custom-print-format-fix
fix: check if df exists in get_formatted
2021-05-13 12:14:37 +05:30
Gavin D'souza
085290630e fix(build): Use NamedTemporaryFile from mktemp 2021-05-13 11:11:45 +05:30
Roberto Murguia
ad5506453e fix: svg files upload 2021-05-12 13:55:26 -05:00
Gavin D'souza
e0be2cc535 Merge branch 'develop' into misc-fixes-py3-1 2021-05-12 21:02:26 +05:30
Gavin D'souza
6581ed886a Revert "fix: Don't re-copy node_modules if public already has it"
This reverts commit 548eb079c8.

Seems to break UI components. Learnt this from Cypress UI tests
ref: https://github.com/frappe/frappe/pull/13145/checks?check_run_id=2567366717
2021-05-12 21:00:18 +05:30
Suraj Shetty
4d61098d67
Merge pull request #13165 from surajshetty3416/python-distributed-testing 2021-05-12 18:08:46 +05:30
prssanna
103fa1e31a fix: check if df exists in get_formatted 2021-05-12 16:40:56 +05:30
Suraj Shetty
0f94407e6d
Merge pull request #12969 from surajshetty3416/fix-sqli-report-get 2021-05-12 12:57:17 +05:30
Suraj Shetty
cb6f263001
Merge branch 'develop' into python-distributed-testing 2021-05-12 12:18:50 +05:30
mergify[bot]
0d0cb8b877
Merge pull request #13157 from hrwX/patch-3
fix: parse Today default value for date docfield
2021-05-12 06:24:10 +00:00
Suraj Shetty
110eb43914
Merge branch 'develop' into esbuild 2021-05-12 08:01:10 +05:30
mergify[bot]
75a8ab453e
Merge pull request #13192 from CaseSolvedUK/connapp-xero-v13
fix: connected app auto_refresh credentials and mandatory fields
2021-05-12 01:12:22 +00:00
Gavin D'souza
098f1564f3 refactor: bench build
* Deprecate --make-copy and --restore options for build in favour of --hard-link
* Show feedback for linking/copying application assets
2021-05-11 21:15:20 +05:30
Faris Ansari
f7c0561171 fix: Convert public fields to static fields 2021-05-11 20:13:32 +05:30
Gavin D'souza
548eb079c8 fix: Don't re-copy node_modules if public already has it
public folder already has a symlink to node_modules. So we can just
check if the realpath already exists and ignore copying it again if the
same exists
2021-05-11 20:09:21 +05:30
Faris Ansari
fb0f9180d0 fix: super call 2021-05-11 19:41:46 +05:30
Faris Ansari
bd487f7ef3 fix: method syntax 2021-05-11 18:21:20 +05:30
Faris Ansari
91b6818492 fix: set_date_options method call 2021-05-11 18:20:42 +05:30
Faris Ansari
d4b0be789f
Merge branch 'develop' into esbuild 2021-05-11 17:33:31 +05:30
Gavin D'souza
82685d2545 fix: Convert multi-line translation string to single 2021-05-11 16:11:49 +05:30
Faris Ansari
8eaf51f846
Merge pull request #13190 from netchampfaris/web-template-clear-cache
fix: Clear web page cache after web template is updated
2021-05-11 15:47:09 +05:30
casesolved-co-uk
095994a86c fix: connected app auto_refresh credentials and mandatory fields 2021-05-11 10:14:56 +00:00
Faris Ansari
17928f2d28 fix: Clear web page cache after web template is updated 2021-05-11 15:30:55 +05:30
Gavin D'souza
e18f080453 chore: Hide all warnings in bench console 2021-05-11 15:25:41 +05:30
Gavin D'souza
e54b1d5835 refactor: Link static assets from apps to sites/assets 2021-05-11 15:23:02 +05:30
Gavin D'souza
b5a121a1cb fix: Drop compatability code
* Use raw text for regex patterns to avoid Deprecation warnings
2021-05-11 15:19:35 +05:30
Suraj Shetty
9f862f39d5
Merge branch 'develop' into python-distributed-testing 2021-05-11 13:58:04 +05:30
Gavin D'souza
e7d089d1cb Merge branch 'develop' of github.com:frappe/frappe into misc-fixes-py3-1 2021-05-11 13:03:56 +05:30
Gavin D'souza
134b2dcd5c chore: Remove f prefix on plain string 2021-05-11 13:02:45 +05:30
Raffael Meyer
67ceab88ff
fix: translations (#12942)
* fix: get_messages_from_include_files
* feat: include labels of navbar items
* refactor: strip -> lstrip

Co-authored-by: gavin <gavin18d@gmail.com>
2021-05-11 12:28:15 +05:30
Suraj Shetty
be9b18191b refactor: Resolve deprecation warnings 2021-05-11 09:50:58 +05:30