Rushabh Mehta
|
013f0bf001
|
Merge branch 'hotfix'
|
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 |
|
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
|
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 |
|
Faris Ansari
|
598930fca9
|
[fix] desk assets for mobile
|
2017-08-24 14:26:53 +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 |
|
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 |
|
Faris Ansari
|
1cad0ae779
|
[fix] Validate color (#3978)
|
2017-08-23 14:41:19 +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
|
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
|
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 |
|
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 |
|
mbauskar
|
f832ae52a6
|
resolved merge conflicts
|
2017-08-22 19:43:17 +05:30 |
|
mbauskar
|
a825342f75
|
Merge branch 'hotfix'
|
2017-08-22 19:40:13 +05:30 |
|
mbauskar
|
f5cf11a1dd
|
bumped to version 8.7.11
|
2017-08-22 20:10:13 +06:00 |
|
mbauskar
|
1481f03905
|
[hotfix] check if the operator is passed in filters for get-filter-conditions
|
2017-08-22 17:32:39 +05:30 |
|
Rushabh Mehta
|
40f4803799
|
Merge pull request #3960 from rmehta/search-icon-fix-1
[fix] search icon for reportview
|
2017-08-22 13:23:20 +05:30 |
|
Rushabh Mehta
|
224a06eef7
|
[fix] throttle running multiple times (#3962)
* [fix] throttle running multiple times
* [fix] lint
|
2017-08-22 12:51:14 +05:30 |
|
Rushabh Mehta
|
8c49f0b7a7
|
[fix] lint
|
2017-08-22 12:41:06 +05:30 |
|
Rushabh Mehta
|
a23a8ddc2e
|
[fix] search icon for reportview
|
2017-08-22 12:18:28 +05:30 |
|
Saurabh
|
b6fc88de36
|
Merge branch 'master' into staging
|
2017-08-21 15:48:55 +05:30 |
|
Saurabh
|
0f63f8a889
|
Merge branch 'hotfix'
|
2017-08-21 15:48:55 +05:30 |
|
Saurabh
|
69085c75e3
|
bumped to version 8.7.10
|
2017-08-21 16:18:54 +06:00 |
|
Saurabh
|
6a7aa57ef2
|
Merge pull request #3958 from saurabh6790/clear-limit-fix
[hot][fix] add daily_emails key in clear-limits check
|
2017-08-21 15:44:17 +05:30 |
|
Saurabh
|
087dd23e3b
|
[hot][fix] add daily_emails key in clear-limits check
|
2017-08-21 15:32:02 +05:30 |
|
Rushabh Mehta
|
013e2da67c
|
Merge pull request #3955 from rohitwaghchaure/minor_template_validation_issue
[minor] Skip template validation for js print format
|
2017-08-21 15:07:31 +05:30 |
|
mbauskar
|
3913bc542f
|
Merge branch 'master' into staging
|
2017-08-21 08:54:38 +05:30 |
|
mbauskar
|
e8d703adcc
|
Merge branch 'hotfix'
|
2017-08-21 08:54:37 +05:30 |
|
mbauskar
|
d1dce9035f
|
bumped to version 8.7.9
|
2017-08-21 09:24:37 +06:00 |
|
Rushabh Mehta
|
40ad63991c
|
[fix] timeline.js
|
2017-08-20 14:09:11 +05:30 |
|
Rohit Waghchaure
|
40bdc767dc
|
[minor] Bypass template validation for js print format
|
2017-08-19 15:15:58 +05:30 |
|
Rushabh Mehta
|
4e83014f4d
|
Merge pull request #3951 from mbauskar/custom-script
[hotfix] doctype field in custom script should be mandatory
|
2017-08-18 12:28:09 +05:30 |
|
mbauskar
|
2631edd4f3
|
[hotfix] doctype field in custom script should be mandatory
|
2017-08-18 11:31:51 +05:30 |
|
Faris Ansari
|
473083ae9d
|
fix event color patch (#3943)
|
2017-08-17 18:38:12 +05:30 |
|
mbauskar
|
7d278e36b8
|
Merge branch 'master' into staging
|
2017-08-17 11:00:37 +05:30 |
|
mbauskar
|
1fe2d626ca
|
Merge branch 'hotfix'
|
2017-08-17 11:00:37 +05:30 |
|