Commit graph

19825 commits

Author SHA1 Message Date
Faris Ansari
c054961c3b fix(QueryReport): Expand/Collapse all for tree 2019-04-05 17:23:55 +05:30
Himanshu Warekar
9c70a650da fix: get fields of doctype on change 2019-04-05 17:13:06 +05:30
jibin jose
5cec97a0a2 Fix social login in Python3
In Pyhton3, requests response content is in bytes type. So decoder
have to handle both `str` and `bytes` to make it compatible with
both python 2 and 3
2019-04-05 16:41:25 +05:30
Saurabh
fb4ef2e3d2 Merge branch 'hotfix' 2019-04-05 16:39:04 +05:30
Saurabh
1972ff2375 bumped to version 11.1.19 2019-04-05 17:09:04 +06:00
Himanshu Warekar
422a1e151b fix: test cases using assertListEqual 2019-04-05 16:00:16 +05:30
Himanshu Warekar
f06fa603d7 fix: test case 2019-04-05 15:22:55 +05:30
Himanshu Warekar
1b4550c503 fix: test case 2019-04-05 15:05:09 +05:30
Suraj Shetty
9633b4fb00 fix: Modify log message 2019-04-05 14:47:57 +05:30
Suraj Shetty
44da34b4b4 feat: Show Indicator for with energy point alert 2019-04-05 14:11:51 +05:30
Suraj Shetty
0fcececd9f fix: Remove Administrator from involved users 2019-04-05 13:54:23 +05:30
Himanshu
c923a55924
fix: test case 2019-04-05 13:30:05 +05:30
Himanshu
14f63830ad
fix: test case 2019-04-05 13:29:07 +05:30
Faris Ansari
e4af6b7300 fix(Query Report): Show totals row in Print 2019-04-05 13:17:26 +05:30
Rushabh Mehta
5599634927 fix(ux): assign box 2019-04-05 13:14:49 +05:30
Suraj Shetty
1746d089a8 Merge branch 'develop' of https://github.com/frappe/frappe into energy-points-enhancements 2019-04-05 13:11:19 +05:30
Suraj Shetty
0e077dbfa8 fix: Set with_timestamp=false by default 2019-04-05 13:03:13 +05:30
Suraj Shetty
48e16de859 fix: Return review doc on new review creation 2019-04-05 13:00:05 +05:30
Suraj Shetty
872b867d63 refactor: Use commonified code for formatted log 2019-04-05 12:59:38 +05:30
Suraj Shetty
50ad3ea9f0 fix: History toggle 2019-04-05 12:57:19 +05:30
Suraj Shetty
3da809146c feat: Show energy point logs on form timeline 2019-04-05 12:54:00 +05:30
Suraj Shetty
e0a1bc92f5 refactor: Get energy point log from docinfo 2019-04-05 12:52:24 +05:30
Suraj Shetty
991cf21704 refactor: Abstract energy point utils 2019-04-05 12:51:00 +05:30
Suraj Shetty
40b2990595 fix: Make review only if energy point system is enabled 2019-04-05 11:32:15 +05:30
Suraj Shetty
88e6d6927c fix: Export parent fields while exporting fixtures (#7196)
- To allow the export of doctypes like "Custom DocPerm"  which needs parent fields.
2019-04-05 11:29:04 +05:30
Suraj Shetty
25282d471e fix: Export parent fields while exporting fixtures (#7199)
To allow the export of doctypes like "Custom DocPerm" which needs parent fields.
2019-04-05 11:28:53 +05:30
Himanshu Warekar
674bee4cde fix: fetch all contacts and addresses 2019-04-05 11:01:51 +05:30
Himanshu Warekar
1e03e88bb9 fix: test case fixes 2019-04-05 10:58:18 +05:30
Suraj Shetty
8059573d9e fix: Make "Energy Point Rule" fields mandatory (#7195) 2019-04-05 10:58:16 +05:30
Suraj Shetty
e59589d488 fix: Disable popover title 2019-04-05 09:25:32 +05:30
Suraj Shetty
d971268c53 feat: Enable toolbar for energy point rule 2019-04-05 09:08:22 +05:30
Suraj Shetty
281a514217 feat: Show popover with message instead of hiding add button 2019-04-05 08:50:59 +05:30
igrekus
813230ed87 fix: desktop shows empty categories for users with no perms (#7202) 2019-04-05 01:24:41 +03:00
Deepesh Garg
484f695f76
Merge pull request #7200 from saurabh6790/paypal_subscription_cancellation_fix
fix: cancel existing subscription while creating new subscription
2019-04-04 16:42:08 +05:30
Suraj Shetty
cc58028ec3
Merge pull request #7197 from deepeshgarg007/upload-fix
fix: Show progress bar only for multiple files upload
2019-04-04 16:37:11 +05:30
Saurabh
7c6370a2d1 fix: cancel existing subscription while creating new subscription 2019-04-04 16:20:25 +05:30
deepeshgarg007
83f4d9b0f2 fix:Styling fixes 2019-04-04 15:55:43 +05:30
deepeshgarg007
326e2b3168 fix(Codacy): Comparison fix 2019-04-04 15:38:10 +05:30
Suraj Shetty
d22206a992 fix: Fix export customisation (#7198)
convert `sync_on_migrate` and `with_permissions` from string to Int
2019-04-04 14:49:52 +05:30
deepeshgarg007
af7388deb7 fix: Show progress bar only for multiple files 2019-04-04 12:55:11 +05:30
Suraj Shetty
6e2c6269f7 fix: Return if user_field is set empty (#7181)
* fix: Return if user_field is set empty

- fix log_error usage

* fix: log complete traceback
2019-04-04 12:02:59 +05:30
Suraj Shetty
8d8755ec41
Merge pull request #7180 from netchampfaris/preserve-state-query-report-d
fix: Preserve state in query report
2019-04-04 12:02:30 +05:30
Suraj Shetty
fc29318c0b fix: use .get to avoid key error (#7184) 2019-04-04 12:01:35 +05:30
Suraj Shetty
b040f8ad60
Merge pull request #7193 from netchampfaris/fix-page-names-in-awesomebar
fix: Fetch page title for core pages
2019-04-04 11:59:18 +05:30
Suraj Shetty
8911ecba47
Merge pull request #7176 from netchampfaris/preserve-state-query-report
fix: Preserve state in query report
2019-04-04 11:52:08 +05:30
Aditya Hase
52da1476e3 fix: Raise exception if apps are on incompatible branches (#7177) 2019-04-04 10:38:06 +05:30
Aditya Hase
cb48feac98 fix: Raise exception if apps are on incompatible branches (#7175) 2019-04-04 10:37:41 +05:30
Suraj Shetty
1da87a5108
Merge pull request #7169 from pipech/master
fix(workflow): fixed workflow action btn doesn't setup properly
2019-04-04 09:20:01 +05:30
Suraj Shetty
ee8cfa9d65
Merge pull request #7194 from netchampfaris/datatable-not-equals-filter
feat(DataTable): Add not equals (!=) filter
2019-04-04 08:46:14 +05:30
Faris Ansari
55ba40a71e feat(DataTable): Add not equals (!=) filter 2019-04-03 23:19:59 +05:30