Commit graph

485 commits

Author SHA1 Message Date
Anand Doshi
f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
Rushabh Mehta
f1c7f5966b [calendar] added filters, fixes in datetime 2015-02-24 14:40:39 +05:30
Anand Doshi
d234939cee [fix] changed Text Editor's mysql type to longtext 2015-02-24 12:48:49 +05:30
Anand Doshi
7f75e233a8 Website Listing 2015-02-23 22:30:03 +05:30
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30
Rushabh Mehta
a955c658ca [fixes] minor 2015-02-23 20:17:30 +05:30
Rushabh Mehta
3bdd69fa61 [fix] export_json 2015-02-22 22:31:52 +05:30
Rushabh Mehta
7cad548270 [tests] 2015-02-21 22:37:35 +05:30
Rushabh Mehta
6a662e574a [fix] minor 2015-02-20 20:09:15 +05:30
Rushabh Mehta
229af8cad2 [api] moved frappe.get_all(doctype, filters, fields) to frappe.get_all(doctype, fields, filters) 2015-02-20 15:18:52 +05:30
Rushabh Mehta
ffe1b9eacc [fix] naming frappe/erpnext#2794 2015-02-20 11:50:14 +05:30
Rushabh Mehta
8710680cfa [fixes] removed attach_files: wtf and cleaned up listviews 2015-02-19 20:04:51 +05:30
Rushabh Mehta
2f9608dba4 [fixes] [cleanup] clien side api, etc 2015-02-18 19:05:10 +05:30
Nabin Hait
aca7b3497e minor fixes 2015-02-18 11:56:28 +05:30
Rushabh Mehta
221e6f2fae [minor] moved precision to base_document 2015-02-17 19:54:06 +05:30
Pratik Vyas
43276932fd Load Document controller instead of BaseDocument controller in case of custom doctype 2015-02-17 15:26:49 +05:30
Rushabh Mehta
c335a041b3 [fixes] [minor] website layout, data import tool 2015-02-17 12:51:13 +05:30
Rushabh Mehta
2ab10573f6 [fixes] + added frappeclient 2015-02-12 16:14:49 +05:30
Anand Doshi
ce9e3ed931 Remove flags in frappe.call, api, run_method, filter moduleview items by permission 2015-02-10 18:56:28 +05:30
Nabin Hait
508c4fc64b Fixed Conflict while merging v4 to v5 2015-02-10 17:20:39 +05:30
Anand Doshi
e6a7459657 Fixes in share, moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:14 +05:30
Anand Doshi
e5e80a27a3 Allow non-english field names in Custom Field #919 2015-02-06 12:55:52 +05:30
Rushabh Mehta
756af9af97 [share] completes #992 2015-02-05 17:26:23 +05:30
Rushabh Mehta
9a649a4a3d [share] added share permission and patch #992 2015-02-05 15:51:31 +05:30
Rushabh Mehta
4310b20679 [sharing] added ui-wip 2015-02-04 18:27:42 +05:30
Rushabh Mehta
8cde7bfc23 [print] tables & [feature] share #992 2015-02-04 17:01:46 +05:30
Pratik Vyas
4527a7939a Make submit and cancel methods whitelisted 2015-02-03 18:38:01 +05:30
Rushabh Mehta
c19cb66542 [print-format] add print heading + fix tables 2015-02-03 17:54:36 +05:30
Rushabh Mehta
4c8558665d [todo] naming as hash 2015-02-03 10:35:49 +05:30
Rushabh Mehta
cf3074a20b [print-format] completed print format builder 2015-01-30 17:08:12 +05:30
Rushabh Mehta
d4393365e4 [fix] in_install_app is in_install 2015-01-22 17:12:27 +05:30
Rushabh Mehta
456621b931 [email] implemented, tested basic in and out 2015-01-21 17:37:58 +05:30
Anand Doshi
c645111800 [fix] escape quotes in permission conditions 2015-01-16 15:47:33 +05:30
Rushabh Mehta
090e9ac48c [ui] workflow and listview 2015-01-08 14:28:24 +05:30
Anand Doshi
99aabba7be [minor] darker app icon color & fix in delete doc 2015-01-08 14:27:28 +05:30
Anand Doshi
0324b11729 [design] fixes to Activity and Task Calendar 2015-01-07 15:44:15 +05:30
Anand Doshi
867a305e57 [fix] rename doc and slickgrid empty background color 2015-01-02 12:54:07 +05:30
Rushabh Mehta
15a1f42eb3 fixed permission, module setup pages 2015-01-01 16:02:48 +05:30
Rushabh Mehta
f1dbce8ee0 [merge] v5-design 2014-12-31 14:41:55 +05:30
Nabin Hait
3893678326 fixed conflict while merging develop into v5.0 2014-12-31 14:32:17 +05:30
Rushabh Mehta
448d2c78bf [ui] data import tool 2014-12-30 18:06:21 +05:30
Rushabh Mehta
112887dc0e [ui] minor changes 2014-12-30 18:06:08 +05:30
Nabin Hait
a4d45cce6f Renamed table fieldnames 2014-12-26 13:17:18 +05:30
Rushabh Mehta
812a969c54 [welcome] redis, refactored cache and notification count 2014-12-26 12:50:45 +05:30
John Vermette
86715e55ad Update base_document.py 2014-12-23 10:55:46 -05:00
Anand Doshi
ab286a89be [fix] Use df.precision if specified 2014-12-23 14:54:35 +05:30
Rushabh Mehta
2b9f6bace1 [merge] 2014-11-28 12:00:15 +05:30
Rushabh Mehta
b6463346b0 [fix] document.get_controller 2014-11-26 15:39:31 +05:30
Rushabh Mehta
cc275ba7f9 [feature] Custom DocTypes fixes #649 2014-11-26 14:43:16 +05:30
Rushabh Mehta
b0a43c28d3 [docs] 2014-11-25 17:56:12 +05:30