Commit graph

18041 commits

Author SHA1 Message Date
Suraj Shetty
c19befeb5b
fix: Don't assume async value == True
fix: Don't assume async value == True
2019-02-18 08:45:38 +05:30
Suraj Shetty
8a5ea95dbc
fix: delete_bulk method
fix: delete_bulk_fix
2019-02-18 08:32:08 +05:30
Himanshu Warekar
54da12efd0 delete_bulk_fix 2019-02-17 18:23:12 +05:30
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments
BREAKING CHANGE: Comments are now handled separately from Communication and Version
2019-02-16 16:54:16 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Frappe Bot
f7da1a7124 Merge branch 'hotfix' 2019-02-15 10:17:14 +00:00
Frappe Bot
73001d8202 bumped to version 11.1.6 2019-02-15 10:17:14 +00:00
Zarrar
5ddf3c10bb fix: Language Code naming validation (#6933)
* fix: language code naming fix

* fix: validate name and language code
2019-02-15 15:10:14 +05:30
Saif
cc0ce14f67 fix: Update DataTable hook for columnTotal (#6904)
Update for changes in https://github.com/frappe/datatable/pull/55
2019-02-15 15:01:22 +05:30
Aditya Hase
d9a317e202 fix(desk): Prepared Report fixes (#6939)
* fix(desk): Fetch prepared report matching filter values

* fix(desk): Ignore filters when prepared report doc name is given

* fix(desk): Delete prepared report if data is corrupted

* style: Linting fixes
2019-02-15 15:00:05 +05:30
Rushabh Mehta
e850721d05
Merge pull request #6843 from Zlash65/enh-treeview
feat: Minor additional enhancements to Treeview
2019-02-15 14:30:38 +05:30
Aditya Hase
683be9e096 feat(error-report): Collect frame locals in error report (#6938)
* feat(error-report): Collect frame locals in error report

* style: Linting fixes
2019-02-15 14:24:08 +05:30
Rushabh Mehta
7bf55bbf2c fix: add pylintrc 2019-02-15 14:23:52 +05:30
Suraj Shetty
0f47bb0149
Merge pull request #6942 from netchampfaris/fix-permlevel-in-print
fix: Permlevel check in Print
2019-02-15 13:02:59 +05:30
Faris Ansari
2fd6cd65f5 fix: Permlevel check in Print
Stupid check hides fields with permlevel > 0 no matter who has access
2019-02-15 12:48:33 +05:30
Rushabh Mehta
b7225b190d
Merge pull request #6937 from jay-parikh/app_icon
fix: svg logo not working for Desk Icon
2019-02-15 11:40:18 +05:30
Rushabh Mehta
a2a965ecac
Merge pull request #6934 from netchampfaris/fix-password-update-message
fix: Clear server messages after Password Update
2019-02-15 11:39:20 +05:30
Jay Parikh
ca7fb4df3a Fix - svg logo not working for Desk Icon 2019-02-14 11:59:43 +00:00
Faris Ansari
917f7c8419 fix: Clear server messages after Password Update 2019-02-14 15:31:01 +05:30
Rushabh Mehta
9bff219907
Merge pull request #6925 from saurabh6790/import_customizations
fix: do not delete existing custom fields while importing new custom fields
2019-02-14 12:13:57 +05:30
Rushabh Mehta
ebdd219fbf
Merge pull request #6913 from saurabh6790/scrub_new_lines_and_white_spaces
fix: scrub new lines and white spaces from options and fetch_from field
2019-02-14 12:12:50 +05:30
Rushabh Mehta
f806f80665
Merge pull request #6923 from Zlash65/email-sender-name
feat: Use Email Account name as Sender's name
2019-02-14 12:12:14 +05:30
Rushabh Mehta
eb30f8214f
Merge pull request #6927 from netchampfaris/fix-get-build-version
fix: Fallback for get_build_version
2019-02-14 12:08:45 +05:30
Rushabh Mehta
113dd08ba3
Merge pull request #6928 from netchampfaris/datatable-min-height
fix: Set minimum body height so that scrollbar does not overlap
2019-02-14 12:08:25 +05:30
Rushabh Mehta
457c5656d0
Merge pull request #6930 from surajshetty3416/fix-permission-failures
fix: get_descendants method and index user in user permissions
2019-02-14 12:08:06 +05:30
Saurabh
a01f1c80f8 fix:too many arguments 2019-02-14 11:18:05 +05:30
Suraj Shetty
fadb3f79ec Remove unwanted trailing spaces 2019-02-13 23:07:09 +05:30
Suraj Shetty
d014e02768 Index user field in User Permission doctype for faster select query 2019-02-13 23:00:40 +05:30
Suraj Shetty
a9e9c2e9a0 Return empty list from get_decendants if doc not found 2019-02-13 22:59:20 +05:30
Rushabh Mehta
f00394ba13 fix: linting (nosec) 2019-02-13 18:49:22 +05:30
Faris Ansari
37cb76346c fix: Set minimum body height so that scrollbar does not overlap 2019-02-13 17:51:30 +05:30
Faris Ansari
d5dd0e06f8 fix: Fallback for get_build_version 2019-02-13 17:47:44 +05:30
Rushabh Mehta
b531695de7
Merge pull request #6920 from rmehta/refactor-letter-head
feat(letter head): ability to set letter head directly from image
2019-02-13 16:52:08 +05:30
Rushabh Mehta
d610ce9522 fix(tests): tests and linting 2019-02-13 16:50:34 +05:30
Saurabh
dae4b958fe fix: do not delete existing custom fields while importing new custom fields 2019-02-13 13:18:07 +05:30
Zlash65
9d61601829 feat: replace sender name by email account name 2019-02-12 17:37:45 +05:30
Zlash65
6a2458d345 feat: use email account name as sender name 2019-02-12 17:36:29 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Sagar Vora
af1e7b1443 Merge branch 'hotfix' 2019-02-12 16:18:43 +05:30
Sagar Vora
ead9bde39d bumped to version 11.1.5 2019-02-12 16:38:43 +05:50
Sagar Vora
ea82d6b485
fix: unfreeze oauthlib, requests-oauthlib (#6922) 2019-02-12 16:14:38 +05:30
Suraj Shetty
715606b62d
fix(typo): Exection -> Execution 2019-02-12 15:07:26 +05:30
Rushabh Mehta
edb3d4d256 revert: fix for get_attachments 2019-02-12 12:40:09 +05:30
Prateeksha Singh
cd703ee532
Merge pull request #6921 from pratu16x7/explore-2.0-fixes
chore(modules): cleanup helper methods
2019-02-12 12:15:38 +05:30
Prateeksha Singh
d73709d1ca chore(modules): cleanup helper methods 2019-02-12 12:12:01 +05:30
Suraj Shetty
73c9cbec60
fix(typo): vale -> value 2019-02-12 10:54:19 +05:30
Faris Ansari
5f2d3fe764
Merge pull request #6882 from nabinhait/default-perm
fix: Set field default based on user permissions
2019-02-12 10:07:51 +05:30
Suraj Shetty
e19bb40031
Merge pull request #6879 from SaiFi0102/Fix-Report-Int-Format
fix(Query Report): Do not preformat before frappe.format
2019-02-12 10:00:46 +05:30
Rushabh Mehta
fc80532a80 fix: default source for letter head to be image 2019-02-12 09:58:09 +05:30
Rushabh Mehta
ddefbf9dfc feat(letter head): ability to set letter head directly from image 2019-02-12 09:56:23 +05:30