Rushabh Mehta
|
96119cfa28
|
Merge pull request #3949 from tundebabzy/issue-erpnext-10403
Tags auto-deleting (frappe/erpnext#10403)
|
2017-08-18 09:05:55 +05:30 |
|
tunde
|
1040eb9e47
|
in make_tag, extend doc._user_tags
|
2017-08-17 23:03:16 +01:00 |
|
tunde
|
66d2bfe318
|
split me.user_tags only if it is truthy
|
2017-08-17 23:02:54 +01:00 |
|
tunde
|
a0e95877f6
|
adds some jsdocs style function comments
|
2017-08-17 20:23:06 +01:00 |
|
tunde
|
4996771f8e
|
adds new function is_disabled_field
|
2017-08-17 14:17:02 +01:00 |
|
Faris Ansari
|
473083ae9d
|
fix event color patch (#3943)
|
2017-08-17 18:38:12 +05:30 |
|
Rushabh Mehta
|
19e9834850
|
[added] print style
|
2017-08-17 18:34:14 +05:30 |
|
Faris Ansari
|
80b9e5aa3c
|
fix codacy
|
2017-08-17 12:50:15 +05:30 |
|
Faris Ansari
|
b501964e1c
|
fix test
|
2017-08-17 11:57:13 +05:30 |
|
Faris Ansari
|
18538184d7
|
Fix fmt_money tests
|
2017-08-17 11:51:35 +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 |
|
mbauskar
|
8e5becf32b
|
Merge branch 'master' into develop
|
2017-08-17 11:00:37 +05:30 |
|
mbauskar
|
e6f89d91b6
|
bumped to version 8.7.8
|
2017-08-17 11:30:37 +06:00 |
|
Makarand Bauskar
|
7bf6c19a31
|
[hotfix] daily_emails limit fixes (#3942)
|
2017-08-17 10:59:26 +05:30 |
|
Nabin Hait
|
2243fe154c
|
minor fix in email queue status patch
|
2017-08-17 10:55:54 +05:30 |
|
mbauskar
|
1d77bde8a3
|
Merge branch 'master' into staging
|
2017-08-16 20:04:53 +05:30 |
|
mbauskar
|
a6dbec7d6d
|
Merge branch 'hotfix'
|
2017-08-16 20:04:53 +05:30 |
|
mbauskar
|
40e140d287
|
Merge branch 'master' into develop
|
2017-08-16 20:04:53 +05:30 |
|
mbauskar
|
3575329c95
|
bumped to version 8.7.7
|
2017-08-16 20:34:53 +06:00 |
|
Makarand Bauskar
|
965a7460ac
|
[hotfix] set email queue status to Not Sent (#3941)
|
2017-08-16 20:04:10 +05:30 |
|
rohitwaghchaure
|
cd5867da01
|
[Urgent] Wrong workflow status showing on the form (#3940)
|
2017-08-16 19:56:45 +05:30 |
|
mbauskar
|
612afbfdb0
|
resolved merge conflicts
|
2017-08-16 18:25:35 +05:30 |
|
mbauskar
|
bc603de8be
|
resolved conflicts
|
2017-08-16 18:24:21 +05:30 |
|
mbauskar
|
2849cd95e9
|
Merge branch 'hotfix'
|
2017-08-16 18:17:28 +05:30 |
|
mbauskar
|
9f277db145
|
bumped to version 8.7.6
|
2017-08-16 18:47:28 +06:00 |
|
Makarand Bauskar
|
91d87814ca
|
[hotfix] add daily_emails limit to set-limit command (#3939)
|
2017-08-16 18:14:20 +05:30 |
|
Rushabh Mehta
|
1c8d3326a1
|
Merge pull request #3937 from mbauskar/daily-email-limits
[hotfix] check daily email limit before sending emails
|
2017-08-16 17:16:16 +05:30 |
|
mbauskar
|
02cc55dd48
|
[hotfix] minor fixes
|
2017-08-16 16:42:50 +05:30 |
|
Rushabh Mehta
|
f1e8478dfe
|
Merge pull request #3936 from netchampfaris/hotfix
Patch old event colors to hex
|
2017-08-16 16:33:55 +05:30 |
|
mbauskar
|
ce8f76ff4a
|
[hotfix] check daily email limit before sending emails
|
2017-08-16 16:15:26 +05:30 |
|
Faris Ansari
|
af74d7a729
|
codacy fix
|
2017-08-16 16:04:41 +05:30 |
|
Faris Ansari
|
702dd1b73a
|
codacy fix
|
2017-08-16 16:02:57 +05:30 |
|
Faris Ansari
|
73aa0a35c4
|
Patch old event colors to hex
|
2017-08-16 15:51:15 +05:30 |
|
Makarand Bauskar
|
7cd17ffa94
|
[hotfix] set the file_url on file field on change event (#3934)
|
2017-08-16 14:52:15 +05:30 |
|
Faris Ansari
|
67e16a58a6
|
[fix] unsubscribe link shouldn't append always (#3932)
|
2017-08-16 14:12:48 +05:30 |
|
Faris Ansari
|
1dc9baf9d3
|
Add tests
|
2017-08-16 13:15:35 +05:30 |
|
Faris Ansari
|
65794892de
|
Currency precision: remove trailing zeros
|
2017-08-16 13:15:30 +05:30 |
|
Rushabh Mehta
|
44bf8eb3aa
|
Merge branch 'staging' into develop
|
2017-08-15 12:31:58 +05:30 |
|
Rushabh Mehta
|
cfb7f4bd36
|
[fix] reply for email
|
2017-08-15 12:31:28 +05:30 |
|
Rushabh Mehta
|
3583dd1968
|
Merge pull request #3927 from rmehta/email-alert-configurable
[minor] make email alert configurable, so we can use it list default print formats
|
2017-08-14 18:28:06 +05:30 |
|
Rushabh Mehta
|
49ba5828fc
|
Merge pull request #3929 from mbauskar/get_filters_cond_fixes
[hotfix] filters with the special characters are escaped twice
|
2017-08-14 17:05:57 +05:30 |
|
Rushabh Mehta
|
5ce92a58de
|
Merge pull request #3930 from robulik/master
[minor] fix of translatable terms
|
2017-08-14 17:04:47 +05:30 |
|
Robert Kirschner
|
67668684ab
|
[minor] fix of translatable terms
|
2017-08-14 13:12:30 +02:00 |
|
mbauskar
|
1b99d82856
|
[hotfix] filters with the special characters are escaped twice
|
2017-08-14 16:34:20 +05:30 |
|
Rushabh Mehta
|
05c88fa3f0
|
[minor] make email alert configurable, so we can use it list default print formats
|
2017-08-14 12:58:32 +05:30 |
|
mbauskar
|
5695a20ea9
|
Merge branch 'master' into staging
|
2017-08-14 12:31:52 +05:30 |
|
mbauskar
|
8c5656b99d
|
Merge branch 'master' into develop
|
2017-08-14 12:31:52 +05:30 |
|
mbauskar
|
31e1224228
|
Merge branch 'hotfix'
|
2017-08-14 12:31:51 +05:30 |
|
mbauskar
|
45daefd956
|
bumped to version 8.7.5
|
2017-08-14 13:01:51 +06:00 |
|