Achilles Rasquinha
5ca949cc2b
Merge pull request #5239 from achillesrasquinha/py3-test
...
Fixed transaction_log test case
2018-03-20 20:46:00 +05:30
Achilles Rasquinha
8670b9977a
Fixed transaction_log test case
2018-03-20 20:08:00 +05:30
Achilles Rasquinha
be18c68bff
Merge pull request #5238 from achillesrasquinha/py3-test
...
test_recurring for Python 3 Fix.
2018-03-20 19:55:31 +05:30
Achilles Rasquinha
3affb397c2
Fixed Python 3 test
2018-03-20 19:54:28 +05:30
Zarrar
cca0b0afd4
order_by can be configured if need be ( #5233 )
2018-03-20 14:08:37 +05:30
Faris Ansari
9f5a129333
Rollup Fixes ( #5232 )
...
- Use PostCSS instead of Less plugin
- Fixes CSS append problem
- Show which css file changed instead of rollup.manifest.css
- Minify CSS in production
- Cannot import less/css files in js files, put them in build.json
- Let's avoid major changes in Frappe Framework now :)
2018-03-20 13:51:53 +05:30
Achilles Rasquinha
e18b6ef190
Update .travis.yml
2018-03-20 10:54:35 +05:30
Achilles Rasquinha
12769fef76
Merge pull request #5226 from mntechnique/oauth_ropcg
...
OAuth 2.0 : Resource Owner Password Credentials Grant
2018-03-20 09:58:23 +05:30
Achilles Rasquinha
347aece92f
Merge pull request #5228 from achillesrasquinha/py3-fixes
...
fixed bytesio object generation for python 2 and 3 for excel
2018-03-20 01:10:11 +05:30
Achilles Rasquinha
611a74445e
fixed bytesio object generation for python 2 and 3 for excel, wtf email
2018-03-20 01:07:17 +05:30
Achilles Rasquinha
dde3b39c94
Merge pull request #5227 from achillesrasquinha/py3-fixes
...
Convert Map Lambda to spread function
2018-03-20 00:46:41 +05:30
Achilles Rasquinha
b5964b58a4
Fixed Python 3
2018-03-20 00:45:07 +05:30
Revant Nandgaonkar
f4a254d0f7
py3-ready encode returns bytes
2018-03-19 23:11:46 +05:30
Revant Nandgaonkar
34e9c2c5ac
OAuth 2.0
...
Resource Owner Password Credentials Grant
2018-03-19 22:27:22 +05:30
Achilles Rasquinha
48205d2cd4
Merge pull request #5225 from achillesrasquinha/dill
...
removed dill, revert to cPickle
2018-03-19 22:05:44 +05:30
Achilles Rasquinha
0bf3411391
removed dill, revert to cPickle
2018-03-19 19:23:14 +05:30
Achilles Rasquinha
42321dbefd
Merge pull request #5224 from achillesrasquinha/fix-throttle
...
fixed throttling
2018-03-19 19:13:59 +05:30
Achilles Rasquinha
22a318a9ff
fixed throttling
2018-03-19 19:10:57 +05:30
Rushabh Mehta
d2f82d7bdc
[fix] base_control.js for website
2018-03-19 18:44:42 +05:30
Charles-Henri Decultot
17855fad80
Transaction Log Report ( #5207 )
...
* Transaction Log Report
* Error correction
2018-03-19 18:25:57 +05:30
Rushabh Mehta
a3910cde9b
[debug] dont silently fail if requirements are missing ( #5201 )
2018-03-19 18:25:32 +05:30
Faris Ansari
5a1a4386d7
Fix CSV export for dict like rows ( #5222 )
2018-03-19 17:06:59 +05:30
Faris Ansari
8992cb28a3
[fix] cell height in datatable ( #5221 )
2018-03-19 14:59:31 +05:30
Achilles Rasquinha
2298ee72fd
Merge pull request #5219 from Zlash65/email-fix
...
[Fix] Email css fix
2018-03-19 13:52:03 +05:30
Zlash65
49a073a102
revert css changes for email
2018-03-19 13:14:33 +05:30
Faris Ansari
32b2eb4789
Handle null values in CSV export ( #5218 )
2018-03-19 12:59:56 +05:30
Faris Ansari
625083d664
[QueryReport] Column titles in CSV Export ( #5216 )
2018-03-19 12:46:57 +05:30
Achilles Rasquinha
5e8ff63942
Merge pull request #5217 from achillesrasquinha/frappe-chat
...
chat import fixes
2018-03-19 12:45:16 +05:30
Rushabh Mehta
3e1342721e
[fix] globals
2018-03-19 12:39:33 +05:30
Achilles Rasquinha
d399e13965
chat import fixes
2018-03-19 12:33:22 +05:30
Achilles Rasquinha
4f4bf25d92
Merge pull request #5215 from achillesrasquinha/check-moment
...
check moment exists the right way
2018-03-19 12:07:57 +05:30
Achilles Rasquinha
448b338e84
check moment exists the right way
2018-03-19 12:05:04 +05:30
Achilles Rasquinha
b010b0a45b
Merge pull request #5212 from achillesrasquinha/fix-csv
...
fixed csv utils
2018-03-18 14:16:09 +05:30
Achilles Rasquinha
f06b15bccb
Fixed csv utils
2018-03-18 14:14:48 +05:30
Prateeksha Singh
482b68b216
Merge pull request #5202 from pratu16x7/charts-fixes
...
[fix] charts update
2018-03-15 12:12:29 +05:30
Prateeksha Singh
784e6c6fea
[fix] charts update
2018-03-15 12:10:39 +05:30
Achilles Rasquinha
3ed587efea
Removed 3.4 and PyPy3
2018-03-15 12:02:58 +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
