Commit graph

32562 commits

Author SHA1 Message Date
Suraj Shetty
155b28cf51 ci: Update Job names
- Also, update mergify rules
2021-05-12 16:29:05 +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
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
Suraj Shetty
9f862f39d5
Merge branch 'develop' into python-distributed-testing 2021-05-11 13:58:04 +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
mergify[bot]
1c0233ccd8
Merge pull request #12993 from nextchamp-saqib/auto-repeat-dashboard-fix
fix: auto repeat schedule not rendered in the dashboard
2021-05-08 19:19:17 +00:00
Nabin Hait
fcdff6425f fix: merge conflict 2021-05-08 17:19:28 +05:30
Nabin Hait
0f64358f0b Merge branch 'version-13-pre-release' into version-13 2021-05-08 17:18:38 +05:30
Nabin Hait
0bbf7c89bf bumped to version 13.2.2 2021-05-08 17:38:38 +05:50
Suraj Shetty
579b712924
Merge pull request #13166 from frappe/mergify/bp/version-13-pre-release/pr-13098
fix(setup): do not show messsage when exception is handled (backport #13098)
2021-05-08 17:11:02 +05:30
Sagar Vora
bf33a80042 fix(setup): do not show messsage when exception is handled
(cherry picked from commit ac9fe71733)
2021-05-08 11:40:16 +00:00
Suraj Shetty
03d3d67b93 ci: Trial to fix coveralls 2021-05-08 15:49:15 +05:30
Suraj Shetty
13be89f049 style: Fix sider issues 2021-05-08 15:45:54 +05:30
gavin
c84feb16e9
fix: Avoid possible whitespace bug
* Handles semgrep warning
* Changed "" to None as a precaution against future whitespace bugs via human error

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-05-08 12:39:27 +05:30
Suraj Shetty
85f6f47edc Merge branch 'develop' of https://github.com/frappe/frappe into python-distributed-testing 2021-05-08 11:27:42 +05:30
Suraj Shetty
00b6a6729d ci: Use right parallel test runner command
- Also, fix coverage & coveralls setup
2021-05-07 21:59:58 +05:30
Suraj Shetty
2c54549677 feat: Make parallel test independent of test orchestrator 2021-05-07 21:58:43 +05:30
shariquerik
e7552413b4 refactor: minor fix 2021-05-07 18:10:59 +05:30
Gavin D'souza
926d13e69e fix: Skip field-method conflicts validation on new docs 2021-05-07 18:02:25 +05:30
Leela vadlamudi
9d3b993b71
Merge pull request #13144 from ankush/test_create_app
test: add unittest for creating new app using boilerplate
2021-05-07 13:39:24 +05:30
Himanshu
e737e2ea52
fix: parse Today default value for date docfield
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
2021-05-07 12:03:58 +05:30
Leela vadlamudi
2b758a61b4
Merge pull request #13096 from shariquerik/duplicate-standard-notification-fix
fix: Allow to duplicate standard notification
2021-05-07 11:45:22 +05:30
Suraj Shetty
d61bb8c3cc
Merge pull request #13155 from frappe/surajshetty3416-patch-1
fix: Typo
2021-05-07 11:41:32 +05:30
Suraj Shetty
a2bb92f6a4
fix: Typo 2021-05-07 11:40:42 +05:30
Suraj Shetty
eac9a1e4a1
Merge pull request #13153 from surajshetty3416/fix-style-7th-may 2021-05-07 11:04:06 +05:30
Suraj Shetty
db3e04d2c4 Merge branch 'develop' of https://github.com/frappe/frappe into fix-style-7th-may 2021-05-07 10:49:00 +05:30
Ankush Menat
e9a3569bf7
test: check if created python files are parsable 2021-05-07 10:34:46 +05:30
Ankush Menat
835ed181b5
test: delete created test_app in tearDownClass 2021-05-07 10:34:17 +05:30