Commit graph

62 commits

Author SHA1 Message Date
Anand Doshi
05fe53c404 Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/comment/comment.py
	frappe/hooks.py
	frappe/model/db_query.py
	frappe/print/doctype/print_format/print_format.py
	frappe/utils/__init__.py
	requirements.txt
	setup.py
2015-04-06 12:05:50 +05:30
Anand Doshi
a24393f12d Convert to barracuda and utf8mb4, trim tables 2015-03-25 19:05:06 +05:30
Anand Doshi
38dc29120a Fixed User Permissions for listing and report 2015-03-23 15:25:24 +05:30
Rushabh Mehta
bead93693d [email] many fixes, bulk email, unsubscribe 2015-03-19 17:15:43 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Rushabh Mehta
f1c7f5966b [calendar] added filters, fixes in datetime 2015-02-24 14:40:39 +05:30
Anand Doshi
7f75e233a8 Website Listing 2015-02-23 22:30:03 +05:30
Rushabh Mehta
7cad548270 [tests] 2015-02-21 22:37:35 +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
2f9608dba4 [fixes] [cleanup] clien side api, etc 2015-02-18 19:05:10 +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
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
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
Anand Doshi
c645111800 [fix] escape quotes in permission conditions 2015-01-16 15:47:33 +05:30
Rushabh Mehta
2b9f6bace1 [merge] 2014-11-28 12:00:15 +05:30
Rushabh Mehta
1f0690b05d [security] [fix] stop client side queries in reportview.py 2014-11-24 13:20:31 +05:30
Rushabh Mehta
055e7b68d9 [new-feature] 2014-11-21 18:11:32 +05:30
Nabin Hait
4eb6cdb157 fix: query order by 2014-11-13 14:42:41 +05:30
Nabin Hait
3e18bfded9 Minor fix 2014-11-12 17:28:08 +05:30
ankitjavalkarwork
d5072ebbd1 [#2302] Fix Report Builder reports when fetching info from child tables 2014-10-29 19:00:33 +05:30
Rushabh Mehta
97b259fb56 [website] added form macros and other cleanups 2014-10-29 18:18:08 +05:30
Rushabh Mehta
575ec0015a [api] added frappe.client.get_list 2014-09-26 18:53:37 +05:30
Anand Doshi
0fa85213bb [fix] remove _assign from filters if _assign column does not exist 2014-09-08 13:01:59 +05:30
Anand Doshi
023b5cbcdf Show Assigned To in list view
Paired between Anand and Rushabh
2014-09-04 12:57:07 +05:30
Anand Doshi
eadf83b18a [fix] Query Report permissions 2014-09-01 16:26:30 +05:30
Anand Doshi
ae38bcf40f Filter query reports based on permissions using doctype name instead of fieldnames 2014-08-30 13:11:32 +05:30
Anand Doshi
f233760081 User Permission DocTypes: Apply OR logic when multiple applicable roles have different sets of User Permission DocTypes 2014-08-29 11:45:20 +05:30
Anand Doshi
bd995efb56 [minor] translations in appframe and listing 2014-08-27 21:47:17 +05:30
Anand Doshi
6611c12662 Select Document Types for applying User Permissions 2014-08-26 19:33:58 +05:30
Nabin Hait
e7b4a2e999 Deleted docstatus conditions 2014-08-08 16:31:16 +05:30
Anand Doshi
88203eed52 [fix] Escape special characters as per MySQLdb 2014-08-08 14:16:05 +05:30
Rushabh Mehta
5e487b7021 minor ux fixes 2014-08-08 11:56:23 +05:30
Rushabh Mehta
803cf51bed Merge pull request #714 from rmehta/web-page-update
[templates] [web page] made static page dynamic via jinja
2014-07-22 17:01:09 +05:30
Rushabh Mehta
f7a75fb2c5 [templates] [web page] made static page dynamic via jinja 2014-07-22 17:00:01 +05:30
Anand Doshi
580f1608da Minor fixes in db_query and base_document 2014-07-16 15:50:39 +05:30
Anand Doshi
5975012983 Fix in db_query's extract tables 2014-07-10 12:42:42 +05:30
Rushabh Mehta
0fbf4f9bc4 ignore condition fix and cleanup of progress bars 2014-07-03 14:44:02 +05:30
Anand Doshi
3cca0402f8 Fixed startswith count 2014-07-03 12:41:06 +05:30
Anand Doshi
120c49f7cd Don't add **order by** from meta if a mysql group function is used without group by clause
Fixes frappe/frappe-bench#17
2014-07-03 11:31:15 +05:30
Anand Doshi
0eb5e8120f Fixes for apply user permissions and momentjs 2014-06-04 18:12:57 +05:30
Anand Doshi
2b2a608bab Apply User Permissions optional in script and query report, option to pass user in has_permission 2014-06-04 17:54:43 +05:30
Anand Doshi
a57842e32b Role and User Permissions 2014-06-04 17:52:50 +05:30
Anand Doshi
fec15666f4 Started permission relogication 2014-06-04 17:52:17 +05:30
Rushabh Mehta
040b88e8e9 updates to pages 2014-05-08 16:53:27 +05:30
Rushabh Mehta
2405ed2e81 added or_filters to db_query. link search will not search 'search_fields' by default 2014-05-07 14:09:40 +05:30