Commit graph

955 commits

Author SHA1 Message Date
Aditya Hase
9a0d6ce056 Don't index dict.items() 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
62af6bf37d Encode unicode strings before hmac 2017-09-27 01:08:07 +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
Ben Cornwell-Mott
0bc85c7431 Allow workbook pass in make_xlsx 2017-09-23 15:32:06 -07:00
maxtorete
c4ab2de7fd Fixed problem with margin top and bottom overwritten in print format (#3451) 2017-09-23 03:46:13 +02:00
Rushabh Mehta
80679f1b2f Merge pull request #4135 from mbauskar/backup
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
2017-09-20 11:22:00 +05:30
Rushabh Mehta
16148abc9b Update backups.py 2017-09-20 11:21:40 +05:30
mbauskar
6b5b78b3cf [minor] fixed uneven intendation, replaced spaces with tag 2017-09-19 16:12:22 +05:30
Nabin Hait
44277a35fb Delete backups if path exists 2017-09-18 15:41:00 +05:30
Rushabh Mehta
90fe449954 Merge pull request #4100 from rmehta/file-upload-socket
[feature] File upload using Socket.io by making chunks
2017-09-18 13:00:18 +05:30
mbauskar
bcc861ad28 [minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.* 2017-09-15 15:32:11 +05:30
Rushabh Mehta
733e29569c Merge pull request #4123 from Zlash65/email-char
[Fix] Accentuated characters are valid email's sender name
2017-09-14 15:49:02 +05:30
mbauskar
e462a90d20 Merge branch 'master' into develop 2017-09-14 15:24:18 +05:30
Zlash65
5f068f7e4f accented characters are valid names 2017-09-14 14:20:50 +05:30
Rushabh Mehta
3b41d031a7 [fix] file_manager.py 2017-09-14 13:07:29 +05:30
Rushabh Mehta
1de26c939c [enhance] use socket-io to upload files 2017-09-14 13:07:29 +05:30
Rushabh Mehta
fd7e8eda62 [wip] file upload with socketio 2017-09-14 13:07:29 +05:30
Saurabh
cb46380e64 [fix] if supervisor is restarting, do not queue the jobs (#4112)
* [fix] if supervisor is restarting, do not queue the jobs

* Update scheduler.py
2017-09-14 11:03:56 +05:30
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
pratu16x7
9cee53c33f [fix] specify exception 2017-09-08 16:03:51 +05:30
Rushabh Mehta
f66cfcece5 Update global_search.py 2017-09-08 15:47:32 +05:30
pratu16x7
1a3d0bb459 [fix] clear messages on exception 2017-09-08 15:46:03 +05:30
pratu16x7
0aaaca9b1a [fix] ignore results with non-existent doctypes 2017-09-08 15:45:36 +05:30
Rushabh Mehta
5338f5c95d [minor] list 2017-09-05 12:09:42 +05:30
Francisco
77c92c7e65 Goal Translatable 2017-09-04 15:17:25 -03:00
Aditya Hase
ac6ed0d328 Fix bleach_whitelist import 2017-09-04 16:05:57 +05:30
Aditya Hase
14800deea1 Use six.moves.urllib.parse.urljoin instead of urllib.basejoin 2017-09-04 16:05:57 +05:30
Aditya Hase
ba7412b621 Decode encryption key given by Fernet 2017-09-04 16:05:57 +05:30
Aditya Hase
a72cfef14a Use six.moves.xrange instead of xrange 2017-09-04 16:05:57 +05:30
pratu16x7
e847ffce30 [user-progress] cleanup 2017-08-29 10:03:05 +05:30
pratu16x7
674308958a [setup-wiz] UI test command 2017-08-29 10:03:04 +05:30
Rushabh Mehta
fdb8e7d7b3 Merge pull request #3976 from rmehta/domain-restrict-fix
[fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235
2017-08-24 18:30:40 +05:30
Rushabh Mehta
6b45f8a988 [minor] send me a copy is sticky, fixes frappe/erpnext#2367 (#3974) 2017-08-23 18:19:20 +05:30
Rushabh Mehta
09a31f5ec0 [fix] tests 2017-08-23 15:37:08 +05:30
Rushabh Mehta
7a589a3bc2 [fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235 2017-08-23 13:14:29 +05:30
Aditya Hase
00c655b2f4 Decode string before passsing to regex.match 2017-08-22 17:20:35 +05:30
Faris Ansari
b501964e1c fix test 2017-08-17 11:57:13 +05:30
Faris Ansari
65794892de Currency precision: remove trailing zeros 2017-08-16 13:15:30 +05:30
Aditya Hase
4b163431c0 Use repr() instead of backticks 2017-08-11 17:18:25 +05:30
Rushabh Mehta
5472f2c327 [fix] pypdf > pydf2 2017-08-11 16:22:55 +05:30
Rushabh Mehta
9c03e3aef7 [fix] pypdf > pydf2 2017-08-11 14:22:15 +05:30
Rushabh Mehta
d2f314e021 Merge pull request #3911 from adityahase/fix-urlencode
Import six.moves.urllib.parse.urlencode instead of urllib.urlencode
2017-08-11 13:02:43 +05:30
Rushabh Mehta
1d6ba9d685 Merge pull request #3913 from adityahase/fix-pypdf
Use PyPDF2 instead of pyPdf
2017-08-11 13:01:55 +05:30
Rushabh Mehta
e71fb55702 Merge branch 'develop' into fix-urlencode 2017-08-11 13:01:24 +05:30
Faris Ansari
7397b68290 Scrub urls fix (#3918)
* Don't expand mailto urls

* Add test case
2017-08-11 13:00:10 +05:30
Rushabh Mehta
ce48aaa2c9 Merge branch 'develop' into fix-long 2017-08-11 12:59:02 +05:30
Rushabh Mehta
4d7a7faa5b Merge pull request #3906 from adityahase/fix-basestring
Replaced all instances of basestring with six.string_types
2017-08-11 12:57:07 +05:30
Rushabh Mehta
14d6f770a4 Merge pull request #3902 from adityahase/fix-string-letters
Use string.ascii_letters instead of string.letters
2017-08-11 12:55:24 +05:30