Commit graph

14692 commits

Author SHA1 Message Date
Umair Sayyed
d060f0421d Changed patch order 2017-03-14 15:35:09 +05:30
Rushabh Mehta
1594113ac6 [minor] hash autoname for error log and roles on top for user 2017-03-14 14:42:58 +05:30
Faris Ansari
c177c5aa15 [minor] fix in list_view.js 2017-03-14 13:00:24 +05:30
Faris Ansari
5f395a2b38 show List link in sidebar, minor fix in remember last view 2017-03-14 12:57:23 +05:30
Revant Nandgaonkar
9d49b097bb Merge pull request #2866 from mntechnique/oauth2-docs
[Docs] Updated OAuth 2 Documentation
2017-03-14 12:16:45 +05:30
Revant Nandgaonkar
b3da13d86f [Docs] Updated OAuth 2 Documentation 2017-03-14 12:03:56 +05:30
Faris Ansari
91972afa06 [enhance] remember last view from breadcrumbs frappe/erpnext#8006 2017-03-14 11:47:26 +05:30
Rushabh Mehta
5777023b38 [minor] chart fixes, #2570 2017-03-14 11:31:46 +05:30
Saurabh
7620bb3789 Deprecate Integration Broker (#2831)
* [fix] remove razorpay from integration service

* [fix] clean-up js side integration service dependancies

* [fix] remove integration service, .py cleanup, move integration request to integration

* [fix] move oauth to integrations and deprecate integration broker

* [fix] mark services enabled and update integrations listing

* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module

* [fix] create payment gateway records if not exists

* [fix] module page for integrations

* [minor][fix] minor checks

* [fix] remove integration broker module only if not allocated to any doctype
2017-03-14 11:24:26 +05:30
Rushabh Mehta
d3dda1a2eb [fix] multple entry bug via quick_entry 2017-03-13 22:27:55 +05:30
Nabin Hait
746d512924 Merge pull request #2860 from netchampfaris/ui-fixes
[minor] assignee margin in gantt popup
2017-03-13 17:23:26 +05:30
Rushabh Mehta
f76c20c828 [fix] cleanup in request.js, return if no response 2017-03-13 17:14:42 +05:30
Faris Ansari
f03c13bcf7 [minor] assignee margin in gantt popup 2017-03-13 15:08:07 +05:30
Nabin Hait
0dc8726f35 Merge pull request #2854 from netchampfaris/ui-fixes
[fix] ui fixes
2017-03-13 14:27:22 +05:30
Nabin Hait
0309affd98 Merge pull request #2859 from pratu16x7/filters-fix
[minor][fix] filters bug in base_list
2017-03-13 14:26:38 +05:30
Nabin Hait
5fae951a17 Merge pull request #2857 from pratu16x7/search-fix
[minor] remove redundant result indices
2017-03-13 14:26:11 +05:30
Nabin Hait
901666a3ee Merge pull request #2856 from rohitwaghchaure/v8_patch_fix
[fix] Separate has role patch to make custom role from custom docperm, if custom role not available then chceck standard permission for page and report
2017-03-13 14:24:10 +05:30
pratu16x7
00a03dd689 [minor][fix] filters bug in baselist 2017-03-13 14:15:23 +05:30
Rohit Waghchaure
67f4de1802 [fix] Separate has role patch to make custom role from custom docperm, if custom role not available then chceck standard permission for page and report 2017-03-13 13:46:04 +05:30
pratu16x7
e59cbf3e2a order fix: remove redundant indices 2017-03-13 13:28:02 +05:30
Faris Ansari
d6e845050a [fix] checkbox in firefox frappe/erpnext#7993 2017-03-13 13:16:37 +05:30
Faris Ansari
9dfa78b1a1 [fix] image_view frappe/erpnext#7944 2017-03-13 13:16:37 +05:30
Nabin Hait
9414bec421 Merge pull request #2855 from pratu16x7/search-fixes
Revert to search table name field
2017-03-13 13:13:34 +05:30
pratu16x7
53aea6fe92 Revert to global search table name field 2017-03-13 13:03:58 +05:30
Nabin Hait
a610705773 Merge pull request #2853 from saurabh6790/v8_patch_fixes
[fix] reordering patch to avoid circular dependency
2017-03-13 11:40:26 +05:30
Nabin Hait
cc426dcbc5 Merge pull request #2852 from mbauskar/develop
Filtered transaction doctype from link_doctype field in dynamic link and other minor fixes
2017-03-13 11:19:17 +05:30
Saurabh
f8c84c45b5 [fix] reordering patch to avoid circular dependency 2017-03-13 11:17:08 +05:30
Nabin Hait
3a8680fe48 Merge pull request #2851 from pratu16x7/search-fixes
Search fixes
2017-03-13 11:16:41 +05:30
mbauskar
5148c2cd2e [minor] fixed likes count margin issue 2017-03-13 10:40:13 +05:30
mbauskar
e7b520d443 [minor] don't allow transactions in contact/address link_doctype field 2017-03-13 10:39:31 +05:30
pratu16x7
39e4952ccf Title case, use gs title column, exclude docstatus 2 2017-03-13 10:12:25 +05:30
pratu16x7
5b7d5c1236 sanitize title, remove gs repeats 2017-03-13 10:12:25 +05:30
pratu16x7
5d0a3ef5a8 uppercase match 2017-03-13 10:12:25 +05:30
Rushabh Mehta
3c95bd36c6 [minor] fixes to router.py 2017-03-13 09:52:14 +05:30
Nabin Hait
08a2b87330 Merge pull request #2844 from mbauskar/hotfix
[hook] added before_change hook to trigger email_alerts before db_set
2017-03-12 16:52:45 +05:30
Nabin Hait
66e998401a Merge pull request #2850 from rohitwaghchaure/enhance_page_and_report
[Enhance] Keep page and report fields read only, if developer mode if disabled
2017-03-12 16:31:11 +05:30
Nabin Hait
4833f7285f Merge pull request #2847 from rohitwaghchaure/custom_role_issue
[Enhance] Role permission for page and report, added reset roles button
2017-03-12 16:30:53 +05:30
Nabin Hait
8b1f4e2fe0 Merge pull request #2849 from mbauskar/develop
[minor] hide custom buttons in customize form if form type is not sel…
2017-03-12 16:30:39 +05:30
Rohit Waghchaure
f16c2b76e7 [Enhance] Keep page and report fields read only, if developer mode if disabled 2017-03-12 14:51:00 +05:30
mbauskar
e9ba98660e [minor] hide custom buttons in customize form if form type is not selected 2017-03-11 16:28:47 +05:30
Rohit Waghchaure
da424049a1 [Enhance] Role permission for page and report, added reset roles button 2017-03-11 13:49:25 +05:30
Faris Ansari
ed15f52980 [setupwizard] active color on completed steps (#2845) 2017-03-11 13:24:06 +05:30
Rushabh Mehta
cd3257d2d3 [minor] rever set_footnote function 2017-03-10 15:35:05 +05:30
Nabin Hait
e3b63b7348 Merge pull request #2843 from rmehta/remove-push-notifications
[minor] remove push notifications
2017-03-10 14:38:43 +05:30
Nabin Hait
208ad88c55 Merge pull request #2841 from rmehta/clear-notifications
[fix] clear notifications for user
2017-03-10 14:29:52 +05:30
Nabin Hait
40608add4f Updated modified in email account json 2017-03-10 13:08:59 +05:30
Rushabh Mehta
3716564b8f [minor] remove notifications 2017-03-10 12:22:08 +05:30
Rushabh Mehta
82254cbe68 [minor] remove push notifications 2017-03-10 11:47:18 +05:30
Rushabh Mehta
479b4f37ee [fix] tab in grid, fixes frappe/erpnext#7974 2017-03-10 11:41:38 +05:30
mbauskar
5cd886b8cf [hook] added before_change hook to trigger email_alerts before db_set 2017-03-10 09:51:01 +05:30