Commit graph

19478 commits

Author SHA1 Message Date
Suraj Shetty
2972507a69
Merge pull request #7422 from surajshetty3416/fix-energy-point-rule
fix: Skip energy point log creation if user from the rule comes out to be an admin
2019-05-08 09:28:45 +05:30
Suraj Shetty
6daaa02fcc fix: use .get to avoid attribute error 2019-05-08 00:50:17 +05:30
Rushabh Mehta
76dbb3b8e8
Merge pull request #7403 from rmehta/error-reporting-develop
fix: error reporting
2019-05-07 19:05:11 +05:30
Rushabh Mehta
f49163b2e3 fix(email): try matching replies from a longer timeframe (60 days) 2019-05-07 17:42:50 +05:30
Rushabh Mehta
b391d698b8 fix(typo): formatter.js 2019-05-07 17:35:56 +05:30
Rushabh Mehta
971a219414
Merge pull request #7414 from rmehta/group-by-fixes
fix(wip): group by in reports
2019-05-07 17:34:16 +05:30
Rushabh Mehta
be4c610286 fix: apply group by 2019-05-07 16:05:50 +05:30
Rushabh Mehta
87082e2c07 fix(report): charting in reports now supports group by and saved in user settings; 2019-05-07 15:50:18 +05:30
Suraj Shetty
09d36621c7
Merge pull request #7413 from netchampfaris/disable-portal-routes
fix: Disable Portal Routes
2019-05-07 14:08:01 +05:30
Suraj Shetty
53ef9f265b
Merge pull request #7421 from netchampfaris/website-redirects
feat: Website Redirects
2019-05-07 13:06:47 +05:30
Suraj Shetty
0bbb3b3ad6 fix: listview count while filtering with child table (#7420)
* fix: Add distinct to count query if filter includes child table
2019-05-07 12:34:32 +05:30
Suraj Shetty
b62a92694a fix: Skip log creation if user from the rule comes out to be Admin 2019-05-07 11:37:35 +05:30
Faris Ansari
11ad92a21f feat: Website Redirects 2019-05-07 11:32:28 +05:30
Rushabh Mehta
c6b7d183df
Merge pull request #7415 from scmmishra/disable-customize
feat: disable customize option for single doctypes
2019-05-07 11:10:45 +05:30
Rushabh Mehta
699b5524f8 fix(report): save group by settings in report 2019-05-06 22:05:12 +05:30
Rushabh Mehta
3cab2186f3 fix(report): save group by settings in report 2019-05-06 20:01:33 +05:30
Rushabh Mehta
07746ff7c9 fix: column mapping 2019-05-06 19:37:03 +05:30
Shivam Mishra
b79d35033f feat: disable customize option for single doctypes 2019-05-06 18:42:28 +05:30
Rushabh Mehta
b4e9d3d7a8 fix(wip): group by in reports 2019-05-06 16:19:54 +05:30
Faris Ansari
ef2979c7e7 fix: Disable Portal Routes 2019-05-06 15:12:21 +05:30
Rushabh Mehta
1dcf80b92a
Merge pull request #7411 from rmehta/fix-link-preview
fix(link-preview): cleanup and fixes
2019-05-06 13:44:29 +05:30
Rushabh Mehta
51d95321c1 fix(link-preview): cleanup and fixes 2019-05-06 13:42:25 +05:30
Rushabh Mehta
ceda36d9ec fix(minor): don't freeze screen in frappe.model.with_doctype 2019-05-06 12:32:41 +05:30
Suraj Shetty
ee50f29375
Merge pull request #7410 from surajshetty3416/fix-energy-point-ux
feat: Append modified_field to the user_feilds of energy point rule
2019-05-06 08:52:52 +05:30
Suraj Shetty
8948a014d2 fix: Skip energy point for admin 2019-05-06 08:26:24 +05:30
Suraj Shetty
9d96d707af feat: Append modified_field to the user_feilds of energy point rule 2019-05-06 07:42:44 +05:30
Suraj Shetty
4e82a2edf5
Merge pull request #7409 from surajshetty3416/fix-pdf
fix(pdf): Define filedata before it is used
2019-05-05 13:44:59 +05:30
Suraj Shetty
d67bcd2212 fix: Define filedata before it is used 2019-05-05 12:23:46 +05:30
Suraj Shetty
beb8b0bcbd
Merge pull request #7400 from surajshetty3416/goto-page-button
fix: Need to refresh page when navigating to page after visiting page form
2019-05-04 17:25:24 +05:30
Rushabh Mehta
4c578e8238 fix: dont show double messages 2019-05-04 14:14:56 +05:30
Rushabh Mehta
d727aa9e57 fix(minor): fix error reporting exception JSON handling 2019-05-04 14:05:49 +05:30
Saurabh
c178014f49
Merge pull request #7398 from surajshetty3416/fix-postgres-query
fix(postgres): Get data of empty table from pg_stat_all_tables
2019-05-03 17:04:22 +05:30
Rushabh Mehta
311202611b fix(style): cleanup blog subtitle 2019-05-03 15:01:41 +05:30
Suraj Shetty
c8822191c9
style: Remove log statement 2019-05-03 13:54:09 +05:30
Suraj Shetty
da8612aa0f style: Add a space and user frappe.session.user instead of just user 2019-05-03 13:38:23 +05:30
Suraj Shetty
3d555c80bb fix: Only use local's page object if it has page script 2019-05-03 13:37:28 +05:30
Suraj Shetty
f7ad33432d
Merge pull request #7399 from scmmishra/filter-fix
fix: applied filter element in list view
2019-05-03 13:04:04 +05:30
Rushabh Mehta
6157ebb4b5
Merge pull request #7281 from prssanna/link-preview
feat(desk): Link preview popover
2019-05-03 12:41:04 +05:30
Suraj Shetty
ebb26c771b feat: Add a "Go To Page" button in page form view 2019-05-03 11:57:50 +05:30
Shivam Mishra
c5a11f9fd0
Merge pull request #7358 from scmmishra/encrypt-pdf
feat: Added encryption feature for pdfs
2019-05-03 11:26:01 +05:30
Shivam Mishra
d8b4c66bf3 fix: applied filter element in list view
Co-authored-by: surajshetty3416
2019-05-03 11:09:57 +05:30
Suraj Shetty
33188f7a20
Merge pull request #7392 from josejibin/fix/postgres-setup
fix(postgres): DB setup
2019-05-03 10:44:09 +05:30
Suraj Shetty
0a7a28bac0 fix: Get data of empty table from pg_stat_all_tables when db-type is postgres 2019-05-03 10:38:10 +05:30
Suraj Shetty
25ee7843f4
Merge pull request #7388 from surajshetty3416/fix-route-label-for-report
fix: Translate route label & fix label for reports & pages
2019-05-03 09:08:50 +05:30
Rushabh Mehta
5ebf688984 fix(recent): complete uncommitted changes 2019-05-03 08:49:51 +05:30
Suraj Shetty
29c97fca6e fix: Add dashboard label 2019-05-02 21:09:28 +05:30
Suraj Shetty
ae452262a2 Merge branch 'develop' of https://github.com/frappe/frappe into fix-route-label-for-report 2019-05-02 20:33:17 +05:30
Suraj Shetty
c8e72ce1c1
Merge pull request #7395 from rmehta/recent-route-fixes
fix: route history and allow longer energy point reviews
2019-05-02 20:11:03 +05:30
Aditya Hase
5d5e68dbed fix: Do not show locals to user (#7397) 2019-05-02 19:35:17 +05:30
Rushabh Mehta
f72e74d8e8 fix: route history and allow longer energy point reviews 2019-05-02 15:51:57 +05:30