From 3d1960c7983619a4acae2041b47ad9b1a6e15adf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 4 Jan 2016 16:11:18 +0530 Subject: [PATCH 1/9] [translation] fixes --- frappe/core/doctype/communication/communication.js | 4 ++-- frappe/public/js/frappe/desk.js | 2 +- frappe/public/js/frappe/form/toolbar.js | 5 +++-- frappe/public/js/frappe/list/list_item_main.html | 2 +- frappe/public/js/frappe/list/list_item_main_head.html | 2 +- frappe/public/js/frappe/list/listview.js | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js index 3b8501cda0..0ff7ee36ea 100644 --- a/frappe/core/doctype/communication/communication.js +++ b/frappe/core/doctype/communication/communication.js @@ -16,12 +16,12 @@ frappe.ui.form.on("Communication", "refresh", function(frm) { } if(frm.doc.status==="Open") { - frm.add_custom_button("Close", function() { + frm.add_custom_button(__("Close"), function() { frm.set_value("status", "Closed"); frm.save(); }); } else if (frm.doc.status !== "Linked") { - frm.add_custom_button("Reopen", function() { + frm.add_custom_button(__("Reopen"), function() { frm.set_value("status", "Open"); frm.save(); }); diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index ff5015d1fe..531afc8545 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -80,7 +80,7 @@ frappe.Application = Class.extend({ this.check_metadata_cache_status(); this.set_globals(); this.sync_pages(); - moment.locale(frappe.boot.lang); + moment.locale("en"); moment.user_utc_offset = moment().utcOffset(); if(frappe.boot.timezone_info) { moment.tz.add(frappe.boot.timezone_info); diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index c852dc222b..d1aaa1d48a 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -30,16 +30,17 @@ frappe.ui.form.Toolbar = Class.extend({ }, set_title: function() { if(this.frm.meta.title_field) { - var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || __(this.frm.docname); + var title = (this.frm.doc[this.frm.meta.title_field] || "").trim() || this.frm.docname; if(this.frm.doc.__islocal || title === this.frm.docname || this.frm.meta.autoname==="hash") { this.page.set_title_sub(""); } else { this.page.set_title_sub(this.frm.docname); } } else { - var title = __(this.frm.docname); + var title = this.frm.docname; } var me = this; + title = __(title); this.page.set_title(title); if(this.frm.meta.title_field) { frappe.utils.set_title(title + " - " + this.frm.docname); diff --git a/frappe/public/js/frappe/list/list_item_main.html b/frappe/public/js/frappe/list/list_item_main.html index 6ed25c515f..ab49855d99 100644 --- a/frappe/public/js/frappe/list/list_item_main.html +++ b/frappe/public/js/frappe/list/list_item_main.html @@ -31,7 +31,7 @@ {% } %} {% } else if(col.fieldtype==="Select") { %} {%= value %} + data-filter="{%= col.fieldname %},=,{%= value %}">{%= __(value) %} {% } else if(col.fieldtype==="Link") { %} {%= value %} diff --git a/frappe/public/js/frappe/list/list_item_main_head.html b/frappe/public/js/frappe/list/list_item_main_head.html index f51c095ab5..765551c4c1 100644 --- a/frappe/public/js/frappe/list/list_item_main_head.html +++ b/frappe/public/js/frappe/list/list_item_main_head.html @@ -28,7 +28,7 @@ {% } %} - {%= col.title || col.label || "" %} + {%= __(col.title) || __(col.label) || "" %} {% } %} {% } %} diff --git a/frappe/public/js/frappe/list/listview.js b/frappe/public/js/frappe/list/listview.js index e61facd43b..27a2dbc0c5 100644 --- a/frappe/public/js/frappe/list/listview.js +++ b/frappe/public/js/frappe/list/listview.js @@ -266,7 +266,7 @@ frappe.views.ListView = Class.extend({ var indicator = frappe.get_indicator(doc, this.doctype); if(indicator) { return ''+indicator[0]+''; + +indicator[2]+'">'+__(indicator[0])+''; } else { return ""; } @@ -277,7 +277,7 @@ frappe.views.ListView = Class.extend({ if (!indicator) { return ""; } - return ''; + return ''; }, prepare_data: function(data) { From 8b88b18f1172b6dbe13d4c241adce80eb1dc1d11 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 5 Jan 2016 11:16:02 +0530 Subject: [PATCH 2/9] minor fix --- frappe/model/utils/rename_field.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/utils/rename_field.py b/frappe/model/utils/rename_field.py index 03b39414c3..3c10315dd3 100644 --- a/frappe/model/utils/rename_field.py +++ b/frappe/model/utils/rename_field.py @@ -119,7 +119,7 @@ def update_property_setters(doctype, old_fieldname, new_fieldname): where doc_type=%s and field_name=%s""", (new_fieldname, doctype, old_fieldname)) idx_property = frappe.db.sql("""select name, value from `tabProperty Setter` - where doc_type=%s and property = '_idx' and value like '%%%s%%'""", + where doc_type='%s' and property = '_idx' and value like '%%%s%%'""" % (doctype, old_fieldname), as_dict=1) if idx_property: From 61866f6a8a4db3b1f81f0f0be8b509d5f5602714 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 5 Jan 2016 15:18:19 +0530 Subject: [PATCH 3/9] [fix] Set _idx based on Custom Field --- frappe/custom/doctype/custom_field/custom_field.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index 3ef98260e2..c1d0346014 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -92,11 +92,9 @@ class CustomField(Document): # Create new peroperty setter if order changed if _idx and not existing_property_setter: field_idx = (_idx.index(self.insert_after) + 1) if (self.insert_after in _idx) else len(_idx) - if field_idx < len(_idx): - _idx[field_idx] = self.fieldname - else: - _idx.append(self.fieldname) - + + _idx.insert(field_idx, self.fieldname) + frappe.make_property_setter({ "doctype":self.dt, "doctype_or_field": "DocType", From 989e0c24ea81479eca12f4713bf090b9876d0bb4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 11:34:31 +0530 Subject: [PATCH 4/9] [minor] add column liked_by --- frappe/desk/like.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/like.py b/frappe/desk/like.py index 42742b7499..da3883c8b8 100644 --- a/frappe/desk/like.py +++ b/frappe/desk/like.py @@ -53,7 +53,7 @@ def _toggle_like(doctype, name, add, user=None): frappe.db.set_value(doctype, name, "_liked_by", json.dumps(liked_by), update_modified=False) except Exception, e: - if e.args[0]==1054: + if isinstance(e.args, (tuple, list)) and e.args[0]==1054: add_column(doctype, "_liked_by", "Text") _toggle_like(doctype, name, add, user) else: From 054005e33114a0967da281dc87cf518966a236c9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 16:26:09 +0530 Subject: [PATCH 5/9] [fix] setup wizard language trigger --- frappe/desk/page/setup_wizard/setup_wizard.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index b513dc263e..52092c1c1d 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -262,9 +262,14 @@ function load_frappe_slides() { frappe.wiz.welcome.data = r.message; frappe.wiz.welcome.setup_fields(slide); - slide.get_field("language") - .set_input(frappe.wiz.welcome.data.default_language || "english") - .trigger("change"); + var language_field = slide.get_field("language"); + language_field.set_input(frappe.wiz.welcome.data.default_language || "english"); + + if (!frappe.wiz._from_load_messages) { + language_field.$input.trigger("change"); + } + + delete frappe.wiz._from_load_messages; moment.locale("en"); } @@ -289,6 +294,7 @@ function load_frappe_slides() { }, callback: function(r) { // TODO save values! + frappe.wiz._from_load_messages = true; // reset all slides so that labels are translated frappe.wiz.slides = []; From d32444151f1d815ad9d82f2fdfdf3ce006715272 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 18:22:43 +0530 Subject: [PATCH 6/9] [minor] don't update modified in last scheduler event --- frappe/utils/scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index 0e949b6df2..5242f10612 100644 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -32,7 +32,7 @@ def enqueue_events(site): # set scheduler last event frappe.db.begin() - frappe.db.set_value('System Settings', 'System Settings', 'scheduler_last_event', nowtime.strftime(DATETIME_FORMAT)) + frappe.db.set_value('System Settings', 'System Settings', 'scheduler_last_event', nowtime.strftime(DATETIME_FORMAT), update_modified=False) frappe.db.commit() out = [] From 01ad5b0b2985c0f271c939cd77f6fba1fadeb6f6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 18:22:57 +0530 Subject: [PATCH 7/9] [fix] tabbing in grid and collapsed sections --- frappe/public/js/frappe/form/control.js | 9 ++-- frappe/public/js/frappe/form/layout.js | 58 +++++++++++++++---------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 42f2f93b21..e83d3c5999 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1153,10 +1153,6 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ select: function(event, ui) { me.autocomplete_open = false; - if(ui.item.action) { - ui.item.action.apply(me); - } - // prevent selection on tab var TABKEY = 9; if(event.keyCode === TABKEY) { @@ -1165,6 +1161,11 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ return false; } + if(ui.item.action) { + ui.item.value = ""; + ui.item.action.apply(me); + } + if(me.frm && me.frm.doc) { me.selected = true; me.parse_validate_and_set_in_model(ui.item.value); diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 7dc3cfbef8..1d6b2c72e2 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -236,11 +236,12 @@ frappe.ui.form.Layout = Class.extend({ grid_row = null; prev = null, fields = me.fields_list, - in_grid = false; + in_grid = false, + focused = false; // in grid if(doctype != me.doctype) { - grid_row =me.get_open_grid_row() + grid_row = me.get_open_grid_row(); fields = grid_row.layout.fields_list; } @@ -254,38 +255,43 @@ frappe.ui.form.Layout = Class.extend({ } break; } - if(i==len-1) { - // last field in this group - if(grid_row) { - // in grid - if(grid_row.doc.idx==grid_row.grid.grid_rows.length) { - // last row, close it and find next field - grid_row.toggle_view(false, function() { - me.handle_tab(grid_row.grid.df.parent, grid_row.grid.df.fieldname); - }) - } else { - // next row - grid_row.grid.grid_rows[grid_row.doc.idx].toggle_view(true); - } - } else { - $(this.primary_button).focus(); - } - } else { - me.focus_on_next_field(i, fields); + if(i < len-1) { + focused = me.focus_on_next_field(i, fields); } - break; + if (focused) { + break; + } } - if(fields[i].disp_status==="Write") + if(this.is_visible(fields[i])) prev = fields[i]; } + + if (!focused) { + // last field in this group + if(grid_row) { + // in grid + if(grid_row.doc.idx==grid_row.grid.grid_rows.length) { + // last row, close it and find next field + grid_row.toggle_view(false, function() { + grid_row.grid.frm.layout.handle_tab(grid_row.grid.df.parent, grid_row.grid.df.fieldname); + }) + } else { + // next row + grid_row.grid.grid_rows[grid_row.doc.idx].toggle_view(true); + } + } else { + $(this.primary_button).focus(); + } + } + return false; }, focus_on_next_field: function(start_idx, fields) { // loop to find next eligible fields for(var i= start_idx + 1, len = fields.length; i < len; i++) { var field = fields[i]; - if(field.disp_status==="Write") { + if(this.is_visible(field)) { if(field.df.fieldtype==="Table") { // open table grid if(!(field.grid.grid_rows && field.grid.grid_rows.length)) { @@ -294,14 +300,18 @@ frappe.ui.form.Layout = Class.extend({ } // show grid row (if exists) field.grid.grid_rows[0].show_form(); + return true; } else if(!in_list(frappe.model.no_value_type, field.df.fieldtype)) { this.set_focus(field); - break; + return true; } } } }, + is_visible: function(field) { + return field.disp_status==="Write" && (field.$wrapper && field.$wrapper.is(":visible")) + }, set_focus: function(field) { // next is table, show the table if(field.df.fieldtype=="Table") { From 3a73cbab59fca267ec19753cf17a7da1048c5d11 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 19:07:56 +0530 Subject: [PATCH 8/9] [docs] --- .../api/core/frappe.core.notifications.html | 16 +++ .../current/api/desk/frappe.desk.like.html | 96 +++++++++++++ .../api/desk/frappe.desk.notifications.html | 32 +++++ frappe/docs/current/api/desk/index.txt | 2 +- frappe/docs/current/api/frappe.sessions.html | 2 +- .../api/model/frappe.model.db_query.html | 16 ++- .../api/model/frappe.model.document.html | 30 ++-- .../api/utils/frappe.utils.bench_helper.html | 2 +- .../current/api/utils/frappe.utils.data.html | 16 +++ .../api/website/frappe.website.template.html | 131 ------------------ frappe/docs/current/api/website/index.txt | 1 - frappe/docs/current/index.html | 2 +- frappe/docs/current/models/core/comment.html | 3 +- .../current/models/core/communication.html | 14 -- frappe/docs/current/models/core/user.html | 6 +- frappe/docs/current/models/desk/feed.html | 66 ++++++++- 16 files changed, 263 insertions(+), 172 deletions(-) create mode 100644 frappe/docs/current/api/desk/frappe.desk.like.html delete mode 100644 frappe/docs/current/api/website/frappe.website.template.html diff --git a/frappe/docs/current/api/core/frappe.core.notifications.html b/frappe/docs/current/api/core/frappe.core.notifications.html index c2e7eb0794..a8fe2071e3 100644 --- a/frappe/docs/current/api/core/frappe.core.notifications.html +++ b/frappe/docs/current/api/core/frappe.core.notifications.html @@ -77,6 +77,22 @@ + + + + +

+ + + frappe.core.notifications.get_unseen_likes + () +

+

Returns count of unseen likes

+
+
+ + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.like.html b/frappe/docs/current/api/desk/frappe.desk.like.html new file mode 100644 index 0000000000..d1b364d46a --- /dev/null +++ b/frappe/docs/current/api/desk/frappe.desk.like.html @@ -0,0 +1,96 @@ +
+ + + Version 6.x.x + + + Source + +
+ + + + + + + + + +

+ + + frappe.desk.like._toggle_like + (doctype, name, add, user=None) +

+

Same as toggle_like but hides param user from API

+
+
+ + + + + + + +

+ + + frappe.desk.like.add_comment + (doctype, name) +

+

No docs

+
+
+ + + + + + + +

+ + + frappe.desk.like.remove_like + (doctype, name) +

+

Remove previous Like

+
+
+ + + + + + +

Public API +
/api/method/frappe.desk.like.toggle_like +

+

+ + + frappe.desk.like.toggle_like + (doctype, name, add=False) +

+

Adds / removes the current user in the __liked_by property of the given document. +If column does not exist, will add it in the database.

+ +

The _liked_by property is always set from this function and is ignored if set via +Document API

+ +

Parameters:

+ +
    +
  • doctype - DocType of the document to like
    • +
  • name - Name of the document to like
    • +
  • add - Yes if like is to be added. If not Yes the like will be removed.
    • +
+
+
+ + + + + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/frappe.desk.notifications.html b/frappe/docs/current/api/desk/frappe.desk.notifications.html index 799d78174c..81727789f3 100644 --- a/frappe/docs/current/api/desk/frappe.desk.notifications.html +++ b/frappe/docs/current/api/desk/frappe.desk.notifications.html @@ -131,6 +131,22 @@ +

+ + + frappe.desk.notifications.get_notifications_for + (notification_type, config, notification_count) +

+

No docs

+
+
+ + + + + + +

@@ -159,6 +175,22 @@ + + + + +

+ + + frappe.desk.notifications.get_notifications_for_other + (config, notification_count) +

+

Notifications for other items

+
+
+ + + \ No newline at end of file diff --git a/frappe/docs/current/api/desk/index.txt b/frappe/docs/current/api/desk/index.txt index 439207c279..dba8734feb 100644 --- a/frappe/docs/current/api/desk/index.txt +++ b/frappe/docs/current/api/desk/index.txt @@ -1,6 +1,7 @@ frappe.desk.calendar frappe.desk.desk_page frappe.desk +frappe.desk.like frappe.desk.moduleview frappe.desk.notifications frappe.desk.query_builder @@ -8,5 +9,4 @@ frappe.desk.query_report frappe.desk.report_dump frappe.desk.reportview frappe.desk.search -frappe.desk.star frappe.desk.tags \ No newline at end of file diff --git a/frappe/docs/current/api/frappe.sessions.html b/frappe/docs/current/api/frappe.sessions.html index 84690315b5..21f51c17c9 100644 --- a/frappe/docs/current/api/frappe.sessions.html +++ b/frappe/docs/current/api/frappe.sessions.html @@ -284,7 +284,7 @@ frappe.sessions.clear_sessions - (user=None, keep_current=False) + (user=None, keep_current=False, device=None)

No docs

diff --git a/frappe/docs/current/api/model/frappe.model.db_query.html b/frappe/docs/current/api/model/frappe.model.db_query.html index 25bc99f50f..f71e6a54c9 100644 --- a/frappe/docs/current/api/model/frappe.model.db_query.html +++ b/frappe/docs/current/api/model/frappe.model.db_query.html @@ -40,6 +40,20 @@ +

+ + + add_comment_count + (self, result) +

+

No docs

+
+
+ + + + +

@@ -156,7 +170,7 @@ execute - (self, query=None, fields=None, filters=None, or_filters=None, docstatus=None, group_by=None, order_by=None, limit_start=False, limit_page_length=None, as_list=False, with_childnames=False, debug=False, ignore_permissions=False, user=None) + (self, query=None, fields=None, filters=None, or_filters=None, docstatus=None, group_by=None, order_by=None, limit_start=False, limit_page_length=None, as_list=False, with_childnames=False, debug=False, ignore_permissions=False, user=None, with_comment_count=False)

No docs

diff --git a/frappe/docs/current/api/model/frappe.model.document.html b/frappe/docs/current/api/model/frappe.model.document.html index 970a493bd6..73bcd32ea0 100644 --- a/frappe/docs/current/api/model/frappe.model.document.html +++ b/frappe/docs/current/api/model/frappe.model.document.html @@ -110,7 +110,7 @@ all values (including child documents) from the database.

add_comment - (self, comment_type, text=None, comment_by=None) + (self, comment_type, text=None, comment_by=None, reference_doctype=None, reference_name=None)

Add a comment to this document.

@@ -280,6 +280,20 @@ timestamps don't match.

+

+ + + get_liked_by + (self) +

+

No docs

+
+
+ + + + +

@@ -308,20 +322,6 @@ timestamps don't match.

-

- - - get_starred_by - (self) -

-

No docs

-
-
- - - - -

diff --git a/frappe/docs/current/api/utils/frappe.utils.bench_helper.html b/frappe/docs/current/api/utils/frappe.utils.bench_helper.html index c5a73083df..28066aa7ba 100644 --- a/frappe/docs/current/api/utils/frappe.utils.bench_helper.html +++ b/frappe/docs/current/api/utils/frappe.utils.bench_helper.html @@ -21,7 +21,7 @@ frappe.utils.bench_helper.app_group - (ctx, site=False, force=False, verbose=False, profile=False) + ()

No docs

diff --git a/frappe/docs/current/api/utils/frappe.utils.data.html b/frappe/docs/current/api/utils/frappe.utils.data.html index 0198f26d61..d0b5eabc2e 100644 --- a/frappe/docs/current/api/utils/frappe.utils.data.html +++ b/frappe/docs/current/api/utils/frappe.utils.data.html @@ -926,6 +926,22 @@ Ported from PrettyDate by John Resig

+

+ + + frappe.utils.data.to_markdown + (html) +

+

No docs

+
+
+ + + + + + +

diff --git a/frappe/docs/current/api/website/frappe.website.template.html b/frappe/docs/current/api/website/frappe.website.template.html deleted file mode 100644 index b154b8fc03..0000000000 --- a/frappe/docs/current/api/website/frappe.website.template.html +++ /dev/null @@ -1,131 +0,0 @@ -

- - - Version 6.x.x - - - Source - -
- - - - - - - - - -

- - - frappe.website.template.add_hero - (out, context) -

-

Add a hero element if specified in content or hooks. -Hero elements get full page width.

-
-
- - - - - - - -

- - - frappe.website.template.add_index - (out, context) -

-

Add index, next button if {index}, {next} is present.

-
-
- - - - - - - -

- - - frappe.website.template.build_template - (context) -

-

Returns a dict of block name and its rendered content

-
-
- - - - - - - -

- - - frappe.website.template.render_blocks - (template_path, out, context) -

-

Build the template block by block from the main template.

-
-
- - - - - - - -

- - - frappe.website.template.separate_style_and_script - (out, context) -

-

Extract style and script tags into separate blocks

-
-
- - - - - - - -

- - - frappe.website.template.set_breadcrumbs - (out, context) -

-

Build breadcrumbs template (deprecated)

-
-
- - - - - - - -

- - - frappe.website.template.set_title_and_header - (out, context) -

-

Extract and set title and header from content or context.

-
-
- - - - - - \ No newline at end of file diff --git a/frappe/docs/current/api/website/index.txt b/frappe/docs/current/api/website/index.txt index 45ac658638..991920d20a 100644 --- a/frappe/docs/current/api/website/index.txt +++ b/frappe/docs/current/api/website/index.txt @@ -3,6 +3,5 @@ frappe.website frappe.website.render frappe.website.router frappe.website.statics -frappe.website.template frappe.website.utils frappe.website.website_generator \ No newline at end of file diff --git a/frappe/docs/current/index.html b/frappe/docs/current/index.html index 0ac6840f4f..887376f6b1 100644 --- a/frappe/docs/current/index.html +++ b/frappe/docs/current/index.html @@ -35,7 +35,7 @@ Version - 6.16.3 + 6.17.2 diff --git a/frappe/docs/current/models/core/comment.html b/frappe/docs/current/models/core/comment.html index 96eec2e578..182e0ed6ab 100644 --- a/frappe/docs/current/models/core/comment.html +++ b/frappe/docs/current/models/core/comment.html @@ -73,7 +73,8 @@ Comment Workflow Label Attachment -Attachment Removed +Attachment Removed +Like diff --git a/frappe/docs/current/models/core/communication.html b/frappe/docs/current/models/core/communication.html index a754c28889..b89c1b07dc 100644 --- a/frappe/docs/current/models/core/communication.html +++ b/frappe/docs/current/models/core/communication.html @@ -571,20 +571,6 @@ Recipient Unsubscribed -

- - - get_starrers - (self) -

-

Return list of users who have starred this document.

-
-
- - - - -

diff --git a/frappe/docs/current/models/core/user.html b/frappe/docs/current/models/core/user.html index 52f57c0ca4..a74b436399 100644 --- a/frappe/docs/current/models/core/user.html +++ b/frappe/docs/current/models/core/user.html @@ -1068,9 +1068,9 @@ Website User

- + - send_password_notifcation + send_password_notification (self, new_password)

No docs

@@ -1595,8 +1595,6 @@ The mentions will be separated by non-word characters or may appear at the start - - diff --git a/frappe/docs/current/models/desk/feed.html b/frappe/docs/current/models/desk/feed.html index 827a680734..1c834c4268 100644 --- a/frappe/docs/current/models/desk/feed.html +++ b/frappe/docs/current/models/desk/feed.html @@ -52,7 +52,8 @@ Comment Login Label -Info +Info +Like @@ -116,6 +117,55 @@ Info + + 7 + doc_owner + + Data + + Doc Owner + + + + + + + 8 + seen + + Check + + Seen + + + + + + + 9 + reference_doctype + + Data + + Reference DocType +

+ Use this to provide alternative link to a feed record

+ + + + + + 10 + reference_name + + Data + + Reference Name + + + + + @@ -138,6 +188,20 @@ Info
+ + + +

+ + + validate + (self) +

+

No docs

+
+
+ +
From ea0b635c03680a92a735e43018b952df313c8e5a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jan 2016 19:39:06 +0600 Subject: [PATCH 9/9] bumped to version 6.17.3 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 151034dfdb..b4ededed6b 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.17.2" +__version__ = "6.17.3" diff --git a/frappe/hooks.py b/frappe/hooks.py index 6b1173622e..881f76e62d 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.17.2" +app_version = "6.17.3" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 5a1c09cb72..47962c20c5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.17.2" +version = "6.17.3" requirements = parse_requirements("requirements.txt", session="") setup(