Commit graph

9574 commits

Author SHA1 Message Date
Kanchan Chauhan
ca4c64fd8a Changes 2016-04-20 16:23:09 +05:30
Kanchan Chauhan
110ec335b8 [WIP] Do not merge 2016-04-20 16:23:09 +05:30
Anand Doshi
fb5fbd17b4 [fix] unicode decode issue in frappe.get_traceback 2016-04-20 13:00:21 +05:30
Rushabh Mehta
9c7d1f2ea8 [cleanups] 2016-04-18 19:26:45 +05:30
Rushabh Mehta
0b26523413 [fix] unhide first 2016-04-15 16:46:51 +05:30
Nabin Hait
d917cdee75 [translations] 2016-04-15 14:51:12 +05:30
Rushabh Mehta
8527e52465 [cleanup] frappe.utils.scroll_to 2016-04-15 12:37:43 +05:30
Rushabh Mehta
c16f77b448 [cleanup] progress 2016-04-15 11:23:52 +05:30
Nabin Hait
5e6780923c Merge branch 'master' into develop 2016-04-15 11:07:43 +05:30
Nabin Hait
70a4e33872 Merge branch 'hotfix' 2016-04-15 11:00:38 +05:30
Nabin Hait
98a06e1276 bumped to version 6.27.10 2016-04-15 11:30:38 +06:00
Nabin Hait
3debd7f602 Merge pull request #1706 from nabinhait/field_currency
[fix] Get field currency for child doc
2016-04-15 10:58:23 +05:30
Nabin Hait
3bb1acc738 Merge pull request #1704 from nabinhait/total_row_fix
[fix] Total row in report
2016-04-15 10:58:11 +05:30
Anand Doshi
8d9e755d55 [travis] 2016-04-14 18:12:33 +05:30
Nabin Hait
9273935979 Merge branch 'master' into develop 2016-04-14 18:10:03 +05:30
Nabin Hait
79ab8d0ecd [fix] Get field currency for child doc 2016-04-14 18:02:12 +05:30
Anand Doshi
b95cfdf3dd [travis] 2016-04-14 17:39:57 +05:30
Rushabh Mehta
91f20d9969 Merge pull request #1705 from neilLasrado/block-mod
Fixed bug in block modules
2016-04-14 17:38:29 +05:30
Rushabh Mehta
4bb2fce345 [enhancement] added heatmaps and item count in dashboard 2016-04-14 17:30:06 +05:30
Neil Trini Lasrado
5655772ff7 Fixed bug in block modules 2016-04-14 17:21:24 +05:30
Nabin Hait
88ecf50668 [fix] Total row in report 2016-04-14 12:35:08 +05:30
Rushabh Mehta
8783bd16f6 Merge pull request #1702 from ccfiel/develop
add option to disable/enable quick entry feature
2016-04-14 11:19:24 +05:30
Chris Ian Fiel
0c6ab997e8 add customized from for option enable/disable quick entry 2016-04-14 13:26:16 +08:00
Rushabh Mehta
7b8ee0e41f Merge pull request #1703 from ShashaQin/patch-4
Update query_report.js
2016-04-14 10:39:02 +05:30
ShashaQin
a41c2f5e6b Update query_report.js 2016-04-14 10:46:34 +08:00
Anand Doshi
13e43fcbcd [fix] use importlib instead of imp.load_source in test_runner. Fixes to scheduler.py 2016-04-13 21:00:08 +05:30
Chris Ian Fiel
876137e13a add option to disable/enable quick entry feature 2016-04-13 23:14:09 +08:00
Anand Doshi
32b3d7c279 [test] removed test_async.py as async magic isn't supported anymore. You can do it programmatically if you want to. 2016-04-13 19:57:23 +05:30
Anand Doshi
5389d20072 Merge branch 'vjFaLk-remove-celery' into develop 2016-04-13 19:28:25 +05:30
Anand Doshi
a48dd50381 [fix] with frappe.init_site, worker and schedule commands, cleanup and fixes to rq code 2016-04-13 19:28:04 +05:30
Rushabh Mehta
fe8a3b2b0c [minor] added doc.update_modified() 2016-04-13 18:21:28 +05:30
Rushabh Mehta
2f61c5a3df [tests] desktop icons 2016-04-13 18:05:36 +05:30
Rushabh Mehta
5ab8a8d405 [cleanup] form links dashboard and added blocked in Desktop Icons, standard icons hidden by default 2016-04-13 17:21:15 +05:30
Nabin Hait
0b987f0f57 Merge branch 'hotfix' 2016-04-13 16:02:58 +05:30
Nabin Hait
6d2a5853ed bumped to version 6.27.9 2016-04-13 16:32:58 +06:00
Nabin Hait
bf195f9e1f Merge pull request #1701 from nabinhait/fix99
minor fix
2016-04-13 16:00:49 +05:30
Nabin Hait
62225d32f9 minor fix 2016-04-13 16:00:05 +05:30
Rushabh Mehta
7cd187dacc Merge pull request #1698 from MaxMorais/patch-16
Small improvement in translations
2016-04-13 10:03:58 +05:30
Maxwell Morais
2d02d3e91b Small improvement in translations
Move the method to `get_messages_from_workflow` from `get_messages_for_app` to inside `get_messages_from_doctype` to get workflow translations reflected in Js
2016-04-12 21:23:29 -03:00
Rushabh Mehta
daa9c094d0 [enhancement] [wip] links menu in forms 2016-04-12 19:16:17 +05:30
Nabin Hait
ca4ec05ed8 Merge pull request #1695 from nabinhait/freeze_customize_form
[fix] Freeze customize form on trigger of doctype
2016-04-12 18:51:20 +05:30
Nabin Hait
2adb2bf744 [fix] Freeze customize form on trigger of doctype 2016-04-11 18:50:58 +05:30
Valmik Jangla
a2ad631754 Removed / Replaced Celery related code 2016-04-11 17:39:06 +05:30
Valmik Jangla
ac23e91dee Various fixes and improvements 2016-04-11 17:38:40 +05:30
Valmik Jangla
a41c836d61 Added bench command to start worker
Added logger entry for RQ
Added queue and timeout as arguments for email
2016-04-11 17:36:27 +05:30
Valmik Jangla
6d0563e8ea WIP code migration from Celery to RQ 2016-04-11 17:36:27 +05:30
Rushabh Mehta
ae0afc73df [cleanup] dashboard and default image 2016-04-11 17:35:01 +05:30
Nabin Hait
1de94a22ef Merge pull request #1686 from anandpdoshi/fix/get-lang-code
[fix] use get_lang_code in auth.py to evaluate _lang
2016-04-11 17:08:44 +05:30
Nabin Hait
5df5c7199d Merge pull request #1691 from nabinhait/delete_doc_fix
[fix] Ignore current document while checking linked docs on deletion
2016-04-11 17:05:48 +05:30
Nabin Hait
101f3a5d47 Merge pull request #1693 from shreyasp/escape-quotes-user-name
[Fix] Escape quotes in user name while rendering the modules_setup template
2016-04-11 16:57:19 +05:30