Commit graph

18065 commits

Author SHA1 Message Date
Aditya Hase
a87b9cc3bd fix: Clear duplicate entry message (#6961) 2019-02-19 23:52:57 +05:30
Sagar Vora
56a221573b Merge branch 'master' into develop 2019-02-19 17:52:19 +05:30
Sagar Vora
eead6809e1 Merge branch 'hotfix' 2019-02-19 17:50:39 +05:30
Sagar Vora
94a61b40fe bumped to version 11.1.7 2019-02-19 18:10:39 +05:50
Rushabh Mehta
86b45971ab
Merge pull request #6960 from rmehta/fix-uidvalidity
fix(email): default UIDVALIDITY to 0
2019-02-19 14:31:51 +05:30
Faris Ansari
308fa1318f fix: Ignore duplicate entry for Chat Profile (#6959)
![image](https://user-images.githubusercontent.com/9355208/52956076-55e96600-33b4-11e9-9580-6e5173f1fbe2.png)
2019-02-19 14:30:05 +05:30
Rushabh Mehta
572edb08ba fix(email): default UIDVALIDITY to 0 2019-02-19 14:28:14 +05:30
Deepesh Garg
953f2c466f fix: Doctypes not showing in data export (#6956)
The maximum length for a `GET` request is 4096 bytes which is crossed in this case.
2019-02-19 14:23:39 +05:30
Aditya Hase
c08bdd88a8 fix: Jinja template error (#6958)
https://github.com/frappe/frappe/pull/6957
2019-02-19 14:22:01 +05:30
Aditya Hase
4b4d59026f fix: Jinja template error (#6957)
Errors in Custom Print Format are not framework errors and should not have a "Report Issue" button
2019-02-19 14:19:51 +05:30
Rushabh Mehta
849f158a3a chore: make controller boiler-plates linting friendly 2019-02-19 11:09:02 +05:30
Rushabh Mehta
9f3a55da89 fix(patch): drop_column_apply_user_permissions 2019-02-18 21:43:13 +05:30
Himanshu
5e5c9f103d fix(router): Router Fix if Doc Name contains '?' (#6945)
- Router Show Page Not Found when there is a '?' in the doc name as it considers everything after '?' as argument

- When the name of doc is 'New' it considers as you are creating a new doc every time you visit it.

- After the fix, it checks if there is an '=' in name to check if there is an argument passed in the URL

- _Doesn't break the 'New' functionality_
2019-02-18 19:23:19 +05:30
Rushabh Mehta
6c12448554 fix(typo): notify_mentions in comment 2019-02-18 17:59:39 +05:30
Rushabh Mehta
2130dd69de fix: add comment in communication 2019-02-18 16:37:51 +05:30
Rushabh Mehta
dcc3d41d43
Merge pull request #6947 from surajshetty3416/fix-multiselect
fix: Add custom get_value to multiselect
2019-02-18 11:35:37 +05:30
Rushabh Mehta
946b7bac8c
Merge pull request #6948 from surajshetty3416/fix-listview-refresh
fix: listview load
2019-02-18 11:34:23 +05:30
Rushabh Mehta
d0b9d1f026 fix(patch): drop apply_user_permissions column before reloading comment 2019-02-18 11:16:35 +05:30
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
699fd3cc08
fix: Do not cache get_hooks in developer_mode
fix: Dont cache get_hooks in developer_mode
2019-02-18 08:34:04 +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
Suraj Shetty
8e06d1a894 Fix listview load 2019-02-17 15:45:53 +05:30
Suraj Shetty
7984036ca4 Fix codacy 2019-02-16 21:03:17 +05:30
Faris Ansari
178c553b5d fix: Dont cache get_hooks in developer_mode 2019-02-16 19:51:07 +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
Suraj Shetty
58e19de1ce Remove extra code 2019-02-16 16:19:13 +05:30
Suraj Shetty
e4e6d2796c Add custom get_value to get repective value in
the option list instead of label selected by user
2019-02-16 16:15:20 +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