Commit graph

15312 commits

Author SHA1 Message Date
Achilles Rasquinha
b8d4573dc4 remove python 3 since support for openpyxl 2018-03-13 00:35:52 +05:30
Achilles Rasquinha
ae5389c42f used which python 2018-03-13 00:24:33 +05:30
Achilles Rasquinha
59f0717db7 allow failures for python3 2018-03-13 00:13:21 +05:30
Achilles Rasquinha
77e1658705 modified job matrix 2018-03-13 00:10:10 +05:30
Achilles Rasquinha
ed8302f4fa added travis build matrix 2018-03-13 00:07:31 +05:30
Nabin Hait
661b848662 Merge branch 'master' into develop 2018-03-12 15:50:56 +05:30
Nabin Hait
3196f94937 Merge branch 'hotfix' 2018-03-12 15:50:56 +05:30
Nabin Hait
a73a86fe74 bumped to version 10.1.4 2018-03-12 16:20:55 +06:00
Achilles Rasquinha
102e46b88f
Merge pull request #5181 from achillesrasquinha/email-composer
make email composer larger
2018-03-12 15:43:47 +05:30
Achilles Rasquinha
2a4a78e857 make email composer larger 2018-03-12 15:40:33 +05:30
Achilles Rasquinha
0316378919
Merge pull request #5178 from achillesrasquinha/py3
save_file for bytes
2018-03-12 14:38:08 +05:30
Achilles Rasquinha
962f727283 save_file for bytes 2018-03-12 14:37:20 +05:30
Achilles Rasquinha
a0a176a938
Merge pull request #5177 from achillesrasquinha/py3
bytes to string
2018-03-12 14:31:54 +05:30
Achilles Rasquinha
67132f775c bytes to string 2018-03-12 14:31:04 +05:30
Achilles Rasquinha
ffb7151e46
Merge pull request #5176 from achillesrasquinha/py3
read bytes instead of string
2018-03-12 14:26:59 +05:30
Achilles Rasquinha
f8a9678e73 read bytes instead of string 2018-03-12 14:26:34 +05:30
schilgod
a01275d71c set fieldname for Section Break and Column Break, only if fieldname is not set, else it breaks existing custom fields. Also Use label for creating fieldname if user has entered label (#5171) 2018-03-12 11:50:02 +05:30
Achilles Rasquinha
269108df3f
Merge pull request #5173 from pratu16x7/charts-fix
Update Charts to v1
2018-03-12 10:55:11 +05:30
Sagar Vora
41ddc37934 [fix] explicit order clause to prevent ambiguity (#5172) 2018-03-12 10:51:17 +05:30
Prateeksha Singh
096c8b735c [charts] update API 2018-03-12 09:53:46 +05:30
Achilles Rasquinha
66d5bce17a
fixed port to smtp_port 2018-03-09 18:17:42 +05:30
Nabin Hait
1e55b7cc68 Fixed merge conflict 2018-03-09 16:37:43 +05:30
Nabin Hait
8e930ed411 Merge branch 'hotfix' 2018-03-09 16:32:16 +05:30
Nabin Hait
af6e2b043e bumped to version 10.1.3 2018-03-09 17:02:15 +06:00
Achilles Rasquinha
760af78d87
Merge pull request #5168 from achillesrasquinha/frappe-chat
Add Chat Close button
2018-03-09 16:01:14 +05:30
Achilles Rasquinha
e19f86faa3 Add Chat Close button 2018-03-09 15:59:46 +05:30
Achilles Rasquinha
d2bfd2c5fe
Merge pull request #5164 from achillesrasquinha/py3
Fixed byte response headers
2018-03-09 14:53:13 +05:30
Achilles Rasquinha
c148748b82 Fixed byte response headers 2018-03-09 14:51:27 +05:30
Achilles Rasquinha
4a2a465ea3
Merge pull request #5163 from achillesrasquinha/py3
Fixed printpriview
2018-03-09 14:47:51 +05:30
Achilles Rasquinha
f70a1cce39 Fixed printpriview 2018-03-09 14:46:37 +05:30
Achilles Rasquinha
2ad63250da
Merge pull request #5162 from achillesrasquinha/py3
content bytes
2018-03-09 13:52:41 +05:30
Achilles Rasquinha
3a18f5d47f content bytes 2018-03-09 13:51:27 +05:30
Achilles Rasquinha
6acfa8a56f
Merge pull request #5160 from raghukamath/chat-bg
Make the chart bg illustration a bit darker and tileable
2018-03-09 13:28:17 +05:30
Achilles Rasquinha
b0ab6fc6a0
Merge pull request #5161 from achillesrasquinha/py3
fixed upload content of images
2018-03-09 13:03:56 +05:30
Achilles Rasquinha
b435559c8b fixed upload content of images 2018-03-09 12:51:56 +05:30
Raghavendra Kamath
d1c5cb7a98 Fix ellipsis problem in long titled subheading (#5144) 2018-03-09 12:32:01 +05:30
Raghavendra Kamath
5814b98e6f Adjust color for default chat bg 2018-03-09 12:23:55 +05:30
Raghavendra Kamath
2b067b1200 correct colors 2018-03-09 12:12:26 +05:30
Raghavendra Kamath
707794a1b2 Make chat wallpaper tileable and make it a shade darker 2018-03-09 12:05:12 +05:30
Achilles Rasquinha
8446e76884
Merge pull request #5159 from achillesrasquinha/py3
Sync User Settings
2018-03-09 11:42:21 +05:30
Achilles Rasquinha
cf1a07256e safe_decode for user_settings 2018-03-09 11:19:20 +05:30
Achilles Rasquinha
0c53ff9ca4
Merge pull request #5158 from achillesrasquinha/py3
response headers to string
2018-03-08 20:39:17 +05:30
Achilles Rasquinha
4b5e7d80dd response headers to string 2018-03-08 20:38:18 +05:30
Achilles Rasquinha
1ca3448a67
Merge pull request #5155 from achillesrasquinha/py3
Fix Email Fetch
2018-03-08 20:18:00 +05:30
Achilles Rasquinha
bc702c6c00 bytes vs strings 2018-03-08 20:17:18 +05:30
Achilles Rasquinha
22f94adf2b
Merge pull request #5154 from achillesrasquinha/py3
FIX Http Redirect Headers
2018-03-08 19:01:43 +05:30
Achilles Rasquinha
1fbdf21715
Merge pull request #5148 from netchampfaris/translate-py3
read_csv_file both 2 and 3 compatible
2018-03-08 19:00:29 +05:30
Achilles Rasquinha
cf3726ab1a FIX Http Redirect Headers 2018-03-08 19:00:08 +05:30
Achilles Rasquinha
f312dfad32
Merge pull request #5152 from achillesrasquinha/py3
[FIX] safe_encode Email
2018-03-08 18:36:01 +05:30
Achilles Rasquinha
d62c586fb2 [FIX] fix sytntax 2018-03-08 18:12:19 +05:30