Commit graph

1519 commits

Author SHA1 Message Date
Himanshu Warekar
02cebdd7d3 fix: use frappe.tags 2019-10-03 16:43:36 +05:30
Himanshu Warekar
c0a5ad1456 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-10-03 12:30:53 +05:30
ci2014
f0b59df21c Let developers choose the margins (#8513)
* Let developers choose the margins

Let the developers choose the margins

* fix: remove trailing whitespace
2019-10-03 06:25:38 +00:00
Himanshu Warekar
a5a48f2054 fix: left join Tag Link 2019-10-02 11:39:25 +05:30
Himanshu Warekar
c01eadcac0 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-09-30 13:59:28 +05:30
Faris Ansari
d2fe007177 fix(xls): Don't remove first row 2019-09-29 22:41:30 +05:30
Faris Ansari
d07ac06e5c fix: Export to Excel 2019-09-29 22:41:29 +05:30
Faris Ansari
07eedad5bb fix: Parse .xls and .xlsx files in import 2019-09-29 22:41:29 +05:30
Faris Ansari
b973a5d101 fix: Process data in batches 2019-09-29 22:41:29 +05:30
Himanshu Warekar
09b639a527 fix: codacy and travis fixes 2019-09-27 22:02:22 +05:30
Himanshu Warekar
2bb05534f6 fix: do not add offset is start is zero 2019-09-26 17:58:13 +05:30
Himanshu Warekar
a952a5b5c3 feat: unique entry for each tag 2019-09-25 22:15:40 +05:30
Himanshu Warekar
abb477a1c0 feat: use search bar for tags too 2019-09-25 17:48:36 +05:30
Himanshu Warekar
b7196f124c feat: use tag link for global tags 2019-09-24 23:25:04 +05:30
Himanshu Warekar
f6d1ce2194 feat: Global Tags 2019-09-24 01:03:11 +05:30
Himanshu Warekar
f22c78a806 Merge develop into global_search 2019-09-23 21:20:26 +05:30
Himanshu Warekar
cfbfc24398 fix: 'NoneType' object has no attribute 'get' 2019-09-20 16:16:57 +05:30
Himanshu Warekar
c4d120273b fix: priority for doctypes inglobal search 2019-09-20 11:12:45 +05:30
Himanshu Warekar
c669167efb fix: check if text exists 2019-09-18 18:43:43 +05:30
Himanshu Warekar
9d3b361da4 feat: Global Search with Priorities 2019-09-18 18:21:13 +05:30
Rohan
355fc4b49e feat: allow extending doctype dashboards via hooks (develop) (#8336)
* feat: allow overriding dasboards via hooks

* fix: allow extending dashboard data in hooks

* fix: move logic to generic function

* format: added description to hook
2019-09-08 02:29:43 +05:30
Aditya Hase
a2e2f67f16
fix(login): ldap_settings not defined 2019-09-05 16:44:06 +05:30
sahil28297
ac1c8c7c3f
fix(nestedset): check if meta has nsm_parent_field 2019-09-03 22:15:59 +05:30
Himanshu
5b1938afdd feat(Comments): add images in comments (#8283)
* feat: add images in comments

* fix: use extract images
2019-09-02 23:28:05 +05:30
Faris Ansari
bff94703cf feat: Create NestedSet doctypes via configuration 2019-09-02 15:58:52 +05:30
mergify[bot]
98c2a402dd
Merge pull request #8261 from hrwX/escape_docname_goal
fix(Customer): Escape quotes
2019-08-28 20:36:29 +00:00
mergify[bot]
4a79ffd6bb
Merge pull request #8272 from deepeshgarg007/multi_print
fix: Error while printing multiple docs
2019-08-28 09:52:00 +00:00
Himanshu
880b2559f2
Update frappe/utils/goal.py
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-28 10:06:13 +05:30
deepeshgarg007
fb98887cd4 fix: Error while pritning mutiple docs 2019-08-27 12:31:52 +05:30
Himanshu Warekar
d4bf775c08 fix: escape docname for quotes 2019-08-26 14:04:56 +05:30
Sahil Khan
9b65a7c4a1 Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:09:39 +05:30
Shivam Mishra
7104686a15 refactor: remove background_style 2019-08-09 13:16:18 +05:30
Shivam Mishra
4492dbfc38 refactor: remove code related to background image 2019-08-09 10:42:03 +05:30
Faris Ansari
e960255b7b fix: Pass no_letterhead to download_multi_pdf 2019-08-08 22:27:58 +05:30
gavin
b5ab59ad6e feat: Access log (#8014)
* feat: Access log doctype for logging information about private file
downloads, backups downloads, printing and exporting data

* updated: access log

* updated: formattted access_log.js

* access logging: print/pdf/pvt files/export/backup

client side implementation: treeview, query_report
server side implementation on the rest

* fixes: codacy errors

* Update response.py

* Update response.py

* Update response.py

* codacy: please

* travis fixes

* changes:filters=>_filters(lol this works @ times?)

added: tests for access_log, make_access_log formatting, form ui added
buttons

* this hopefully fixes em tests

* changes: fixed indents, session.user, formatting

* fixes: tests, refactor, permissions

emerging from exporter.py => reference doctype in export_data (check
format!)

* fixes: convert dict to json

* changes: added more tests, wrote lesser code?

switched js to display depends on

* fixes: codacy and hopefully travis

* fix: tests? and polishing up

* added column field, removed tracked views

changed access log in exporter.py > export_data
added access log in reportview.py > export_query

* style: Fix indentation

* style: Fix indentation

* fix: Remove problematic string replace

It may replace quotes in the actual filter values which can result in invalid JSON

* fix: Remove filter string conversion

* fix: Error due to quote escapes

TODO: Check for a better way
2019-08-06 10:24:55 +05:30
Faris Ansari
6493463c89 fix: Blacklist iframe from sanitize_html (#7982) 2019-08-02 12:58:34 +05:30
Faris Ansari
c33f7f1e45 fix: Pick sitemap host from request (#8071) 2019-08-02 12:42:00 +05:30
Faris Ansari
636d9442e2 fix: Pick sitemap host from request (#8072) 2019-08-02 12:41:53 +05:30
Faris Ansari
9dadc41fbf
fix(scheduler): Show scheduler status (#8065)
fix(scheduler): Show scheduler status
2019-08-01 12:50:12 +05:30
Aditya Hase
4164c62efc fix(doctor): Show status of scheduler in bench doctor 2019-07-31 20:14:58 +05:30
Aditya Hase
2849ef9105 fix(doctor): Show status of scheduler in bench doctor 2019-07-31 20:12:22 +05:30
mergify[bot]
250239d733
Merge pull request #8038 from gavindsouza/code-fixes
refactor: moved from regex + ast eval to just using import
2019-07-31 10:33:21 +00:00
Aditya Hase
1dca0fb330 fix(security): Make Jinja Tighter 2019-07-30 12:53:53 +05:30
Aditya Hase
472d33f3da fix(security): Make Jinja Tighter 2019-07-30 12:51:45 +05:30
Gavin D'souza
44cab5d326 refactor: updated boilerplate
moved from regex + ast eval to just using import
2019-07-29 16:24:24 +05:30
Faris Ansari
fed179b4ea fix: Check private file permissions for all docs
A file may be attached to multiple documents. It's permission is decided
based on the attached document's permissions. So, the permission
should be checked for each document and should be allowed if atleast
one document is accessible.
2019-07-29 15:43:06 +05:30
Faris Ansari
5fec5d7eea fix: Check private file permissions for all docs
A file may be attached to multiple documents. It's permission is decided
based on the attached document's permissions. So, the permission
should be checked for each document and should be allowed if atleast
one document is accessible.
2019-07-29 15:42:51 +05:30
Faris Ansari
dfa16a77f4
Merge pull request #7662 from deepeshgarg007/remove_user_limit
BREAKING CHANGE: Remove limits from frappe
2019-07-29 12:09:04 +05:30
mergify[bot]
b37d3ae2db
Merge pull request #7987 from scmmishra/oauth-fix
fix: oauth redirect issue
2019-07-29 06:23:14 +00:00
mergify[bot]
8f94a9d0a0
Merge pull request #8009 from scmmishra/fix-oauth-hotfix
fix: oauth redirect issue
2019-07-29 06:21:27 +00:00