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
Anand Doshi
b95cfdf3dd
[travis]
2016-04-14 17:39:57 +05:30
Rushabh Mehta
4bb2fce345
[enhancement] added heatmaps and item count in dashboard
2016-04-14 17:30:06 +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
shreyas
32ed9cb7e3
[Fix] Escape single quotes in user name while rendering the modules_setup jinja template
2016-04-11 13:11:00 +05:30
Rushabh Mehta
acff9c6288
[fix] run_method
2016-04-11 12:43:20 +05:30
Rushabh Mehta
addda4a30c
[fix] open filtered list when clicked on notifications circle
2016-04-11 12:42:12 +05:30
Rushabh Mehta
d58a5773ba
[fix] [minor] return _seen only if demanded
2016-04-11 11:45:06 +05:30
Rushabh Mehta
79203f3ab6
[api] added on_change event in document.py that will be called after any update event, including on_trash
2016-04-11 11:34:26 +05:30
Nabin Hait
f9fd3945ae
[fix] Ignore current document while checking linked docs on deletion
2016-04-11 11:05:43 +05:30
Anand Doshi
89589bf552
[fix] use get_lang_code in auth.py to evaluate _lang
2016-04-08 18:39:56 +05:30
Rushabh Mehta
cb44325f39
[fix] limit open notifications to 20
2016-04-08 18:35:46 +05:30
Rushabh Mehta
9d8c2b5eff
[enhancements] added frappe.utils.evalute_filter(doc, filter) and ability to hook multiple doc events at the same time
2016-04-08 17:07:31 +05:30
Anand Doshi
754fda4935
Merge branch 'KanchanChauhan-Admin-roles' into develop
2016-04-08 16:11:29 +05:30
Anand Doshi
73ea0b7c8e
[fix] admin role addition
2016-04-08 16:11:15 +05:30
Kanchan Chauhan
f3cbcee944
Prevent Admin from clearing all roles
2016-04-08 15:37:09 +05:30
Anand Doshi
f5bc120d42
Merge pull request #1685 from vjFaLk/attachment-fix
...
Fixed issue for special characters in attachements
2016-04-08 15:20:51 +05:30
Valmik Jangla
eb689d467a
Fixed issue for special characters in attachements
2016-04-08 00:49:19 -07:00
Anand Doshi
d1dbdb6f5a
Merge pull request #1684 from MaxMorais/patch-15
...
Fix TypeError
2016-04-08 08:27:55 +05:30
Maxwell Morais
4fcc6502d7
Fix TypeError
...
Traceback (innermost last):
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/app.py", line 57, in application
response = frappe.handler.handle()
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/handler.py", line 19, in handle
execute_cmd(cmd)
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/handler.py", line 36, in execute_cmd
ret = frappe.call(method, **frappe.form_dict)
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/__init__.py", line 808, in call
return fn(*args, **newargs)
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/search.py", line 13, in search_link
search_widget(doctype, txt, query, searchfield=searchfield, page_len=page_len, filters=filters)
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/search.py", line 93, in search_widget
as_list=not as_dict)
File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 17, in execute
return DatabaseQuery(doctype).execute(*args, **kwargs)
TypeError: execute() got an unexpected keyword argument 'as_dict'
2016-04-07 15:09:53 -03:00
Anand Doshi
36972b9b59
[hot] [fix] email_alert.json
2016-04-07 22:41:54 +05:30
