vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
32595 commits 1 branch 0 tags 587 MiB
Commit graph

32595 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Ankush Menat
4d7f5a8f8d
ci: fix semgrep false positives (#13161) 
* ci: fix false positive rule for split js translate

- limit regex to must match end of line.
- expand previous check to take care of other ways to split multi-line
  calls.

* ci: update tests for rules, ignore rules in sider

* ci: enable semgrep on v13 branches

* ci: fix false positive for python split strings
 2021-05-12 20:22:48 +05:30
Suraj Shetty
4d61098d67
Merge pull request #13165 from surajshetty3416/python-distributed-testing 2021-05-12 18:08:46 +05:30
Suraj Shetty
a34a278e06 chore: Update .mergify.yml 2021-05-12 17:57:37 +05:30
prssanna
103fa1e31a fix: check if df exists in get_formatted 2021-05-12 16:40:56 +05:30
Suraj Shetty
155b28cf51 ci: Update Job names 
- Also, update mergify rules
 2021-05-12 16:29:05 +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
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
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
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
mergify[bot]
46e4963d86
Merge pull request #13106 from sgtpepper9907/fix-row-docfields-on-webform 
fix: Use docfields from options if no docfields are returned from meta
 2021-05-10 18:26:06 +00:00
Suraj Shetty
ed2a3aa589 ci: Add test orchestrator URL 2021-05-10 23:48:32 +05:30
Suraj Shetty
6bf9f47a2a Merge branch 'develop' of https://github.com/frappe/frappe into python-distributed-testing 2021-05-10 20:39:10 +05:30
Suraj Shetty
803741466d fix: Sort dependency options for predictability 2021-05-10 18:38:36 +05:30
Suraj Shetty
cae0169881
Merge pull request #13177 from surajshetty3416/fix-save-action 2021-05-10 16:17:37 +05:30
Suraj Shetty
0d937cda27 fix: Get ORCHESTRATOR_URL from secrets 2021-05-10 16:14:36 +05:30
Suraj Shetty
b31a18372a
Merge branch 'develop' into fix-save-action 2021-05-10 15:27:56 +05:30
Leela vadlamudi
2374290935
Merge pull request #13142 from shariquerik/revert-naming-fix 
fix: Revert naming for custom naming series
 2021-05-10 14:02:56 +05:30
gavin
a094cbee56
Merge pull request #12242 from gavindsouza/dont-call-dynamic-properties 
fix: Don't evaluate dynamic properties to check if conflicts exist
 2021-05-10 13:57:50 +05:30
shariquerik
9919ddff2a fix: sider fix 2021-05-10 12:56:15 +05:30
shariquerik
e0efefd9e5 refactor: Used re.search also added examples 2021-05-10 12:54:04 +05:30
Suraj Shetty
1829fd3a2b ci: Run tests using orchestrator 2021-05-10 12:46:02 +05:30
Suraj Shetty
36d6d224df fix: Do not skip text in save while using shortcut 2021-05-10 12:18:37 +05:30
Suraj Shetty
3c4306c87a refactor: Fix regex to avoid deprecation warnings 2021-05-10 09:18:50 +05:30
Suraj Shetty
e1fec81ae3 feat: Add option to run parallel test with orchestrator 2021-05-09 11:27:58 +05:30
Suraj Shetty
76348b892f refactor: Move parallel test runner code to a separate file 2021-05-09 09:32:28 +05:30
shariquerik
8995e8e9db refactor: remove unnecessary code 2021-05-09 06:24:20 +05:30