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

32884 commits

This branch
This branch
All branches
Author SHA1 Message Date
marination
29adcef4f0 fix: Use css variable for color 2021-05-11 19:16:09 +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
Nabin Hait
ac5c2c1bf9 fix: merge conflict 2021-05-11 16:10:07 +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
Suraj Shetty
6f359bedbc
Merge pull request #13188 from frappe/mergify/bp/version-13-hotfix/pr-13106 
fix: Use docfields from options if no docfields are returned from meta (backport #13106)
 2021-05-11 09:46:23 +05:30
Suraj Shetty
4ce21b6379
Merge pull request #13182 from frappe/mergify/bp/version-13-hotfix/pr-13177 
fix: Do not skip data in save while using shortcut (backport #13177)
 2021-05-11 09:17:19 +05:30
David Angulo
df05f3ae82 fix: Use docfields from options if no docfields are returned from meta 
(cherry picked from commit b7b92845f0)
 2021-05-10 18:32:25 +00:00
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
gavin
e31ecafb64
Merge pull request #13186 from frappe/mergify/bp/version-13-hotfix/pr-12242 
fix: Don't evaluate dynamic properties to check if conflicts exist (backport #12242)
 2021-05-10 19:12:56 +05:30
Suraj Shetty
803741466d fix: Sort dependency options for predictability 2021-05-10 18:38:36 +05:30
gavin
86d2989c52 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>
(cherry picked from commit c84feb16e9)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
1eb84ad5e5 fix: Skip field-method conflicts validation on new docs 
(cherry picked from commit 926d13e69e)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
34372e278e fix: Use older logic to set module_name and custom vars 
(cherry picked from commit 87ed7796de)
 2021-05-10 13:04:47 +00:00
Gavin D'souza
b343db84a0 fix: Use fallback values if doctype values unset 
(cherry picked from commit 877f9d08df)
 2021-05-10 13:04:46 +00:00
Gavin D'souza
56606ebc44 refactor: Rename function and add docstring 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 843c544117)
 2021-05-10 13:04:46 +00:00
Gavin D'souza
8d8a6cbd5d fix: Check for db value if cache doesn't exist 
in get_controller, if cached value doesn't exist for a DocType in the
frappe.db.value_cache, then query the db as fallback before the final
fallback of assuming module as Core and non custom

(cherry picked from commit 05712abc60)
 2021-05-10 13:04:45 +00:00
Gavin D'souza
804e4e212d fix: Use Document in case get_controller raises import errors 
(cherry picked from commit a3b79081d6)
 2021-05-10 13:04:45 +00:00
Gavin D'souza
1e55ab34c3 fix: Ignore 'special' DocTypes to avoid breaking changes 
eg:

Fieldname 'Delete' conflicting with a controller method of the name delete in Custom DocPerm
Fieldname 'Delete' conflicting with a controller method of the name delete in DocPerm
Fieldname 'Precision' conflicting with a controller method of the name precision in Custom Field
Fieldname 'Precision' conflicting with a controller method of the name precision in Customize Form Field
Fieldname 'Precision' conflicting with a controller method of the name precision in DocField

(cherry picked from commit ce4253c631)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
b200b6dbb6 chore: Drop dead file 
(cherry picked from commit 78e1297392)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
0b06a67aee feat: Validate field name conflicts in DocType.validate 
# Conflicts:
#	frappe/core/doctype/doctype/doctype.py

(cherry picked from commit c652c7b7f5)
 2021-05-10 13:04:44 +00:00
Gavin D'souza
f7f400985b chore: Rename function to validate conflicting methods and properties 
(cherry picked from commit 255a959a3e)
 2021-05-10 13:04:43 +00:00
Gavin D'souza
1154753a6f fix: Don't execute dynamic properties to check if conflicts exist 
(cherry picked from commit 9aa2f366dd)
 2021-05-10 13:04:43 +00:00
marination
5a490f7325 chore: Add global style for radio buttons 2021-05-10 17:07:48 +05:30
Suraj Shetty
3b4382bf8b fix: Do not skip text in save while using shortcut 
(cherry picked from commit 36d6d224df)
 2021-05-10 10:53:18 +00:00
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
barredterra
cb21e9de84 fix: 'Meta' object has no attribute 'is_tree' 2021-05-10 12:39:00 +02:00
barredterra
4a5f8dd23d fix: ignore lft and rgt when migrating a tree doctype 2021-05-10 12:19:41 +02:00
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
rohitwaghchaure
4f408730bb
Merge pull request #13149 from rohitwaghchaure/cherk-delete-permission 
fix: show delete button on portal if user has permission to delete document
 2021-05-10 12:49:21 +05:30
Suraj Shetty
1829fd3a2b ci: Run tests using orchestrator 2021-05-10 12:46:02 +05:30