Commit graph

19825 commits

Author SHA1 Message Date
Suraj Shetty
1556805232 fix: Make query postgres compatible 2019-05-13 10:26:48 +05:30
Faris Ansari
5e35431f6f
Merge branch 'develop' into treeview-page-title-d 2019-05-12 19:44:53 +05:30
Faris Ansari
113898adb0
Merge branch 'develop' into fix-set-lang-print-d 2019-05-12 19:44:47 +05:30
Faris Ansari
5e2c2d8337
fix: Index rendered page content (#7405)
* fix: Index rendered page content

- Order results based on words matched in title

* fix: Reset session user after indexing page

* chore: comments
2019-05-12 19:21:07 +05:30
Faris Ansari
854cf521e5
Merge pull request #7457 from netchampfaris/fix-disabled-routes
fix: Block route if disabled in Portal Settings
2019-05-12 18:45:27 +05:30
Faris Ansari
507e763a2a style: Indent 2019-05-12 18:42:45 +05:30
Faris Ansari
8524c143cd fix: UI Test 2019-05-12 18:16:51 +05:30
Faris Ansari
62a3869924 fix: Block route if disabled in Portal Settings
Check in render.py
2019-05-12 18:04:25 +05:30
Rohit Waghchaure
408b46acb4 Updated expired message 2019-05-11 16:31:10 +05:30
Rohit Waghchaure
cf932a834a feat: force user to reset password after x days 2019-05-11 15:25:32 +05:30
Rushabh Mehta
284eec4f37 fix: clear popovers 2019-05-11 12:40:36 +05:30
Deepesh Garg
4202d39b2b
Merge pull request #7451 from deepeshgarg007/custom_column_develop
fix: Option fixes in custom columns for query reports
2019-05-11 12:30:26 +05:30
Rushabh Mehta
03b045a5b5 refactor: remove autodocs, no longer used 2019-05-11 10:12:11 +05:30
deepeshgarg007
69d1a254c0 fix: Option fixes in custom_columns 2019-05-10 22:36:09 +05:30
Deepesh Garg
84466b54c4
Merge pull request #7442 from deepeshgarg007/custom_auto_email_develop
fix: Auto email support for Custom Reports
2019-05-10 22:33:05 +05:30
deepeshgarg007
e9e120d2af fix: Use let instead of var 2019-05-10 15:57:43 +05:30
deepeshgarg007
d7188aa1e5 fix: Styling fixes 2019-05-10 15:57:33 +05:30
Rohan Bansal
c56021638b fix(core): Allow action on msgprint and throw calls 2019-05-10 13:24:24 +05:30
Saurabh
ca01c75ea4 fix: naming 2019-05-10 10:54:35 +05:30
Saurabh
5e284db206 fix: naming and provision to use same db credentails for secondary 2019-05-10 10:54:35 +05:30
Rushabh Mehta
de58a59402
Merge pull request #7428 from saurabh6790/prepared_repo_fix
fix: enqueue prepared report after committing prepared report record
2019-05-10 08:29:40 +05:30
Rushabh Mehta
a6aec85674
Merge pull request #7407 from surajshetty3416/communication-email-template
feat: Add email template field to Communication
2019-05-10 08:28:29 +05:30
Rushabh Mehta
743e082ebf
Merge pull request #7438 from netchampfaris/fix-text-editor-style-d
fix: Text editor styles when readonly
2019-05-10 08:26:46 +05:30
Shivam Mishra
a6017891f8
Merge pull request #7440 from surajshetty3416/fix-energy-point-trigger
fix: Process for energy points on any doc changes
2019-05-10 08:22:40 +05:30
deepeshgarg007
f7c9064038 fix: Auto email support for custom reports 2019-05-09 22:42:54 +05:30
deepeshgarg007
532f9e1399 fix: Added reference_report field 2019-05-09 22:39:41 +05:30
Suraj Shetty
b803dac772 fix: Process for energy point on any doc changes
Previously changes on submitted document
were not processed for energy points
2019-05-09 22:13:09 +05:30
Suraj Shetty
20cd78e25d
Merge pull request #7431 from netchampfaris/bulk-operations-update-message
fix: Success message on bulk edit
2019-05-09 17:59:22 +05:30
Faris Ansari
7b479f0200 fix: Text editor styles when readonly 2019-05-09 16:12:39 +05:30
Faris Ansari
37b65fb7ec fix: Disallow editing standard print formats 2019-05-09 15:32:04 +05:30
Saurabh
f068bc9800
Merge pull request #7432 from sahil28297/sync_site_develop
feat(sync_site): sync site via central agent
2019-05-09 15:17:02 +05:30
Sahil Khan
0eb9fc5eec fix(sync_site): syntax error 2019-05-09 14:52:37 +05:30
Sahil Khan
42fc641fd9 feat(sync_site): sync site via central agent 2019-05-09 14:22:47 +05:30
Faris Ansari
9586de8d67 fix: Success message on bulk edit 2019-05-09 11:50:49 +05:30
Anurag Mishra
a9d85c3222 fix: add seconds parameter seconds
* fix: add seconds parameter seconds

* fix: added paramater for minutes
2019-05-08 17:39:54 +05:30
Saurabh
d99423ce1c fix: enqueue prepared report after commiting prepared report record 2019-05-08 16:20:47 +05:30
Suraj Shetty
3680ded331
Merge pull request #7426 from frappe/user-perm-fix
fix: typo in default user permission validation message
2019-05-08 10:12:45 +05:30
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
Mangesh-Khairnar
fbd58f2fe5
fix(user-permission): remove typo 2019-05-07 18:39:18 +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
Shivam Mishra
cf7f86f6cc chore: code improvements 2019-05-07 15:22:12 +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