Faris Ansari
61277ad734
[fix] Render count in list, translate string ( #4445 )
2017-11-08 11:37:37 +05:30
Achilles Rasquinha
3343153365
Remove psutil ( #4437 )
2017-11-06 18:38:05 +05:30
Saurabh
bdc87d437a
[fix] set skip_errors params from data import tool ( #4438 )
2017-11-06 17:26:29 +05:30
Achilles Rasquinha
b8825ca116
Pure Python MySQL instead mysqlclient (with Python C API) ( #4280 )
...
* added PyMYSQL instead mysqlclient-python
* added pymysql import
* fixed db module import
* foxed self._conn wrapper
* updated cursor migration
* removed existent converters
* some more fixes towards API port
* modified travis
* updated doctype and revereted yml
* modified travis
* refreshed logging
* raw fix
* moved from hard coded constants to declarable instances
* moved from hard coded constants to declarable instances
* refactoring and logging
* moved to global import declaration
* fixed codacy
* unfixed codacy
* minor fix
* binary_type has a single
* deprecated alternative
* merged with latest
* fixed merge conflicts
* using deprecated alternative
* raw fix
* stupid fix
* using StringTypes instead
* brutal hack
* log
* tundebazy to the rescue
* fixed content_hash error
* frappe/database.py
* frappe/database.py
* updated database.py
* updated requirements
* updated requirements
* fixed codacy
* fixed codacy
* moved from DatabaseOperationalError to pymysql.InternalError
* moved from DatabaseOperationalError to pymysql.InternalError
* fixed codacy
* empty commit
* fixed codacy
* fixed codacy
2017-11-06 16:42:01 +05:30
Prateeksha Singh
a29a46d2ed
Merge pull request #4427 from rohitwaghchaure/illegal_char_issue_export
...
[fix] Not able to export general ledger report's data if data has illegal characters
2017-11-06 16:35:18 +05:30
Prateeksha Singh
50d55c93cf
Merge pull request #4432 from pratu16x7/hotfix1
...
[hotfix] setup complete state colors
2017-11-06 10:12:29 +05:30
pratu16x7
e9209151cf
[fix] setup complete state colors
2017-11-06 10:10:01 +05:30
Prateeksha Singh
f583f33093
Merge pull request #4431 from frappe/revert-4430-hotfix
...
Revert "[hotfix] setup complete state colors"
2017-11-06 10:07:22 +05:30
Prateeksha Singh
5d0c7c9e6b
Revert "[hotfix] setup complete state colors"
2017-11-06 10:05:39 +05:30
Prateeksha Singh
909bab0bad
Merge pull request #4430 from pratu16x7/hotfix
...
[hotfix] setup complete state colors
2017-11-06 10:03:22 +05:30
pratu16x7
e90abdfc58
[fix] setup complete state colors
2017-11-06 09:58:05 +05:30
Saurabh
3d4fadb3fa
Merge branch 'master' into staging
2017-11-03 17:01:07 +05:30
Saurabh
c2e5e76992
Merge branch 'hotfix'
2017-11-03 17:01:07 +05:30
Saurabh
9a6424bfdb
Merge branch 'master' into develop
2017-11-03 17:01:07 +05:30
Saurabh
e8efebf1c4
bumped to version 9.2.6
2017-11-03 17:31:07 +06:00
Nabin Hait
010a32d95a
[fix] Header for sms send request ( #4417 )
2017-11-03 16:20:53 +05:30
Rohit Waghchaure
f8928dc999
[fix] Not able to export general ledger report's data if data has illegal characters
2017-11-03 15:01:42 +05:30
Faris Ansari
ab8de1d83f
New Control: MultiSelect ( #4425 )
...
* New Control: MultiSelect
* fix codacy
2017-11-03 14:57:56 +05:30
Prateeksha Singh
9046041971
Merge pull request #4411 from shreyashah115/heatmap_fix
...
[Fix] HeatMap on Activity page
2017-11-03 14:15:18 +05:30
Zarrar
d29e280d14
[Fix] Workflow ui test dependency ( #4421 )
...
* timer increased, role selection removed
* used return promise instead of timeout
2017-11-03 13:37:48 +05:30
rohitwaghchaure
de7c6be9ed
[hotfix] User not able to modify modules in the user form ( #4415 )
2017-11-03 12:53:38 +05:30
Ameya Shenoy
c27dc5a68b
Added the colors white and black ( #4402 )
...
* Added the colors, `white` and `black`
* Update colors.js
2017-11-03 12:52:42 +05:30
ci2014
81d683bae2
Fix filters dismiss button ( #4412 )
...
Keep the dismiss button near to the filter
2017-11-03 12:14:50 +05:30
Saurabh
62b771494a
Merge branch 'master' into staging
2017-11-03 11:52:59 +05:30
Saurabh
a0973617ab
Merge branch 'hotfix'
2017-11-03 11:52:59 +05:30
Saurabh
8c350f8578
Merge branch 'master' into develop
2017-11-03 11:52:59 +05:30
Saurabh
2b1b046c23
bumped to version 9.2.5
2017-11-03 12:22:58 +06:00
Saurabh
9d05f1298d
Merge pull request #4423 from saurabh6790/revert_encode
...
[fix] revert unicode decoding
2017-11-03 11:51:22 +05:30
Saurabh
26bad9c672
Merge pull request #4422 from saurabh6790/revert_encode
...
[fix] revert unicode decoding
2017-11-03 11:49:42 +05:30
Saurabh
133df77d31
[fix] revert unicode dencoding
2017-11-03 11:47:39 +05:30
Britlog
529ae92d1e
Encoding error on web form rendering ( #4418 )
2017-11-03 09:41:43 +05:30
Saurabh
4720aba672
Merge pull request #4398 from Zlash65/list-count-render
...
[Fix] List count error if filter contains Child table
2017-11-02 11:47:27 +05:30
Saurabh
745eccff00
Merge pull request #4416 from saurabh6790/payment_log_fixes
...
[fix] first commit payment transaction status and then run post payment process method
2017-11-01 12:31:05 +05:30
Saurabh
b6ada00bf0
[fix] first commit payment transaction status and then run post payment process method
2017-11-01 12:15:57 +05:30
Zlash65
539328f591
between date filter fix
2017-11-01 11:34:18 +05:30
Zlash65
fec63a32f1
test case added for count
2017-10-31 16:14:36 +05:30
Zlash65
2b78da673a
better table join and fetch from multiple tables
2017-10-31 16:14:36 +05:30
Zlash65
7d2e30d529
count issue if child table exists in filter fix
2017-10-31 16:14:36 +05:30
Rushabh Mehta
fd36f1f01c
[fix] merge user.js
2017-10-31 13:47:51 +05:30
Rushabh Mehta
42cd739668
[fix] role editor disable
2017-10-31 13:45:53 +05:30
Shreya
3e27e061c1
revised according to latest merge
2017-10-31 13:22:58 +05:30
Shreya
0f4bbe185e
fixed heatmap
2017-10-31 13:12:13 +05:30
Prateeksha Singh
875b965d40
use the new frappe charts :D ( #4410 )
2017-10-31 12:53:11 +05:30
Saurabh
516a67864a
Merge branch 'master' into staging
2017-10-31 12:26:48 +05:30
Saurabh
a5ffa5755a
Merge branch 'master' into develop
2017-10-31 12:26:48 +05:30
Saurabh
fba4743982
Merge branch 'hotfix'
2017-10-31 12:26:47 +05:30
Saurabh
60d89603e0
bumped to version 9.2.4
2017-10-31 12:56:47 +06:00
Saurabh
365689f0c1
Merge pull request #4407 from rohitwaghchaure/data_export_excel_issue
...
[hotfix] Not able to export general ledger report's data in excel
2017-10-31 12:10:37 +05:30
Rushabh Mehta
ba6d004fa6
[fix] patch for domain settings
2017-10-31 12:03:21 +05:30
Rohit Waghchaure
05808554a0
[fix] Not able to export general ledger report's data in excel
2017-10-30 13:42:49 +05:30
