Commit graph

35823 commits

Author SHA1 Message Date
abhishek
3ac65adb94 style: misc changes 2021-10-11 18:57:46 +05:30
MitulDavid
33bfd5bd19 fix: Private images in comments are not visible 2021-10-11 18:43:12 +05:30
abhishek
69d8eddf5a refactor: remove unused args
refactor: remove unused args
2021-10-11 17:23:17 +05:30
abhishek
822fdce4d6 fix: doctype doc hash creation 2021-10-11 17:23:17 +05:30
abhishek
278883edb0 fix: missing migration hash column 2021-10-11 17:23:17 +05:30
abhishek
b2b391e90a style: misc 2021-10-11 17:23:17 +05:30
Gavin D'souza
c3be3d35e8 fix: "function"al programming++ 2021-10-11 17:23:17 +05:30
Gavin D'souza
db6fc6a5fb feat: Hash based comparison migration 2021-10-11 17:23:17 +05:30
Shariq Ansari
6839f6b4db
Merge branch 'frappe:develop' into wspace-code-cleanup 2021-10-11 16:35:34 +05:30
mergify[bot]
3312deb97d
Merge pull request #14363 from Aradhya-Tripathi/at/safeqb
feat: Added safe query builder for server scripts
2021-10-11 10:42:36 +00:00
codescientist703
f1893b1c7b chore: remove chat module references and settings 2021-10-11 15:29:31 +05:30
codescientist703
d766b8f158 refactor: move chat utils to frappe utils 2021-10-11 15:28:49 +05:30
codescientist703
4576ab77d7 chore: remove chat module 2021-10-11 15:27:33 +05:30
Aradhya-Tripathi
5362d367d1 fix(minor): fixed execute_query patch 2021-10-11 14:15:01 +05:30
Aradhya-Tripathi
fe7b45c068 fix: fixing safeqb in server scripts 2021-10-11 14:01:17 +05:30
Manuel
82d4c2777a
Merge branch 'frappe:develop' into develop 2021-10-11 09:45:17 +02:00
Gavin D'souza
4e7be5b3ec Merge branch 'develop' of github.com:frappe/frappe into at/safeqb 2021-10-11 12:45:03 +05:30
Gavin D'souza
cfa2d65394 refactor(safe_exec): Manage in-safe frappe.db.sql
* Check if flag in_safe_exec to check if SELECT query in frappe.db.sql
* Get rid of read_sql...refactor logic
* Enable frappe.qb just like that ;)
* Add support fro *args in .run
2021-10-11 12:28:36 +05:30
pateljannat
f9104c846f fix: removed opacity and added lighter color to divider 2021-10-11 12:05:53 +05:30
gavin
c0380cdd06
Merge pull request #14401 from gavindsouza/better-replacing-sql
fix: Don't load entire SQL file into memory during restoration
2021-10-11 10:10:52 +05:30
mergify[bot]
06a5cfc0b1
Merge pull request #14325 from shariquerik/modal-scrollbar-fix
fix: Scrollbar is hidden when search modal is minimised
2021-10-11 04:22:37 +00:00
Suraj Shetty
11bf47d9f9
Merge branch 'develop' into modal-scrollbar-fix 2021-10-11 09:33:04 +05:30
mergify[bot]
0dbc9b3fa5
Merge pull request #14140 from deepeshgarg007/server_script_enhancements
feat: Enhancements in Server Script
2021-10-11 04:01:19 +00:00
Deepesh Garg
1127d3d184 fix: Restrict commit and rollback for doc events 2021-10-10 17:41:26 +05:30
Devin Slauenwhite
2c9f08997a
Merge branch 'frappe:develop' into feat-bulk-rename-merge 2021-10-09 13:10:04 -04:00
pateljannat
49af778401 style: make divider lider lighter 2021-10-08 18:17:16 +05:30
Gavin D'souza
e245c8da09 fix: Don't load entire db file into memory
Cleaning up my own mess :')
Read and write entire SQL file line by line
2021-10-08 18:15:12 +05:30
mergify[bot]
46c5dc9d3f
Merge pull request #14362 from shariquerik/change-drag-icon
fix: Changing the drag icon in list settings
2021-10-08 12:24:26 +00:00
Suraj Shetty
268f7a27bf
Merge branch 'develop' into modal-scrollbar-fix 2021-10-08 17:51:53 +05:30
mergify[bot]
ac816bacdf
Merge pull request #14397 from resilient-tech/fix-perm-delete
fix: unable to delete role permissions
2021-10-08 12:21:04 +00:00
Deepesh Garg
4f74f9e4e1 fix: Add rollback to safe_exec 2021-10-08 15:52:44 +05:30
Sagar Vora
a1ddd25dff fix: unable to delete role permissions 2021-10-08 15:36:58 +05:30
Deepesh Garg
34882227fb Merge branch 'develop' of https://github.com/frappe/frappe into server_script_enhancements 2021-10-08 15:11:27 +05:30
Suraj Shetty
e63845e86e
Merge pull request #14394 from surajshetty3416/shareable-link-for-comments 2021-10-08 14:19:39 +05:30
Suraj Shetty
7f24e10852 fix: Use promise to wait for all animations to complete 2021-10-08 13:54:16 +05:30
gavin
50121b0f5b
Merge pull request #14382 from frappe/mergify/bp/develop/pr-14321
fix: include 'Duration' in fieldtype to fetch (fix #13625) (backport #14321)
2021-10-08 11:41:28 +05:30
Ankush Menat
e6bbc698d0
ci: fail CI if asset bundling fails (#14364)
* ci: fail CI if asset bundling fails

* chore: formatting

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-10-08 11:40:31 +05:30
gavin
ce3e9244f0
Merge pull request #14371 from mituldavid/comment-imgs
fix: Make images in comments private
2021-10-08 11:39:18 +05:30
Shariq Ansari
f08584c06d fix: Fixed redirect to newly created workspace 2021-10-08 11:04:43 +05:30
gavin
9206635f81
Merge pull request #14393 from gavindsouza/py39
ci: Upgrade PY37 to PY39
2021-10-08 11:04:33 +05:30
Suraj Shetty
3a004d38db test: Fix flaky test
- Due to improper cleanup one of the test of Energy Point was failing
2021-10-08 09:39:31 +05:30
Suraj Shetty
efdd267cd5 Merge branch 'develop' of https://github.com/frappe/frappe into shareable-link-for-comments 2021-10-08 09:00:43 +05:30
Suraj Shetty
59e0501cc7 test: Fix timeline tests 2021-10-08 08:58:52 +05:30
Suraj Shetty
f1c5fc4fe6 feat: Shareable link for comments and communications
- Also, highlight comment/communication that has been shared.
2021-10-07 21:50:08 +05:30
Suraj Shetty
3537316a2a fix: Routing with hash in URL
- Hash in document name should be encoded
2021-10-07 20:40:44 +05:30
Gavin D'souza
42acb7647f ci: Upgrade Py37 to Py39 2021-10-07 20:33:50 +05:30
Shariq Ansari
f7ad01cb64 fix: Update check all checkbox based on checked rows in List View 2021-10-07 19:38:42 +05:30
gavin
a5fab59ab4
Merge pull request #14370 from sunhoww/patch-1
feat: expose frappe.db.exists to Server Script
2021-10-07 18:02:05 +05:30
rohitwaghchaure
5ac02d275a
Merge pull request #14388 from rohitwaghchaure/option-to-set-size-for-multi-select-dialog
feat: option to set the width for the multi-select dialog box
2021-10-07 17:37:42 +05:30
Rohit Waghchaure
6886036002 feat: option to set the width for the multi-select dialog box 2021-10-07 17:32:45 +05:30