Commit graph

1876 commits

Author SHA1 Message Date
Suraj Shetty
e2d3b54cc3 fix: Navbar 2020-08-25 21:35:58 +05:30
Suraj Shetty
0c929a4435 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-25 14:34:31 +05:30
mergify[bot]
7ce4013068
fix: if db_type is not defined then set default to 'mariadb' (bp #11346) (#11349)
(cherry picked from commit 927cd03341c33ffb82e5db373066a7ba239c1491)

Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-08-25 13:05:49 +05:30
Rushabh Mehta
f2fe49b5e1
Merge pull request #11328 from rmehta/safe-exec-sql
feat(server script): Allow frappe.db.sql for read
2020-08-24 17:46:09 +05:30
Rushabh Mehta
275a70e9d0 feat(minor): allow frappe.db.sql for read in server script 2020-08-20 18:33:29 +05:30
Shivam Mishra
c2500f0593
Merge branch 'develop' into allow-get-print 2020-08-20 08:41:52 +00:00
prssanna
ea3917e199 fix: wrap text editor fieldtype with ql-snow class 2020-08-19 16:55:48 +05:30
Suraj Shetty
e929c9a053
Merge branch 'develop' into redirect_url 2020-08-17 21:18:06 +05:30
Rushabh Mehta
137df8290b fix(sider): fix sider issues 2020-08-17 09:41:54 +05:30
Rushabh Mehta
b0b5a56566 fix(minor): in install, load doctype_action and doctype_link before doctype 2020-08-17 09:41:54 +05:30
Rushabh Mehta
77018fc9d6 fix(cleanup): cleanup layout of doctype, user, role, add home_page to Portal Settings, Role 2020-08-17 09:41:54 +05:30
Deepesh Garg
8b1d3a098a Merge branch 'develop' of https://github.com/frappe/frappe into toggle_full_width 2020-08-15 13:05:04 +05:30
Deepesh Garg
ecacb4cc4e fix: Add missing Toggle Full Width action in Navbar Settings 2020-08-15 12:57:30 +05:30
mergify[bot]
e819c75734
Merge pull request #11217 from gavindsouza/rename-backups
fix: fetch correct backup files
2020-08-15 06:04:50 +00:00
Gavin D'souza
c2ea55b0c0 style: Black 2020-08-14 17:22:48 +05:30
Shivam Mishra
e8691b4d54 feat: allow get_print and attach print in server scripts 2020-08-13 14:36:07 +05:30
mergify[bot]
f688bb3ac6
Merge pull request #11116 from nextchamp-saqib/invalid-date-filter
fix: throw message for invalid date filter
2020-08-12 12:20:17 +00:00
mergify[bot]
1ab68dd917
Merge pull request #11213 from deepeshgarg007/configurable_navbar
feat: Configurable navbar logo and dropdowns
2020-08-12 11:57:09 +00:00
Suraj Shetty
1ff9bdca9a
Merge branch 'develop' into invalid-date-filter 2020-08-12 16:47:59 +05:30
Raffael Meyer
0bfba240cf
feat: allow long passwords (#11065)
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-08-12 16:09:59 +05:30
Deepesh Garg
445161fcf6 Merge branch 'develop' of https://github.com/frappe/frappe into configurable_navbar 2020-08-11 22:40:12 +05:30
Saqib Ansari
2076a81d29 fix: catch only expected error 2020-08-10 17:52:26 +05:30
Suraj Shetty
4863d511ab Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-10 17:09:20 +05:30
Gavin D'souza
8d745a97ed fix: Get latest available backup obeying older_than 2020-08-07 21:54:50 +05:30
gavin
5b3fa971b5 Revert "fix: add a distinct identifier for public files backup (#11201)"
This reverts commit ef4a28e10c.
2020-08-07 13:14:29 +05:30
Gavin D'souza
5a52d54211 fix: fetch correct backup files 2020-08-07 12:47:07 +05:30
Deepesh Garg
b92ce9a245
feat: Allow sending emails via Server Script (#11162)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-07 09:25:37 +05:30
Deepesh Garg
5a2703e0df Merge branch 'develop' of https://github.com/frappe/frappe into configurable_navbar 2020-08-06 20:49:40 +05:30
Deepesh Garg
cbe4a999c5 fix: Add standard navbar items in patch and after install 2020-08-06 20:28:29 +05:30
Mangesh-Khairnar
ef4a28e10c
fix: add a distinct identifier for public files backup (#11201) 2020-08-06 09:32:04 +05:30
Shivam Mishra
34c3d57767
feat: validate json when saving desk page (#11095)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-06 00:01:11 +05:30
gavin
dd157ba822
fix: dont show git errors in terminal (#11064)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-04 17:39:35 +05:30
Gavin D'souza
4b93f75eba fix: Log site only if exists 2020-08-03 17:23:32 +05:30
Deepesh Garg
5af0674315 fix: Redirect to workspace instead of desktop 2020-08-03 14:40:07 +05:30
Deepesh Garg
ccf7f28d98 fix: get url only if redirect_to is not specified 2020-08-03 14:38:46 +05:30
Gavin D'souza
a87531e1d0 fix(get_logger): allow None for module 2020-07-31 17:26:37 +05:30
Gavin D'souza
f04ce5dd7a chore: Typo 2020-07-31 16:11:39 +05:30
Gavin D'souza
94116ae93c feat(logger): allow max_size and file_count params 2020-07-31 16:07:51 +05:30
Gavin D'souza
faa9a5466e fix: Slider 2020-07-30 19:04:04 +05:30
Gavin D'souza
fac7f359ae fix: original log format + EAFP 2020-07-30 18:49:59 +05:30
Gavin D'souza
090b81f2f2 style: black + restructure 2020-07-30 17:59:01 +05:30
Gavin D'souza
7bf69c62c1 fix: suffix logger name with site 2020-07-30 17:47:01 +05:30
Gavin D'souza
35c539f5e2 Merge branch 'develop' of github.com:frappe/frappe into site-web-logger-fix 2020-07-30 14:18:00 +05:30
Gavin D'souza
727a2b13bf fix: fetch latest backups
updated behaviour of fetch latest backups. doesnt take new backups
and accepts no args
2020-07-29 14:28:45 +05:30
Gavin D'souza
ae3ee5b2eb fix: save frappe loggers site wise 2020-07-29 13:33:04 +05:30
Shivam Mishra
c89b6a7065 feat: added magic switcher 2020-07-27 19:08:01 +05:30
Deepesh Garg
589a9b1d0f fix: OAUTH redirect fixes 2020-07-27 18:12:29 +05:30
Gavin D'souza
1345c2feb3 feat: Allow_site flag in frappe.logger 2020-07-27 17:31:12 +05:30
Gavin D'souza
ad1152f8e8 feat: override site name via _site
added filter parameter for logger
2020-07-27 17:13:18 +05:30
Saqib Ansari
af8771d5dc fix: throw message for invalid date filter 2020-07-27 15:51:44 +05:30