Commit graph

19825 commits

Author SHA1 Message Date
Saurabh
769e600ef0
Merge pull request #7609 from frappe-pr-bot/translations-2019-05-30
feat: Updated translation
2019-05-30 15:55:52 +05:30
Rushabh Mehta
6b721eee44 fix(minor): jquery_plugins for website 2019-05-30 15:28:35 +05:30
Suraj Shetty
50a1f1023f
fix: Use get_meta to avoid error 2019-05-30 15:16:09 +05:30
Faris Ansari
b84bca546b fix: Move add_options plugin to select.js (#7608) 2019-05-30 14:22:14 +05:30
Karthikeyan S
0404390064 fix(Barcode): excluding Barcode feild from XSS FIlter (#7604) 2019-05-30 13:50:05 +05:30
Faris Ansari
00e77355df fix: Make Blogger avatar rounded (#7603) 2019-05-30 13:48:30 +05:30
Faris Ansari
12d12c640b fix: Web Page (#7593)
- Sender fullname bug
- Rename section SEO to "Header, Breadcrumbs and Meta Tags"
2019-05-30 13:48:03 +05:30
frappe
1eb5257887 feat: Updated translation 2019-05-30 08:17:44 +00:00
Saurabh
b28c55e718
Merge pull request #7607 from saurabh6790/handle_import_error
fix: remove line numbers from source messages
2019-05-30 13:01:16 +05:30
Saurabh
3fde67d308 fix: remove line numbers from source messages 2019-05-30 12:26:48 +05:30
Faris Ansari
069e694881 fix: Blog Post styling 2019-05-30 12:26:38 +05:30
Aditya Hase
b94bbb34a9 fix(list-view): Escape quotes in data-name (#7600)
Fixes misbehaviour in bulk actions when selected documents have names
with quotes.
2019-05-30 10:52:50 +05:30
Suraj Shetty
61cc0d7918 Merge branch 'develop' of https://github.com/frappe/frappe into bulk-workflow-approval 2019-05-29 20:38:17 +05:30
Shivam Mishra
37283e4e84
Merge pull request #7595 from adityahase/fix-email-autosuggest-develop
fix(email): Search contacts by email_id as well
2019-05-29 20:03:12 +05:30
Aditya Hase
df58d1e1c4 fix(email): Search contacts by email_id as well
Email auto suggest now performs lookup on contact name and email_id fields
2019-05-29 18:05:43 +05:30
sahil28297
e75a78e501
Merge pull request #7585 from surajshetty3416/fix-patch
fix: UniqueFieldnameError while migration
2019-05-29 17:14:09 +05:30
Aditya Hase
2c93dc74fe fix: Update regex for capturing touched tables from query (#7588)
Previous regex used to yield false positives and false negatives
for queries like

UPDATE tabToDo SET description = "something"

Instead of yielding "tabToDo" it used to yield "tabToDo SET".

Now two separate regexes handle single word and multi-word names
In case of multi-word surrounding quotes are a must
2019-05-29 14:51:19 +05:30
Saurabh
9053a4374d
Merge pull request #7586 from rohitwaghchaure/issue_in_the_latest_version_of_babel_package_develop
fix: issue in the latest version of babel, set it to 2.6.0
2019-05-29 13:42:03 +05:30
Rohit Waghchaure
42f84f5914 fix: issue in the latest version of babel, set it to 2.6.0 2019-05-29 13:15:48 +05:30
Suraj Shetty
9f798e2913 fix: UniqueFieldnameError while migration 2019-05-29 13:03:48 +05:30
rohitwaghchaure
174c2be99f
Merge pull request #7576 from rohitwaghchaure/pagination_in_the_multi_select_modal_develop
feat: added more button in the multi select modal
2019-05-29 11:12:59 +05:30
Suraj Shetty
736d4db135 fix: Use different class for link preview popover (#7582)
* fix: Add different class for link preview popover
- Because the style changes for it used to affect other popovers

* fix: Re-arrange popover style for proper style override
2019-05-29 10:47:22 +05:30
Suraj Shetty
704b091c4c fix: Add a patch to apply customization to custom doctype (#7546)
This patch aims to apply & delete all the customization
on custom doctypes done through customize form

This is required because customize form in now blocked
for custom doctypes and user may not be able to
see previous customization
2019-05-29 10:15:10 +05:30
Saurabh
f3471fe5f9 fix: Handle file not found exception while extracting messages (#7574) 2019-05-29 10:12:39 +05:30
Suraj Shetty
5af58d429c fix(energy point): Negative values for review point in leaderboard (#7577)
* fix: Show available review points

* style: Simplify formatting
2019-05-29 10:09:40 +05:30
Deepesh Garg
2ae48532be fix: Update frappe-datatable (#7580) 2019-05-29 10:07:23 +05:30
Rohit Waghchaure
fa799d5734 fix: same result set shwoing multiple times in the multi-select popup 2019-05-28 23:40:30 +05:30
Rohit Waghchaure
7788b807e0 feat: added more button in the multi select modal 2019-05-28 20:53:15 +05:30
Suraj Shetty
1d99c1cc86 fix: Pass complete doc to avoid data loss 2019-05-28 17:00:45 +05:30
Suraj Shetty
cc7ea9fae6 fix: Handle edge cases
Handle edge cases like
- same action is used twice for transision
- workflow field is not set for the doc
2019-05-28 14:48:57 +05:30
Mangesh-Khairnar
f75aa3beff fix: add rating field in docfield (#7571) 2019-05-28 14:21:20 +05:30
Rushabh Mehta
6542d74578
Merge pull request #7564 from surajshetty3416/minimizable-dialog
feat(dialog): Option to minimize dialog
2019-05-28 12:38:10 +05:30
Rushabh Mehta
7e42520554 fix(minor): frappe.conf.db_type in sql exception 2019-05-28 12:29:39 +05:30
Saurabh
5826e934bf
Merge pull request #7566 from netchampfaris/website-fix-for-custom-doctype-d
fix: Skip website attr for Custom DocTypes
2019-05-28 12:18:57 +05:30
Suraj Shetty
b4dfd88f5f fix: Make it work in harmony ☮️ 2019-05-28 12:06:22 +05:30
Saurabh
67e7af4bc5
Merge pull request #7558 from Alchez/develop-route-history-issue
fix: Fix routing issue causing dynamic links to disappear
2019-05-28 12:04:09 +05:30
Saurabh
605e024fda
Merge pull request #7568 from surajshetty3416/eps-ux
fix(energy points): Show name of the user who actually reverted points
2019-05-28 11:24:17 +05:30
Suraj Shetty
a1e19ba0a3 feat(list view): Add bulk workflow approval option 2019-05-28 08:37:11 +05:30
Suraj Shetty
3a5288c661 fix: Show name of the user who actually reverted points 2019-05-28 08:20:22 +05:30
Faris Ansari
2c5b5ba45a fix: Skip website attr for Custom DocTypes 2019-05-27 18:40:11 +05:30
Rushabh Mehta
2e2c72629e fix(minor): communication.js remove old style print 2019-05-27 16:00:57 +05:30
Suraj Shetty
1907e8ad7e fix: Modal z-index 2019-05-27 14:44:51 +05:30
Himanshu
cf2de1fa20 fix(patch): Reload Communication Link (#7555)
* fix: reload comm_link

* Update patches.txt
2019-05-27 13:44:12 +05:30
Suraj Shetty
bbbb99f4d6 style: fix formatting 2019-05-26 20:35:26 +05:30
Rushabh Mehta
bfb149180c fix(minor): model.js 2019-05-26 17:52:55 +05:30
Himanshu
73c6520aef fix: Remove update_timeline_links from document.py (#7563) 2019-05-26 15:37:10 +05:30
Suraj Shetty
ac9b0d3397 Merge branch 'develop' of https://github.com/frappe/frappe into minimizable-dialog 2019-05-26 11:07:46 +05:30
Suraj Shetty
f54c6aeb1a fix: Dialog style 2019-05-26 11:07:35 +05:30
rohitwaghchaure
a06b821602
Merge pull request #7560 from rohitwaghchaure/incorrect_schedule_in_the_auto_repeat_develop
fix: incorrect schedule showing in the auto repeat when document is in the draft mode
2019-05-25 14:11:56 +05:30
Faris Ansari
e9b0c2229d fix: Error message for invalid Workflow Transition (#7553)
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
2019-05-25 11:56:20 +05:30