mbauskar
|
b78491516b
|
Merge branch 'master' into develop
|
2017-08-23 08:45:06 +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
|
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 |
|
mbauskar
|
f832ae52a6
|
resolved merge conflicts
|
2017-08-22 19:43:17 +05:30 |
|
mbauskar
|
e872d4b0e8
|
Merge branch 'master' into develop
|
2017-08-22 19:40:13 +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 |
|
Rushabh Mehta
|
8dba5d06a3
|
Merge pull request #3966 from adityahase/fix-python3
Fix some Python 3 incompatibilities issues
|
2017-08-22 17:34:47 +05:30 |
|
Aditya Hase
|
7da257bfaa
|
Use raise instead of six.reraise
|
2017-08-22 17:20:39 +05:30 |
|
Aditya Hase
|
00c655b2f4
|
Decode string before passsing to regex.match
|
2017-08-22 17:20:35 +05:30 |
|
Rushabh Mehta
|
3d78cabfe9
|
[merge] hotfix
|
2017-08-22 15:48:19 +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
|
a3bc668da1
|
Merge pull request #3961 from netchampfaris/email-tags
Remove meta and style tags from email communication
|
2017-08-22 13:23:07 +05:30 |
|
Rushabh Mehta
|
fb1aec1de7
|
Merge pull request #3963 from netchampfaris/no-reload-prompt-in-dev-mode
Dont ask for reload prompt in dev mode
|
2017-08-22 13:22:51 +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 |
|
Faris Ansari
|
51d0cba35a
|
Dont ask for reload prompt in dev mode
|
2017-08-22 12:50:43 +05:30 |
|
Rushabh Mehta
|
8c49f0b7a7
|
[fix] lint
|
2017-08-22 12:41:06 +05:30 |
|
Faris Ansari
|
ae272c88c2
|
Remove meta and style tags from email communication
|
2017-08-22 12:26:18 +05:30 |
|
Rushabh Mehta
|
a23a8ddc2e
|
[fix] search icon for reportview
|
2017-08-22 12:18:28 +05:30 |
|
Rushabh Mehta
|
3ba0baaff4
|
Merge pull request #3947 from rmehta/print-style
[added] print style
|
2017-08-22 11:03:51 +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
|
54b6c2244d
|
Merge branch 'master' into develop
|
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
|
0bc687f592
|
Merge pull request #3952 from netchampfaris/datebetween-filter
[fix] DateRange filter when language is not en frappe/erpnext#10307
|
2017-08-21 15:08:34 +05:30 |
|
Rushabh Mehta
|
11899dbb81
|
Merge pull request #3953 from ci2014/patch-10
Update file.py
|
2017-08-21 15:07:46 +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
|
f8fd415eec
|
Merge branch 'master' into develop
|
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
|
5e3db25edb
|
[fix] timeline.js
|
2017-08-20 16:44:55 +05:30 |
|
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 |
|
ci2014
|
341e71ae86
|
Update file.py
There were problems with Image links from Facebook for example, because they have and need ?parameter1=abc¶meter2=def in their address.
|
2017-08-18 15:39:38 +02:00 |
|
Faris Ansari
|
d41ebe587f
|
[fix] minor
|
2017-08-18 16:42:00 +05:30 |
|
Faris Ansari
|
54406fbc55
|
no need of regex
|
2017-08-18 16:29:50 +05:30 |
|
Faris Ansari
|
df7fac641a
|
[fix] DateRange filter when language is not en
|
2017-08-18 16:21:10 +05:30 |
|
Rushabh Mehta
|
e62de7b0e7
|
[minor] print_style.js
|
2017-08-18 15:03:41 +05:30 |
|
Rushabh Mehta
|
7dedc69461
|
[print-style] sync, fix tests and remove selection
|
2017-08-18 14:53:38 +05:30 |
|
Rushabh Mehta
|
6357633de0
|
Merge pull request #3933 from netchampfaris/currency-precision
Currency precision
|
2017-08-18 14:21:02 +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 |
|
Rushabh Mehta
|
4b94db7851
|
Merge pull request #3950 from netchampfaris/comments-in-report
Show comments in report
|
2017-08-18 12:27:11 +05:30 |
|