Gavin D'souza
c0d052cf94
Revert "ci: Bump mariaDB version to 10.4"
...
This reverts commit c9d0aae791
2021-03-17 12:59:27 +05:30
Gavin D'souza
c9d0aae791
ci: Bump mariaDB version to 10.4
...
10.5 is latest stable, but this feature was developed on 10.4; so
leaving this here.
2021-03-16 12:45:31 +05:30
Gavin D'souza
cb6fe60f5f
Merge branch 'refactor-personal-data-deletion' of github.com:gavindsouza/frappe into refactor-personal-data-deletion
2021-03-16 12:03:47 +05:30
Gavin D'souza
43d3a5b1fa
chore: Boolean over Int for user_data_fields
2021-03-16 12:02:34 +05:30
Suraj Shetty
5734cfe457
Merge branch 'develop' into refactor-personal-data-deletion
2021-03-16 11:14:19 +05:30
Suraj Shetty
ab1f4414c4
chore: Update mergify configuration ( #12585 )
2021-03-16 11:14:03 +05:30
Shariq Ansari
71bb522e95
fix: Multi currency in print view shows same currency symbol ( #12569 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-16 10:07:23 +05:30
Gavin D'souza
9473f7e05c
refactor: Re-order methods for better readability
2021-03-15 19:02:45 +05:30
Gavin D'souza
82620d789a
fix: Delete user after test is run
2021-03-15 18:53:22 +05:30
Gavin D'souza
9df165777d
fix: Replace email and name data in single assignment
2021-03-15 18:07:43 +05:30
Gavin D'souza
5677629adb
chore: Bump Postgres to 12.4
2021-03-15 16:15:29 +05:30
Gavin D'souza
48c0160b6a
Merge branch 'develop' of github.com:frappe/frappe into refactor-personal-data-deletion
2021-03-15 16:07:17 +05:30
Saqib
6c9634f2bf
Merge pull request #12580 from nextchamp-saqib/fix/get_inner_group_button_syntax
...
fix: jquery selector for get_inner_group_button()
2021-03-15 12:44:24 +05:30
Prssanna Desai
d297174817
Merge pull request #12557 from prssanna/redesign-fixes
2021-03-15 12:20:42 +05:30
Saqib Ansari
21b7fe4ee7
fix: jquery selector for get_inner_group_button()
2021-03-15 12:06:37 +05:30
Suraj Shetty
ac0d6243f3
fix: Hide tooltip on route change ( #12579 )
2021-03-15 11:03:37 +05:30
Prssanna Desai
7d1e04fac3
fix: use single statememt
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-15 10:39:25 +05:30
Sagar Vora
6ed9567b8c
fix: remove unused paramter ( #12575 )
2021-03-13 00:14:12 +05:30
Mohammad Hasnain Mohsin Rajan
7148af3c20
ci: Fix Github Action ( #12574 )
2021-03-12 22:44:30 +05:30
Mohammad Hasnain Mohsin Rajan
3ee0d76776
ci: Port from TravisCI to Github Actions ( #12559 )
2021-03-12 13:59:30 +05:30
mergify[bot]
1448a47f62
Merge pull request #12567 from hasnain2808/fix-multiselect-dialog
...
test: encoding @ since we encode each url
2021-03-11 16:10:21 +00:00
hasnain2808@gmail.com
85de1a01df
test: encoding @ since we encode each url
2021-03-11 20:43:44 +05:30
prssanna
97f7f6345b
fix: select field condition to check if value is selected
2021-03-11 18:55:11 +05:30
prssanna
4246f8f3d8
fix: web form print button
2021-03-11 14:31:42 +05:30
mergify[bot]
e9aa93fe98
Merge pull request #12424 from CaseSolvedUK/sitemapfix-v13
...
fix: Bug preventing proper detection of pages
2021-03-11 08:58:13 +00:00
prssanna
9386dbc1d3
fix: more button in web list
2021-03-11 14:28:02 +05:30
Fisher Yu
8ef2545665
fix: encode filename to handle special characters ( #12478 )
...
* fix: same as previous row treated as one doc
treat repeated parent doc rows as same doc(parent), because legacy system downloaded data with inner join will normally have repeat same content for the parent docs
* fix: attached url with utf8 characters file name e.g Chinese
fix attached file via URL in comment by file name with utf8 characters
* fix: revert as it is already in other PR
* refactor: use frappe.safe_encode
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2021-03-11 08:57:37 +00:00
prssanna
1581c99da7
fix: commonify quill styles for website and desk
2021-03-11 14:27:35 +05:30
prssanna
ec004cc1b7
refactor: common form styles
2021-03-11 14:26:53 +05:30
prssanna
72192e4a10
fix: web form style
2021-03-11 14:22:38 +05:30
prssanna
1937a1e558
fix: web form buttons
2021-03-11 14:21:00 +05:30
Faris Ansari
5e5f470272
Merge pull request #12464 from prssanna/docname-trailing-space
...
fix: include space and tab in special characters to match to encode url
2021-03-11 14:18:01 +05:30
Faris Ansari
a0d3ddbf6b
fix: encode URI unconditionally
...
ref: https://stackoverflow.com/a/29948396
Co-authored-by: Rohan <Alchez@users.noreply.github.com>
2021-03-11 14:09:11 +05:30
Leela vadlamudi
a2e791eaa0
Merge pull request #12455 from Alchez/dev-import-file-error
...
fix: error while using data import and importing docs (develop)
2021-03-11 13:00:09 +05:30
Prssanna Desai
8c799ef43a
Merge pull request #12527 from pateljannat/gantt-progress-on-the-bar
2021-03-11 12:39:29 +05:30
mergify[bot]
f0c3788b66
Merge pull request #12565 from leela/import-templates
...
perf: Increase data import's download template perf over 10x
2021-03-11 07:01:50 +00:00
pateljannat
645c6dc221
Merge branch 'develop' of https://github.com/frappe/frappe into gantt-progress-on-the-bar
2021-03-11 11:20:21 +05:30
pateljannat
deec4c4681
fix: indentation
2021-03-11 11:19:43 +05:30
Ankush Menat
6c2d377e74
fix: use semgrep cli instead of docker image ( #12566 )
...
CLI is more flexible at present. Until github action catches up,
switch to CLI version.
This also fixes failure from forks which don't contain semgrep config
yet.
2021-03-11 10:42:42 +05:30
leela
a62cc40885
perf: Improve import template performance by 10 times
...
Removed nested forloop to get the performace and also using generators
to reduce memory usage.
2021-03-11 09:52:40 +05:30
Afshan
a342ca2386
fix: Get file name from path ( #12437 )
...
* fix: get file name from path
* Update frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: upload only files which have file url
* fix: patch to fix files name and url
* fix: fixing patch
* refact: patch refactor
* fix: missing :
* fix: renamed variables
* fix: refactoring patch
* fix: update file exists function
* fix: added patch path in patch.txt
* fix: added try except
* fix: Use set_value instead of set_values
* style: Fix formatting
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-10 18:36:10 +00:00
mergify[bot]
856e9adf38
Merge pull request #12558 from resilient-tech/fix-rename-doc
...
fix: Document rename
2021-03-10 13:46:18 +00:00
prssanna
dcbce242a9
fix: toast red indicator icon
2021-03-10 18:42:43 +05:30
prssanna
882ea6e3d1
fix: missing bracket in get_inner_group_button
2021-03-10 18:23:59 +05:30
Sagar Vora
224a80aa9d
fix: old doc not found error when renaming doc
2021-03-10 18:20:20 +05:30
prssanna
89b9c29802
chore: update frappe charts
2021-03-10 18:14:52 +05:30
prssanna
91cb71f0c9
fix: don't show social login icon if not set
2021-03-10 18:14:33 +05:30
mergify[bot]
15a9b6a727
Merge pull request #12556 from resilient-tech/fix-recorder-routing
...
fix: routing issues in recorder
2021-03-10 12:19:38 +00:00
this-gavagai
e2b91b5454
chore(calendar): Updated fullcalendar.js to v3.10.2 ( #12519 )
...
Co-authored-by: theopen-institute <admin@theopen.institute>
2021-03-10 17:19:53 +05:30
mergify[bot]
e2c2e88610
Merge pull request #12530 from resilient-tech/fix-dashboard-view
...
fix: allow navigating back from dashboard view
2021-03-10 11:27:22 +00:00
