Nabin Hait
|
e9126dfce0
|
Merge branch 'master' into develop
|
2017-09-27 18:25:14 +05:30 |
|
Nabin Hait
|
5cd8d4e8a0
|
Merge branch 'hotfix'
|
2017-09-27 18:25:14 +05:30 |
|
Nabin Hait
|
0180b05a8b
|
bumped to version 9.0.5
|
2017-09-27 18:55:14 +06:00 |
|
Rushabh Mehta
|
3b6ed442af
|
[fix] frappe/erpnext#10939
|
2017-09-27 18:20:20 +05:30 |
|
Nabin Hait
|
da5bdcf513
|
Merge branch 'master' into develop
|
2017-09-27 17:27:04 +05:30 |
|
Nabin Hait
|
e689cb0230
|
Merge branch 'hotfix'
|
2017-09-27 17:27:03 +05:30 |
|
Nabin Hait
|
1dfce98096
|
bumped to version 9.0.4
|
2017-09-27 17:57:03 +06:00 |
|
Rushabh Mehta
|
32d87a92c3
|
[fix] revert to fallback if socketio does not start the first time (#4198)
|
2017-09-27 17:23:12 +05:30 |
|
Nabin Hait
|
6bf332eba7
|
Merge branch 'master' into develop
|
2017-09-27 17:18:54 +05:30 |
|
Nabin Hait
|
3280f6f376
|
Merge branch 'hotfix'
|
2017-09-27 17:18:53 +05:30 |
|
Nabin Hait
|
49862ef226
|
bumped to version 9.0.3
|
2017-09-27 17:48:53 +06:00 |
|
Rushabh Mehta
|
fbf8da1d37
|
[minor] compileall after migrate, might solve timeouts on VM (#4197)
|
2017-09-27 15:31:51 +05:30 |
|
Nabin Hait
|
f367e054b2
|
Merge branch 'master' into develop
|
2017-09-27 13:42:53 +05:30 |
|
Nabin Hait
|
85460b8413
|
Merge branch 'hotfix'
|
2017-09-27 13:42:53 +05:30 |
|
Nabin Hait
|
0d07a9b2e4
|
bumped to version 9.0.2
|
2017-09-27 14:12:52 +06:00 |
|
Rushabh Mehta
|
9b6ad9022c
|
[fix] smaller chunks, longer keep-alive (#4196)
|
2017-09-27 13:24:50 +05:30 |
|
Nabin Hait
|
0da844dae0
|
Merge branch 'master' into develop
|
2017-09-27 13:03:10 +05:30 |
|
Nabin Hait
|
6afede2aab
|
Merge branch 'hotfix'
|
2017-09-27 13:03:10 +05:30 |
|
Nabin Hait
|
adef7e2e75
|
bumped to version 9.0.1
|
2017-09-27 13:33:10 +06:00 |
|
Makarand Bauskar
|
ad1c04850c
|
[hotfix] send email from sender's email account if From field is selected on communication view (#4181)
* [hotfix] send email from sender's email account if From field is selected on communication view
* [fixes] codecy fixes
|
2017-09-27 12:41:35 +05:30 |
|
Faris Ansari
|
ea1af868a8
|
Fix filters (#4194)
* [fix] Filters
* [fix] translation method
|
2017-09-27 12:40:12 +05:30 |
|
Rushabh Mehta
|
be6c1c18e4
|
Merge pull request #4191 from adityahase/tests3-passing-branch
Python 3 frappe test fixes
|
2017-09-27 10:38:44 +05:30 |
|
Rushabh Mehta
|
2dccaf5071
|
Merge pull request #4192 from mbauskar/message
[minor] fixed template error on frappe.confirm if message has '
|
2017-09-27 08:52:36 +05:30 |
|
mbauskar
|
c948197d3f
|
[minor] fixed template error on frappe.confirm if message has '
|
2017-09-27 07:20:18 +05:30 |
|
Aditya Hase
|
1d53cd89bf
|
Encode string before hashing
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
9a0d6ce056
|
Don't index dict.items()
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
2aa4186af5
|
Explicitly convert filter object to string
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
234fca90a3
|
Encode content if not encoded before hashing
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
635a48c337
|
Use zxcvbn-python instead of zxcvbn
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
cd737debcb
|
Open CSV file in binary mode while writing bytes
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
1a0eaa4aaa
|
Convert rendered html to unicode before substring matching
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
c222744829
|
Convert dict.items() to list explicitly for deleting elems while iterating
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
943f548c1e
|
Use 'key' keyword argument with list.sort
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
f7da376279
|
Convert dict.keys() to list explicitly for deleting elems while iterating
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
a1bbc200c7
|
Explicitly pass str to email.message.replace
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
96a1c17325
|
Explicitly pass bytes to quopri.encodestring
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
62af6bf37d
|
Encode unicode strings before hmac
|
2017-09-27 01:08:07 +05:30 |
|
Aditya Hase
|
52c7b04932
|
Use next(iter) instead of iter.next()
|
2017-09-27 01:08:07 +05:30 |
|
Manas Solanki
|
133f4b4fdd
|
Print format in the email alert (#4190)
* print format in the email alert
* set query for the email alert
|
2017-09-26 21:08:34 +05:30 |
|
Nabin Hait
|
b2945fd5b5
|
Fixed merge conflict
|
2017-09-26 16:05:38 +05:30 |
|
Nabin Hait
|
645526bb28
|
Merge branch 'staging'
|
2017-09-26 16:02:54 +05:30 |
|
Nabin Hait
|
714444bf5f
|
bumped to version 9.0.0
|
2017-09-26 16:32:53 +06:00 |
|
Rushabh Mehta
|
5601c0024f
|
[test] revert naming series if name fails
|
2017-09-26 12:49:48 +05:30 |
|
Rushabh Mehta
|
556d21d7ca
|
Merge pull request #4170 from maxtorete/fix_margins
Fixed problem with margin top and bottom overwritten in print format (#3451)
|
2017-09-26 12:47:30 +05:30 |
|
Rushabh Mehta
|
4e67c04b13
|
Merge pull request #4179 from netchampfaris/add-to-desktop
[Fixes] Desktop Icon, Image view in mobile
|
2017-09-26 12:42:17 +05:30 |
|
Rushabh Mehta
|
32003d1b20
|
Merge pull request #4182 from frappe-pr-bot/translations-2017-09-25
[Translation] Updated Translations
|
2017-09-26 12:41:36 +05:30 |
|
Rushabh Mehta
|
b7b2932afe
|
Merge pull request #4183 from manassolanki/email-queue
make the attached file visible and read only in email queue
|
2017-09-26 12:41:25 +05:30 |
|
Rushabh Mehta
|
0e6fd7e3ac
|
Merge pull request #4187 from pratu16x7/staging
[fix] Heatmap values by date strings, setup indicator
|
2017-09-26 12:38:31 +05:30 |
|
Rushabh Mehta
|
7b9f8ee785
|
[test] revert naming series if name fails
|
2017-09-26 12:37:19 +05:30 |
|
pratu16x7
|
a15c2a53a2
|
[minor]
|
2017-09-26 12:27:47 +05:30 |
|