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 |
|
Faris Ansari
|
af74d7a729
|
codacy fix
|
2017-08-16 16:04:41 +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
|
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 |
|
Rushabh Mehta
|
be7c611947
|
Merge pull request #3926 from netchampfaris/hotfix
[hotfix] Website theme
|
2017-08-14 11:22:42 +05:30 |
|
Faris Ansari
|
4f61e875f2
|
[hotfix] Website theme
|
2017-08-14 11:08:16 +05:30 |
|
Rushabh Mehta
|
ccdf8e846d
|
Merge pull request #3925 from ci2014/patch-9
Update file.py
|
2017-08-14 11:03:01 +05:30 |
|
Rushabh Mehta
|
4f6a13e5dd
|
Merge pull request #3924 from adityahase/fix-os-path-join-encode
Don't unnecessarily encode os.path.join() and os.path.abspath()
|
2017-08-14 11:02:37 +05:30 |
|
Rushabh Mehta
|
408b59fe43
|
Merge pull request #3923 from adityahase/fix-backtick
Use repr() instead of backticks
|
2017-08-14 11:02:14 +05:30 |
|
Rushabh Mehta
|
fab9a3f1f6
|
Merge pull request #3898 from netchampfaris/totals-row
Show totals row always in query report
|
2017-08-14 11:00:19 +05:30 |
|
mbauskar
|
7870c3225e
|
Merge branch 'master' into staging
|
2017-08-14 09:29:43 +05:30 |
|
mbauskar
|
73094b2e87
|
Merge branch 'hotfix'
|
2017-08-14 09:29:42 +05:30 |
|
mbauskar
|
66bef9e1da
|
Merge branch 'master' into develop
|
2017-08-14 09:29:42 +05:30 |
|
mbauskar
|
88057304b0
|
bumped to version 8.7.4
|
2017-08-14 09:59:42 +06:00 |
|
ci2014
|
e0b30b1f53
|
Update file.py
Give developers the ability to generate several sizes of thumbnails.
|
2017-08-11 19:25:19 +02:00 |
|
Aditya Hase
|
0a6ecbf2c5
|
Don't unnecessarily encode os.path.join()
|
2017-08-11 18:09:32 +05:30 |
|
Aditya Hase
|
4b163431c0
|
Use repr() instead of backticks
|
2017-08-11 17:18:25 +05:30 |
|
Makarand Bauskar
|
4b730e0a20
|
[minor] fixed pypdf2 import typo in print_format.py (#3921)
|
2017-08-11 16:36:05 +05:30 |
|
Rushabh Mehta
|
5472f2c327
|
[fix] pypdf > pydf2
|
2017-08-11 16:22:55 +05:30 |
|
Manas Solanki
|
6031d704dc
|
fix the typos (#3919)
|
2017-08-11 14:39:53 +05:30 |
|
Rushabh Mehta
|
9c03e3aef7
|
[fix] pypdf > pydf2
|
2017-08-11 14:22:15 +05:30 |
|
Rushabh Mehta
|
6e33a8cbc3
|
Merge pull request #3916 from mbauskar/searchfield
[hotfix] don't allow no value fields in the search fields
|
2017-08-11 13:03:13 +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
|
a5096464a7
|
Merge pull request #3914 from adityahase/fix-stringio-2fa
Import six.StringIO instead of StringIO.StringIO
|
2017-08-11 13:02:07 +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
|
5a31e583a2
|
Merge pull request #3912 from adityahase/fix-raise
Replace Py2 raise syntax with Py 3
|
2017-08-11 13:01:40 +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
|
1b9dd05481
|
Merge pull request #3910 from adityahase/fix-maxlength-comparison
Make sure that max_length[0][0] is comparable with new_length
|
2017-08-11 12:59:57 +05:30 |
|
Rushabh Mehta
|
e1a16ad856
|
Merge pull request #3909 from adityahase/fix-long
Replaced long with six.integer_types
|
2017-08-11 12:59:09 +05:30 |
|
Rushabh Mehta
|
ce48aaa2c9
|
Merge branch 'develop' into fix-long
|
2017-08-11 12:59:02 +05:30 |
|
Rushabh Mehta
|
6726f7e1b0
|
Merge pull request #3908 from adityahase/fix-method-string
Convert method name to string instead of encoding
|
2017-08-11 12:58:04 +05:30 |
|
Rushabh Mehta
|
751a35fe57
|
Merge pull request #3907 from adityahase/fix-sql-dict-values
Explicitly convert dict.values() to list
|
2017-08-11 12:57:22 +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 |
|
Aditya Hase
|
2403a800c0
|
Use absolute import for frappe.twofactor (#3915)
|
2017-08-11 12:56:59 +05:30 |
|
Rushabh Mehta
|
cf80616029
|
Merge pull request #3905 from adityahase/fix-hashlib-sha224
Encode string before passing to hashlib.sha224
|
2017-08-11 12:56:27 +05:30 |
|
Rushabh Mehta
|
b26c69c1f8
|
Merge pull request #3904 from adityahase/fix-rel-import-frappe-init
Use abslute imports in frappe/__init__.py
|
2017-08-11 12:55:47 +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 |
|
Rushabh Mehta
|
8ca5ee3926
|
Merge pull request #3901 from adityahase/fix-relative-background-jobs-import
Use absolute import to import frappe.utils.background_jobs
|
2017-08-11 12:55:03 +05:30 |
|
Rushabh Mehta
|
93eea5215b
|
Merge pull request #3900 from adityahase/fix-hashlib-sha1
Encode 'site' before passing to hashlib.sha1
|
2017-08-11 12:54:42 +05:30 |
|
Rushabh Mehta
|
f8abb5fc10
|
Merge pull request #3899 from adityahase/fix-dict-keys
Convert dict.keys() to list
|
2017-08-11 12:54:19 +05:30 |
|