Achilles Rasquinha
2091ee2c2a
Merge pull request #5271 from achillesrasquinha/fixes
...
placeholder fix
2018-03-26 00:19:07 +05:30
Achilles Rasquinha
e6c3d81df8
placeholder fix
2018-03-26 00:18:26 +05:30
Achilles Rasquinha
c827a51c71
Merge pull request #5269 from achillesrasquinha/fix-ldap
...
check if ldap settings exists within context
2018-03-25 23:39:16 +05:30
Achilles Rasquinha
b9bbcc35ce
Merge pull request #5270 from achillesrasquinha/py3-returns
...
fix classType
2018-03-25 23:11:54 +05:30
Achilles Rasquinha
faf9f6c233
fix classType
2018-03-25 23:11:23 +05:30
Achilles Rasquinha
bab4968a28
check if ldap settings exists within context
2018-03-25 22:40:04 +05:30
Achilles Rasquinha
8b4ca5cb66
Merge pull request #5268 from achillesrasquinha/socket-cleanup
...
socketio.js cleanup
2018-03-25 22:36:42 +05:30
Achilles Rasquinha
0cff49c460
socketio.js cleanup
2018-03-25 22:35:46 +05:30
Nabin Hait
c2d5155138
Merge branch 'master' into develop
2018-03-24 16:17:25 +05:30
Nabin Hait
2506077f2a
Merge branch 'hotfix'
2018-03-24 16:17:24 +05:30
Nabin Hait
c943d34405
bumped to version 10.1.9
2018-03-24 16:47:24 +06:00
Rushabh Mehta
d3521b182a
[fix] [sync.js] delete extra rows from locals
2018-03-24 15:54:33 +05:30
Nabin Hait
ab57b16993
Merge branch 'master' into develop
2018-03-24 15:37:11 +05:30
Nabin Hait
1c90b872c2
Merge branch 'hotfix'
2018-03-24 15:37:10 +05:30
Nabin Hait
7a871230bb
bumped to version 10.1.8
2018-03-24 16:07:10 +06:00
Rushabh Mehta
ec90395606
[hotfix] mapper ( #5267 )
2018-03-24 15:31:01 +05:30
Faris Ansari
d158a51df5
Query Report fixes ( #5258 )
...
* Query Report fixes
- User saved columns working
- Print and PDF fix
- Print filters frappe/erpnext#12783
* minor
2018-03-24 12:08:00 +05:30
Revant Nandgaonkar
9e2f161f3e
OAuth 2 ROPC Grant test ( #5237 )
2018-03-24 12:07:48 +05:30
Faris Ansari
ed8a8dabd3
List view fixes ( #5260 )
...
* Listview fixes
- fix search icon in standard filter frappe/erpnext#12555
- show skeleton while loading list rows
* Optimize remove_script_and_style
2018-03-24 12:06:38 +05:30
Achilles Rasquinha
42d737c030
Merge pull request #5265 from achillesrasquinha/py3-tests
...
unicode hash test fix
2018-03-23 17:59:59 +05:30
Achilles Rasquinha
3c8dbaf138
fix py3 test case
2018-03-23 17:33:24 +05:30
Achilles Rasquinha
b2e7bd284e
Merge pull request #5255 from achillesrasquinha/py3-fixes
...
fix timedelta conversions
2018-03-23 16:11:33 +05:30
Achilles Rasquinha
b956f279cd
Merge pull request #5261 from achillesrasquinha/test-fix
...
fix test case
2018-03-23 15:59:17 +05:30
Achilles Rasquinha
4581077cb8
fix test case
2018-03-23 15:37:09 +05:30
Achilles Rasquinha
c6be3cbdd7
fix test case
2018-03-23 15:34:46 +05:30
Nabin Hait
3f3d9e52c8
Fixed merge conflict
2018-03-23 15:16:18 +05:30
Nabin Hait
654e33fc5b
Merge branch 'hotfix'
2018-03-23 15:15:35 +05:30
Nabin Hait
fa20790ac9
bumped to version 10.1.7
2018-03-23 15:45:35 +06:00
Zarrar
577ce03fd8
[Hotfix] File upload fix ( #5254 )
...
* append hash if same filename found while uploading through socketio
* pass file size
* upload after filename change
2018-03-23 15:13:58 +05:30
Nabin Hait
d0f3b9b6e6
Dropbox settings UX fix ( #5253 )
...
* Fixed dropbox UX issue
* Fixed typo
2018-03-23 15:09:28 +05:30
Achilles Rasquinha
bc0a2acadf
fix timedelta conversions for pymysq
2018-03-22 23:02:20 +05:30
Achilles Rasquinha
84e7f8ba67
fix timedelta conversions for pymysq
2018-03-22 22:52:20 +05:30
Faris Ansari
5debf79e5a
Query Report fixes ( #5252 )
...
- normalize every data row into object
- onload event should fire after filters are set
2018-03-22 15:09:07 +05:30
Nabin Hait
763360c68f
minor fix in syncing after ajax
2018-03-22 12:55:42 +05:30
Nabin Hait
3dab3478db
Minor fix in autonaming
2018-03-22 12:14:21 +05:30
Suraj Shetty
436d7a0d4e
Data export tool ( #5213 )
...
* Data export tool
New doctype to export data
Child table export option
Ability to add filter
* Filter view refactor
Separated filter css
* Moved exporter script from data import doctype to data export doctype
* some input validation
* removed unwanted file and some style fixes
* removed console log
* hide sidebar
* renamed export method
* added data export link in setup module page
* minor fix
* refactor exporter.py
* data export ui tweaks
* codacy and bug fix
* silly code fixes
* [minor] indentation fix
2018-03-22 11:30:48 +05:30
rohitwaghchaure
13f0f19f75
[Fix] RTL for document print ( #5244 )
2018-03-22 11:15:01 +05:30
Faris Ansari
29baefefe3
IE11 fix - login ( #5247 )
...
* Add Polyfill of Object.assign for IE11
fixes frappe/erpnext#12703
* fix codacy
2018-03-22 11:11:20 +05:30
Achilles Rasquinha
7666a58c81
Merge pull request #5246 from shreyashah115/alert-sound
...
Uncomment alert sound in hooks.py
2018-03-22 09:10:22 +05:30
Shreya
b25716e681
uncomment alert sound
2018-03-21 23:21:53 +05:30
Faris Ansari
3df26a8059
Update frappe-datatable to 0.0.3 ( #5243 )
2018-03-21 17:42:10 +05:30
Achilles Rasquinha
d22dafe0fb
Merge pull request #5241 from achillesrasquinha/hotfix-user-image-fix
...
[min] user image fix
2018-03-21 15:45:57 +05:30
Faris Ansari
73aeb5ea96
fix test
2018-03-21 15:27:24 +05:30
Achilles Rasquinha
d00b20a610
user image fix
2018-03-21 12:37:04 +05:30
Faris Ansari
b383e2235f
DataTable in GridReport ( #5234 )
...
* DataTable in GridReport
* Remove query_report_old
* Remove SlickGrid library 💃
2018-03-21 12:36:55 +05:30
Faris Ansari
4cafe66a3a
Kanban Board Fixes ( #5236 )
...
- fix frappe/erpnext#13153
- Add card title field in list fields
- Quick entry if atleast 1 mandatory field is Table
2018-03-21 12:36:41 +05:30
Faris Ansari
2322010aa6
Remove !important rules so that custom css in Print Format can override ( #5235 )
2018-03-21 12:35:00 +05:30
Rushabh Mehta
b6936d4980
[minor] defensive fixes
2018-03-21 12:27:12 +05:30
Rushabh Mehta
317d756872
[ui] email not large
2018-03-20 22:56:57 +05:30
Achilles Rasquinha
5ca949cc2b
Merge pull request #5239 from achillesrasquinha/py3-test
...
Fixed transaction_log test case
2018-03-20 20:46:00 +05:30
