Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frappe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7fb04a86

Unverified Commit 7fb04a86 authored 6 years ago by Ameya Shenoy

Downloads
- Plain Diff

Merge branch 'staging-fixes' into staging

parents 22678846 1cb0815f

No related branches found

Tags v11.0.3-beta.11

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

frappe/__init__.py 1 addition, 1 deletion

frappe/__init__.py
frappe/desk/query_report.py 5 additions, 4 deletions

frappe/desk/query_report.py
frappe/hooks.py 1 addition, 1 deletion

frappe/hooks.py
frappe/public/js/frappe/ui/filters/filter.js 3 additions, 1 deletion

frappe/public/js/frappe/ui/filters/filter.js
frappe/public/js/frappe/views/reports/report_view.js 5 additions, 5 deletions

frappe/public/js/frappe/views/reports/report_view.js
frappe/public/js/legacy/client_script_helpers.js 1 addition, 1 deletion

frappe/public/js/legacy/client_script_helpers.js
package.json 1 addition, 1 deletion

package.json
yarn.lock 4 additions, 4 deletions

yarn.lock

with 21 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment