Rushabh Mehta
2377434d39
Merge branch 'master' into develop
2017-08-24 16:51:27 +05:30
Rushabh Mehta
5882e5bc66
bumped to version 8.8.4
2017-08-24 17:21:27 +06:00
Rushabh Mehta
b6a17de4a9
Merge pull request #3993 from rmehta/file-delete-message
...
[fix] show better message for permission to delete file
2017-08-24 16:50:47 +05:30
Rushabh Mehta
a8773a5570
Merge pull request #3991 from rmehta/import-xls-fix
...
[fix] importer.py, allow for truncated rows due to xls import
2017-08-24 16:49:34 +05:30
Manas Solanki
48e7d5d87e
remove the markup while exporting the reports in csv format
2017-08-24 16:36:56 +05:30
Aditya Hase
a816dcfe0f
Use explicit relative import while importing install_fixtures
2017-08-24 16:34:44 +05:30
Aditya Hase
cfc97ba3b6
Convert filter to list before checking length
2017-08-24 16:34:44 +05:30
Rushabh Mehta
e8c7b046ee
[fix] show better message for permission to delete file
2017-08-24 16:21:39 +05:30
Rushabh Mehta
edd853c509
Merge pull request #3989 from netchampfaris/hotfix
...
[Fix] Desk assets for mobile
2017-08-24 16:08:16 +05:30
Rushabh Mehta
3404445719
Merge pull request #3992 from ashwinisave35/help_aricle_button
...
Added data attribute data-communication-type to filter "Help Article" Button for communication type "Comment"
2017-08-24 16:08:02 +05:30
Rushabh Mehta
16129ce785
[fix] catch error in data import
2017-08-24 16:05:47 +05:30
Rushabh Mehta
4e456b4e42
[fix] importer.py, allow for truncated rows due to xls import
2017-08-24 15:49:47 +05:30
Ashwini Save
1b3e48cc1e
Added data attribte data-communication-type to filter "Help Article" button for Comment.
2017-08-24 15:03:22 +05:30
Faris Ansari
598930fca9
[fix] desk assets for mobile
2017-08-24 14:26:53 +05:30
Rushabh Mehta
09596f1d32
[minor] bench request
2017-08-24 13:48:08 +05:30
Rushabh Mehta
4b6f263390
[fix] workflow fails to revert, fixes frappe/erpnext#5519 ( #3964 )
2017-08-23 18:22:09 +05:30
Rushabh Mehta
6b45f8a988
[minor] send me a copy is sticky, fixes frappe/erpnext#2367 ( #3974 )
2017-08-23 18:19:20 +05:30
Rushabh Mehta
65dc3b99a9
[fix] grid refresh async, fixes frappe/erpnext#10391 ( #3982 )
2017-08-23 18:16:16 +05:30
Rushabh Mehta
affb47a66f
[fix] filter formatting ( #3981 )
2017-08-23 18:15:21 +05:30
Rushabh Mehta
798451d254
[fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686 ( #3979 )
...
* [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686
* [minor] timeout not required
* Update layout.js
2017-08-23 18:12:59 +05:30
Rushabh Mehta
146247c17d
[fix] notification filters, fixes frappe/erpnext#9982 ( #3977 )
2017-08-23 18:06:03 +05:30
Saurabh
ada7967cd1
Merge pull request #3983 from netchampfaris/screenshot-class
...
screenshot class for email
2017-08-23 16:54:06 +05:30
Faris Ansari
edae5c484b
screenshot class for email
2017-08-23 16:53:00 +05:30
Rushabh Mehta
09a31f5ec0
[fix] tests
2017-08-23 15:37:08 +05:30
Nabin Hait
8f978ad2c3
Merge branch 'master' into staging
2017-08-23 14:45:55 +05:30
Nabin Hait
d5c9ad35b7
Merge branch 'master' into develop
2017-08-23 14:45:55 +05:30
Nabin Hait
cf3a4a61e8
Merge branch 'hotfix'
2017-08-23 14:45:54 +05:30
Nabin Hait
e3e525d5ba
bumped to version 8.8.3
2017-08-23 15:15:54 +06:00
Rushabh Mehta
94c7c83f77
[fix] frappe.get_active_domain
2017-08-23 14:44:02 +05:30
Faris Ansari
1cad0ae779
[fix] Validate color ( #3978 )
2017-08-23 14:41:19 +05:30
mbauskar
2c95983e4d
Merge branch 'develop' into staging
2017-08-23 13:18:55 +05:30
Rushabh Mehta
7a589a3bc2
[fix] restrict domains, fixes frappe/erpnext#9813 , frappe/erpnext#10235
2017-08-23 13:14:29 +05:30
mbauskar
7efd470c0d
Merge branch 'master' into develop
2017-08-23 13:05:20 +05:30
mbauskar
12aaad9ed0
Merge branch 'hotfix'
2017-08-23 13:05:19 +05:30
mbauskar
091cf22e92
bumped to version 8.8.2
2017-08-23 13:35:19 +06:00
Nabin Hait
ebaee98ecb
Don't show single and child table doctype in User Permission's allowed doctypes ( #3973 )
2017-08-23 11:22:33 +05:30
Rushabh Mehta
7697efcdd5
Merge pull request #3968 from adityahase/fix-list-keys
...
Explicitly convert dict.keys() to list
2017-08-23 10:25:17 +05:30
Rushabh Mehta
36eb4b5335
Merge pull request #3971 from omaraltayyan/patch-1
...
allow hidden columns in reports
2017-08-23 10:24:15 +05:30
Rushabh Mehta
0652262632
Update query_report.js
2017-08-23 10:24:04 +05:30
Rushabh Mehta
60e9412dbb
Merge pull request #3967 from ci2014/patch-11
...
Update __init__.py
2017-08-23 10:21:32 +05:30
Rushabh Mehta
ca5ce399f0
Merge pull request #3965 from mbauskar/get-filter-condition
...
[hotfix] check if the operator is passed in filters for get-filter-conditions
2017-08-23 10:20:45 +05:30
mbauskar
c931d99b39
Merge branch 'hotfix'
2017-08-23 08:45:06 +05:30
mbauskar
b78491516b
Merge branch 'master' into develop
2017-08-23 08:45:06 +05:30
mbauskar
483917e8e2
bumped to version 8.8.1
2017-08-23 09:15:05 +06:00
Makarand Bauskar
6200932fce
[hotfix] added filter_count var to base_list.js ( #3972 )
2017-08-23 08:44:21 +05:30
Omar Altayyan
1df8562697
allow hidden columns in reports
...
this code allowes the script report to hide certain columns by simply placing their width to -1 or less
this can be praticularly useful in complex reports where we (for example) use dynamic links and we want to hide the field used to indicate the dynamic link
2017-08-23 01:20:25 +03:00
mbauskar
5e72a1049a
resolved merge conflicts
2017-08-22 20:14:06 +05:30
mbauskar
27c58f6aea
Merge branch 'staging'
2017-08-22 20:06:55 +05:30
mbauskar
3dc6a37f5f
bumped to version 8.8.0
2017-08-22 20:36:55 +06:00
Makarand Bauskar
1c7e01e25c
[minor] added the change log for version 8.8.0 ( #3970 )
2017-08-22 20:06:09 +05:30
