frappe

Commit Graph

Author	SHA1	Message	Date
Saurabh	7150c7b997	bumped to version 9.2.8	7 years ago
Saurabh	d66ef8fab5	Merge branch 'master' into staging	7 years ago
Saurabh	517f62fc23	Merge branch 'hotfix'	7 years ago
Saurabh	8f07515b45	Merge branch 'master' into develop	7 years ago
Saurabh	8ef42b4ed6	bumped to version 9.2.7	7 years ago
ci2014	254043171e	Add no_letterhead to form_dict (#4444 ) no_letterhead in form_dict was missing	7 years ago
Faris Ansari	61277ad734	[fix] Render count in list, translate string (#4445 )	7 years ago
Achilles Rasquinha	3343153365	Remove psutil (#4437 )	7 years ago
Saurabh	bdc87d437a	[fix] set skip_errors params from data import tool (#4438 )	7 years ago
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	7 years ago
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	7 years ago
Prateeksha Singh	50d55c93cf	Merge pull request #4432 from pratu16x7/hotfix1 [hotfix] setup complete state colors	7 years ago
pratu16x7	e9209151cf	[fix] setup complete state colors	7 years ago
Prateeksha Singh	f583f33093	Merge pull request #4431 from frappe/revert-4430-hotfix Revert "[hotfix] setup complete state colors"	7 years ago
Prateeksha Singh	5d0c7c9e6b	Revert "[hotfix] setup complete state colors"	7 years ago
Prateeksha Singh	909bab0bad	Merge pull request #4430 from pratu16x7/hotfix [hotfix] setup complete state colors	7 years ago
pratu16x7	e90abdfc58	[fix] setup complete state colors	7 years ago
Saurabh	3d4fadb3fa	Merge branch 'master' into staging	7 years ago
Saurabh	c2e5e76992	Merge branch 'hotfix'	7 years ago
Saurabh	9a6424bfdb	Merge branch 'master' into develop	7 years ago
Saurabh	e8efebf1c4	bumped to version 9.2.6	7 years ago
Nabin Hait	010a32d95a	[fix] Header for sms send request (#4417 )	7 years ago
Rohit Waghchaure	f8928dc999	[fix] Not able to export general ledger report's data if data has illegal characters	7 years ago
Faris Ansari	ab8de1d83f	New Control: MultiSelect (#4425 ) * New Control: MultiSelect * fix codacy	7 years ago
Prateeksha Singh	9046041971	Merge pull request #4411 from shreyashah115/heatmap_fix [Fix] HeatMap on Activity page	7 years ago
Zarrar	d29e280d14	[Fix] Workflow ui test dependency (#4421 ) * timer increased, role selection removed * used return promise instead of timeout	7 years ago
rohitwaghchaure	de7c6be9ed	[hotfix] User not able to modify modules in the user form (#4415 )	7 years ago
Ameya Shenoy	c27dc5a68b	Added the colors `white` and `black` (#4402 ) * Added the colors, `white` and `black` * Update colors.js	7 years ago
ci2014	81d683bae2	Fix filters dismiss button (#4412 ) Keep the dismiss button near to the filter	7 years ago
Saurabh	62b771494a	Merge branch 'master' into staging	7 years ago
Saurabh	a0973617ab	Merge branch 'hotfix'	7 years ago
Saurabh	8c350f8578	Merge branch 'master' into develop	7 years ago
Saurabh	2b1b046c23	bumped to version 9.2.5	7 years ago
Saurabh	9d05f1298d	Merge pull request #4423 from saurabh6790/revert_encode [fix] revert unicode decoding	7 years ago
Saurabh	26bad9c672	Merge pull request #4422 from saurabh6790/revert_encode [fix] revert unicode decoding	7 years ago
Saurabh	133df77d31	[fix] revert unicode dencoding	7 years ago
Britlog	529ae92d1e	Encoding error on web form rendering (#4418 )	7 years ago
Saurabh	4720aba672	Merge pull request #4398 from Zlash65/list-count-render [Fix] List count error if filter contains Child table	7 years ago
Saurabh	745eccff00	Merge pull request #4416 from saurabh6790/payment_log_fixes [fix] first commit payment transaction status and then run post payment process method	7 years ago
Saurabh	b6ada00bf0	[fix] first commit payment transaction status and then run post payment process method	7 years ago
Zlash65	539328f591	between date filter fix	7 years ago
Zlash65	fec63a32f1	test case added for count	7 years ago
Zlash65	2b78da673a	better table join and fetch from multiple tables	7 years ago
Zlash65	7d2e30d529	count issue if child table exists in filter fix	7 years ago
Rushabh Mehta	fd36f1f01c	[fix] merge user.js	7 years ago
Rushabh Mehta	42cd739668	[fix] role editor disable	7 years ago
Shreya	3e27e061c1	revised according to latest merge	7 years ago
Shreya	0f4bbe185e	fixed heatmap	7 years ago
Prateeksha Singh	875b965d40	use the new frappe charts :D (#4410 )	7 years ago
Saurabh	516a67864a	Merge branch 'master' into staging	7 years ago

... 3 4 5 6 7 ...

14602 Commits (db687a27793cfde5c07292523e6b070a20bb8f6f) All Branches Search

14602 Commits (db687a27793cfde5c07292523e6b070a20bb8f6f)

All Branches