Commit graph

14047 commits

Author SHA1 Message Date
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
pratu16x7
fa120c3ab3 [fix] values by date strings 2017-09-26 12:10:53 +05:30
pratu16x7
40e57efa52 [setup] indicator and check color 2017-09-26 12:05:50 +05:30
Makarand Bauskar
af88921ec4 [minor] Fix checkbox margin in RTL (#4148) 2017-09-26 11:47:44 +05:30
Rushabh Mehta
d384a478c2 [test] revert naming series if name fails 2017-09-26 11:42:53 +05:30
Manas Solanki
ea6987b451 make the attached file visible and read only 2017-09-25 17:01:21 +05:30
Nabin Hait
ce01845d11 Merge branch 'master' into staging 2017-09-25 16:30:13 +05:30
Nabin Hait
1d93c66285 Fixed merge conflict 2017-09-25 16:30:08 +05:30
Nabin Hait
2ce0f70c9a Merge branch 'hotfix' 2017-09-25 16:29:08 +05:30
Nabin Hait
552abc9db7 bumped to version 8.10.9 2017-09-25 16:59:07 +06:00
frappe-pr-bot
c9cb9b91ea [Translation] Updated Translations 2017-09-25 12:27:11 +02:00
Nabin Hait
d48ab277c3 Delete role from HasRole table on teardown of test_domainification 2017-09-25 15:24:23 +05:30
Faris Ansari
8af402bcb6 Set correct image url in cordova
fixes frappe/erpnext#10630, frappe/mobile#13
2017-09-25 13:12:46 +05:30
Faris Ansari
6626b31360 Add to Desktop menu item in tree view
fixes frappe/erpnext#10548
2017-09-25 13:12:46 +05:30
Nabin Hait
97959126a0 [fix] Set test naming series for test records 2017-09-25 13:11:46 +05:30
Rushabh Mehta
147917283a [fix] naming only once 2017-09-25 12:50:20 +05:30
Rushabh Mehta
a975ee2af8 Merge pull request #4166 from netchampfaris/webhook-fix
[fix] webhooks cache
2017-09-25 11:35:22 +05:30
Rushabh Mehta
562d4c4979 Merge pull request #4168 from maxtorete/develop
Fixed rounding problem in stripe integration (#10645)
2017-09-25 11:34:03 +05:30
Rushabh Mehta
8dfc79e1c0 Merge pull request #4172 from netchampfaris/keyboard-nav
Better keyboard navigation in setup wizard
2017-09-25 11:27:51 +05:30
Rushabh Mehta
bd1fc340f2 Merge pull request #4174 from bcornwellmott/xlsx_multi
Allow workbook pass in make_xlsx
2017-09-25 11:26:22 +05:30
Rushabh Mehta
6dc85d9385 Merge pull request #4175 from creador30/develop
[fix] dropbox upload of unicode filenames
2017-09-25 11:26:06 +05:30
Rushabh Mehta
e0410ca7fa [fix] desktop notifications 2017-09-25 11:21:01 +05:30
Rushabh Mehta
adc7ad69cd [fix] desktop notifications 2017-09-25 11:06:54 +05:30
Rushabh Mehta
cef8c6be38 [minor] web_page, allow any tags 2017-09-24 20:59:11 +05:30
Rushabh Mehta
1ee6ff1009 [fix] for blog 2017-09-24 20:54:28 +05:30