Commit graph

36088 commits

Author SHA1 Message Date
Anupam
f6e83dbcaf fix: Customize is not listed in menu item [Print] 2021-10-12 12:35:40 +05:30
Suraj Shetty
ab00980389
refactor: Use f-string
Co-authored-by: gavin <gavin18d@gmail.com>
2021-10-12 12:06:08 +05:30
Suraj Shetty
8febefae9c test: Add test case to validate aggregation
- based on child table field
2021-10-12 12:05:05 +05:30
Suraj Shetty
c6538cf318
Merge branch 'develop' into discussions-single-topic 2021-10-12 11:41:04 +05:30
Suraj Shetty
14ae20bdb8 fix: Push aggregate_on_field to field list
- for proper extraction of child table
2021-10-12 09:54:09 +05:30
abhishek
86f29aeaa3 fix: missing logical cases
- handle first time imports
- update hash and timestamps
2021-10-12 03:21:08 +05:30
barredterra
9ac748dc30 feat: allow tuple of doctypes as key 2021-10-11 19:45:06 +02:00
mergify[bot]
d7edd05a5d
Merge pull request #14309 from shariquerik/hide-show-filter
fix: Hide 'Show Saved' filter button if there is no saved filters
2021-10-11 14:30:45 +00:00
Mohammad Hasnain Mohsin Rajan
b7de4b3cae
Merge pull request #14355 from shariquerik/notification_overlap_filter
fix: Filter pop-up overlaps the Notification Window
2021-10-11 19:36:19 +05:30
Shariq Ansari
875f35ec14
fix: Rate limiter on blog feedback (#14322)
* fix: Added rate limiter on blog feedback

* test: Updated test to support rate limiter
2021-10-11 19:35:51 +05:30
mergify[bot]
20c38aa704
Merge pull request #14414 from mituldavid/comment-imgs
fix: Private images in comments are not visible
2021-10-11 13:43:36 +00:00
Gavin D'souza
2622f3398e style: Black-ish queries
* feat(minor): Added DocType to frappe.query_builder namespace
2021-10-11 19:00:52 +05:30
abhishek
f3d810414a refactor: sync_for() - first install module 2021-10-11 18:59:06 +05:30
abhishek
0be59cee80 chore: add missing document_types 2021-10-11 18:59:06 +05:30
abhishek
547111841a refactor: sql in update_modified() to frappe.qb 2021-10-11 18:58:15 +05:30
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