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

34800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ankush Menat
ae88fca3ef
refactor: split remove_app in smaller functions 2021-10-12 16:52:17 +05:30
Suraj Shetty
05231f97f8
Merge pull request #14424 from frappe/fix-group-by-child-table-field 2021-10-12 14:20:36 +05:30
Suraj Shetty
18df0b0f8c test: Fix test 2021-10-12 13:46:06 +05:30
Suraj Shetty
74ec9657da test: Update aggregation test 2021-10-12 13:36:30 +05:30
Suraj Shetty
828d158e4d
Merge pull request #14380 from pateljannat/discussions-single-topic 2021-10-12 13:35:42 +05:30
Mohammad Hasnain Mohsin Rajan
b3465f7972
Merge pull request #14429 from anupamvs/customize-print-format-btn-issue 
fix: Customize is not listed in menu item [Print]
 2021-10-12 13:01:00 +05:30
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
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
MitulDavid
33bfd5bd19 fix: Private images in comments are not visible 2021-10-11 18:43:12 +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
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
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
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
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
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