Prateeksha Singh
|
784e6c6fea
|
[fix] charts update
|
2018-03-15 12:10:39 +05:30 |
|
Rushabh Mehta
|
87ccb3a6ac
|
[fix] typo
|
2018-03-15 11:43:45 +05:30 |
|
Faris Ansari
|
3ba121f82a
|
[email] Add margin for heading (#5193)
|
2018-03-13 18:21:30 +05:30 |
|
Nabin Hait
|
7eff57ce6a
|
Merge branch 'master' into develop
|
2018-03-13 18:13:00 +05:30 |
|
Nabin Hait
|
5916f45b66
|
Merge branch 'hotfix'
|
2018-03-13 18:12:59 +05:30 |
|
Nabin Hait
|
a24fa80371
|
bumped to version 10.1.6
|
2018-03-13 18:42:59 +06:00 |
|
rohitwaghchaure
|
4e383ed32e
|
[Fix] Letterhead did not show up on email alert attachment (#5192)
|
2018-03-13 18:11:46 +05:30 |
|
Achilles Rasquinha
|
bae839fd6e
|
Merge with develop
|
2018-03-13 17:13:03 +05:30 |
|
Achilles Rasquinha
|
bc712066cc
|
Render Frappe Chat to Website
|
2018-03-13 17:03:25 +05:30 |
|
Nabin Hait
|
06d816e12b
|
Merge branch 'master' into develop
|
2018-03-13 16:12:09 +05:30 |
|
Nabin Hait
|
b9c00266e4
|
Merge branch 'hotfix'
|
2018-03-13 16:12:08 +05:30 |
|
Nabin Hait
|
99ac259c9a
|
bumped to version 10.1.5
|
2018-03-13 16:42:07 +06:00 |
|
Faris Ansari
|
34c869e6b8
|
Fix Slideshow controls (#5187)
|
2018-03-13 14:46:00 +05:30 |
|
Rushabh Mehta
|
385237b98a
|
[fix] missing toolbar in frappe when setup_wizard has not been officially completed (#5188)
|
2018-03-13 14:45:17 +05:30 |
|
Achilles Rasquinha
|
c060a52423
|
Merge pull request #5190 from achillesrasquinha/request
request.js-like frappe.call extension to website.js request
|
2018-03-13 13:58:29 +05:30 |
|
Achilles Rasquinha
|
799ab249ab
|
request.js-like frappe.call extension to website.js request
|
2018-03-13 13:56:50 +05:30 |
|
Achilles Rasquinha
|
a20dc7a533
|
Merge pull request #5186 from achillesrasquinha/travis
added travis build matrix for all Python versions (includes PyPy3)
|
2018-03-13 12:56:04 +05:30 |
|
Achilles Rasquinha
|
48e3f7bec8
|
transaction log reverted
|
2018-03-13 12:33:29 +05:30 |
|
Dhaifallah Alwadani
|
3d4a4428f6
|
Improve RTL header and sidebar for mobile view (#5082)
Fix the order of items in the header.
The sidebar will slide from the right.
|
2018-03-13 11:43:06 +05:30 |
|
Achilles Rasquinha
|
09402547fc
|
fix shalib hash
|
2018-03-13 10:59:10 +05:30 |
|
Achilles Rasquinha
|
0127591657
|
Fixed test
|
2018-03-13 10:30:07 +05:30 |
|
Achilles Rasquinha
|
0fe62000b4
|
added allow_failures
|
2018-03-13 10:10:29 +05:30 |
|
Achilles Rasquinha
|
f0e84c145a
|
fix travis test
|
2018-03-13 00:42:50 +05:30 |
|
Achilles Rasquinha
|
977491ff75
|
fix travis test
|
2018-03-13 00:41:37 +05:30 |
|
Achilles Rasquinha
|
e059b3c3fa
|
fix travis test
|
2018-03-13 00:40:51 +05:30 |
|
Achilles Rasquinha
|
c26c741fec
|
fix travis test
|
2018-03-13 00:39:58 +05:30 |
|
Achilles Rasquinha
|
c17a501051
|
fix travis test
|
2018-03-13 00:38:46 +05:30 |
|
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 |
|
Achilles Rasquinha
|
b7f934a62e
|
Merge pull request #5170 from mntechnique/listview-title-bugfix
[hotfix] Issue with subject title in list-view
|
2018-03-12 23:17:39 +05:30 |
|
Achilles Rasquinha
|
83e94f6c92
|
Merge pull request #5184 from achillesrasquinha/fixes
Check if server is alive and let socket.io then request
|
2018-03-12 23:12:33 +05:30 |
|
Achilles Rasquinha
|
0f3b717447
|
conditional checks
|
2018-03-12 22:59:23 +05:30 |
|
Achilles Rasquinha
|
4d160052b4
|
Check if server is alive and let socket.io then request
|
2018-03-12 22:58:16 +05:30 |
|
Nabin Hait
|
3196f94937
|
Merge branch 'hotfix'
|
2018-03-12 15:50:56 +05:30 |
|
Nabin Hait
|
661b848662
|
Merge branch 'master' into develop
|
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 |
|