Aradhya-Tripathi
|
985d3476be
|
ci: trigger build
|
2021-10-05 11:36:31 +05:30 |
|
Suraj Shetty
|
5fad814863
|
Merge pull request #14357 from alyf-de/set-filter-context
|
2021-10-05 11:27:08 +05:30 |
|
Aradhya-Tripathi
|
d7f25ecb24
|
fix: fixed package_release
|
2021-10-05 11:23:35 +05:30 |
|
Devin Slauenwhite
|
d61d4214cf
|
Merge branch 'develop' into feat-bulk-rename-merge
|
2021-10-04 14:19:41 -04:00 |
|
Devin Slauenwhite
|
a8347c0b27
|
feat: allow bulk rename with merge
|
2021-10-04 14:15:54 -04:00 |
|
barredterra
|
9b19b41a55
|
feat: add context for "is (not) set" filter translations
|
2021-10-04 19:56:59 +02:00 |
|
Shariq Ansari
|
d04016d274
|
fix: Fixed css for Primary Navbar template
|
2021-10-04 21:57:10 +05:30 |
|
Shariq Ansari
|
214e5b89d8
|
fix: Filter pop-up overlaps the Notification Window
|
2021-10-04 20:56:44 +05:30 |
|
Pruthvi Patel
|
f2cf8981b5
|
fix: get abs path
|
2021-10-04 17:59:34 +05:30 |
|
Sagar Vora
|
cbbfdf33de
|
fix: use site path instead of site name to generate DB name
|
2021-10-04 17:49:21 +05:30 |
|
Suraj Shetty
|
590001d6eb
|
Merge pull request #14351 from resilient-tech/filter-on-ace-editor-field
|
2021-10-04 17:31:25 +05:30 |
|
Suraj Shetty
|
8ac7855a4a
|
Merge branch 'develop' into filter-on-ace-editor-field
|
2021-10-04 17:14:48 +05:30 |
|
Pruthvi Patel
|
d4b78e18a5
|
fix: filter on ace editor field
|
2021-10-04 16:06:47 +05:30 |
|
Suraj Shetty
|
6b3165ffb4
|
Merge pull request #14328 from shariquerik/webform-file-upload-fix
|
2021-10-04 16:03:39 +05:30 |
|
Suraj Shetty
|
9729ae708b
|
Merge pull request #14130 from rohitwaghchaure/user-wise-grid-settings
|
2021-10-04 13:53:19 +05:30 |
|
pateljannat
|
73f4f3fb7b
|
Merge branch 'develop' of https://github.com/frappe/frappe into discussions-single-topic
|
2021-10-04 13:16:38 +05:30 |
|
gavin
|
1385f9f468
|
Merge pull request #14342 from gavindsouza/serve-no-redis
fix: Remove Webserver's dependency on Redis
|
2021-10-04 12:42:46 +05:30 |
|
pateljannat
|
5f83045baf
|
feat: single thread discussions
|
2021-10-04 12:26:12 +05:30 |
|
Gavin D'souza
|
7c6fad09ee
|
fix: NoneType comparison flake8 E711
ref: https://www.flake8rules.com/rules/E711.html
|
2021-10-04 11:01:56 +05:30 |
|
Deepesh Garg
|
39ac03cf93
|
Merge branch 'develop' of https://github.com/frappe/frappe into server_script_enhancements
|
2021-10-04 11:00:11 +05:30 |
|
gavin
|
7ff461603f
|
Merge pull request #14344 from ankush/install_pycups_failure
fix: remove pycups from requirements
|
2021-10-04 10:59:47 +05:30 |
|
Deepesh Garg
|
4ebdabda48
|
fix: Encapsulate cache methods
|
2021-10-04 10:59:47 +05:30 |
|
Suraj Shetty
|
7b539922a0
|
Merge pull request #14332 from shariquerik/heatmap-legend-color
|
2021-10-04 10:59:32 +05:30 |
|
Suraj Shetty
|
4c699ec335
|
Merge pull request #14307 from shariquerik/twice-include-theme-for-apps
|
2021-10-04 10:57:06 +05:30 |
|
Suraj Shetty
|
fc4a9d2d5a
|
Merge branch 'develop' into twice-include-theme-for-apps
|
2021-10-04 10:55:08 +05:30 |
|
Ankush Menat
|
8904a1c7ad
|
fix: remove pycups from requirements
|
2021-10-04 10:40:15 +05:30 |
|
MitulDavid
|
b798b96deb
|
ci: Set Codecov flags to categorize coverage
|
2021-10-04 08:21:40 +05:30 |
|
Suraj Shetty
|
740485273a
|
Merge pull request #14226 from pateljannat/discussions
|
2021-10-04 07:29:29 +05:30 |
|
Rohit Waghchaure
|
d454aaf2f0
|
chore: added test case
|
2021-10-03 23:59:06 +05:30 |
|
Faris Ansari
|
4bdacf7d81
|
feat: Better Letterhead editing
- Image resize and align
|
2021-10-03 14:42:45 +05:30 |
|
Gavin D'souza
|
f37b954fbf
|
fix: get_assets_json w/o Redis too ;)
|
2021-10-03 12:30:52 +05:30 |
|
Aradhya-Tripathi
|
dadd7abad2
|
Merge branch 'develop' of https://github.com/Aradhya-Tripathi/frappe into at-refactor
|
2021-10-03 01:21:15 +05:30 |
|
Aradhya-Tripathi
|
b2a79ce91e
|
refactor: removed redundant imports
|
2021-10-03 01:19:29 +05:30 |
|
Rohit Waghchaure
|
c7d474b3a2
|
fix: columns width validation
|
2021-10-02 15:02:47 +05:30 |
|
Rohit Waghchaure
|
3c0d61f198
|
fix: code cleanup
|
2021-10-02 15:02:47 +05:30 |
|
Rohit Waghchaure
|
ddb0bef919
|
feat: user wise configure grid columns
|
2021-10-02 15:02:47 +05:30 |
|
gavin
|
fe82487c15
|
Merge pull request #14334 from rohitwaghchaure/errprint-for-server-script
feat: frappe.errprint in the server script for debugging
|
2021-10-01 15:59:35 +05:30 |
|
Rohit Waghchaure
|
5bd9be2437
|
feat: frappe.errprint in the server script for debugging
|
2021-10-01 15:35:28 +05:30 |
|
Shariq Ansari
|
c06194ce91
|
fix: Heatmap legend color not set when color theme is set
|
2021-10-01 13:08:52 +05:30 |
|
pateljannat
|
2df2032689
|
Merge branch 'develop' of https://github.com/frappe/frappe into discussions
|
2021-10-01 13:07:06 +05:30 |
|
pateljannat
|
fd57185bc9
|
style: indentation, etc
|
2021-10-01 13:04:57 +05:30 |
|
Suraj Shetty
|
384ad1ad26
|
Merge pull request #14327 from shariquerik/leaderboard-load-fix
|
2021-10-01 12:18:31 +05:30 |
|
Manuel
|
aae44405b9
|
Merge branch 'frappe:develop' into develop
|
2021-10-01 08:28:33 +02:00 |
|
Shariq Ansari
|
38d9d06cd3
|
Merge branch 'frappe:develop' into modal-scrollbar-fix
|
2021-10-01 11:29:04 +05:30 |
|
Shariq Ansari
|
0fc60c5af7
|
Merge branch 'frappe:develop' into webform-file-upload-fix
|
2021-10-01 11:27:55 +05:30 |
|
rohitwaghchaure
|
34c0920747
|
Merge pull request #14329 from KrithiRamani/new-arg-filename
feat: pass filename as argument to print_by_server
|
2021-10-01 09:49:15 +05:30 |
|
KrithiRamani
|
0e16fc03ad
|
Update requirements.txt
Added version no for pycups
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
|
2021-10-01 09:44:17 +05:30 |
|
KrithiRamani
|
ad89c1fcd8
|
Update frappe/utils/print_format.py
As suggested, moved new args to the end for supporting non-kwarg function calls.
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
|
2021-10-01 09:43:59 +05:30 |
|
gavin
|
fc1891f80b
|
Merge pull request #14320 from zerodha/save_doc
fix(Razorpay Settings): Save Errored Integration Request
|
2021-10-01 08:47:17 +05:30 |
|
gavin
|
b158d15c0a
|
Merge pull request #14310 from nextchamp-saqib/tree-get-node-event
feat: add on_get_node event in treeview
|
2021-10-01 08:46:36 +05:30 |
|