Commit graph

22378 commits

Author SHA1 Message Date
Gavin D'souza
babcf7d25b chore: trimmed requirements by pipreqs 2019-11-12 16:07:19 +05:30
mergify[bot]
8fe3f9506d
Merge pull request #8792 from prssanna/leaderboard
feat: Add Leaderboard to Places
2019-11-12 09:46:49 +00:00
prssanna
afe90c03e7 feat: Add leaderboard to Places 2019-11-12 14:34:24 +05:30
Suraj Shetty
766eb4cc1f
fix(grid): Arrow key nav minor enhancements (#8762)
fix(grid): Arrow key nav minor enhancements
2019-11-12 12:33:07 +05:30
mergify[bot]
b882f72f8e
Merge pull request #8787 from netchampfaris/fix-listview-actions-test
test: More robust Listview Actions test
2019-11-12 06:49:40 +00:00
Faris Ansari
c79754e97d
Merge pull request #8784 from gavindsouza/chat-fix
fix(chat): visitor chat for v12
2019-11-12 12:12:56 +05:30
Faris Ansari
ffa8038e4c test: Fix Control Link test 2019-11-12 11:52:41 +05:30
mergify[bot]
f94cd49d9c
Merge pull request #8785 from rohitwaghchaure/letter_head_list_view_not_working
fix: letter head listview html issue
2019-11-12 06:01:30 +00:00
Faris Ansari
ea7d75c523 test: Remove .only 2019-11-12 11:11:42 +05:30
Faris Ansari
4fcb22546b test(listview): Select Pending Todo items 2019-11-12 11:11:35 +05:30
Gavin D'souza
767ff4f9f0 fix: making chat resources async available 2019-11-12 10:45:49 +05:30
Rohit Waghchaure
8c36afe460 fix: letter head listview html issue 2019-11-11 18:47:46 +05:30
Gavin D'souza
9aa0f9750d chore(chat): delete redundant test files 2019-11-11 17:31:28 +05:30
Gavin D'souza
873e887922 chore: include css/js only if chat is enabled 2019-11-11 17:18:56 +05:30
mergify[bot]
f0f2f001c2
Merge pull request #8776 from deepeshgarg007/auto_repeat_patch_fix
fix: Ignore links while saving auto repeat doc
2019-11-11 10:03:00 +00:00
Gavin D'souza
5d847da351 fix(chat): css and socketio for visitor chat 2019-11-11 15:22:27 +05:30
Gavin D'souza
7d6c381f01 fix(chat): namespace fixing and build.json updates
updated build.json for visitor chat, added desk namespace on desk load, removed redundant frappe.desk.* namespaces
2019-11-11 15:16:59 +05:30
Gavin D'souza
d73c3f622e chore(chat): update chat doctypes 2019-11-11 15:14:58 +05:30
mergify[bot]
3659ce8c4c
Merge pull request #8783 from Alchez/dev-date-prettify
format: singular-plural format (develop)
2019-11-11 08:53:32 +00:00
mergify[bot]
07f0a3cabc
Merge pull request #8780 from deepeshgarg007/webform_select
fix: Hide default arrow from select field in webforms
2019-11-11 08:46:50 +00:00
Rohan Bansal
47caf1e9ad fix: singular-plural format 2019-11-11 14:05:43 +05:30
deepeshgarg007
9f846f9a3b fix: Hide default arrow from select field in webforms 2019-11-09 22:03:27 +05:30
mergify[bot]
ea3b9cea60
Merge pull request #8778 from thefalconx33/job-enqueue-fix
fix: error while enqueuing jobs related to notification log
2019-11-08 10:58:01 +00:00
thefalconx33
be15eec09e fix: error while enqueuing jobs related to notification log 2019-11-08 15:54:09 +05:30
deepeshgarg007
49d3ac182c fix: Ignore links while saving auto repeat doc 2019-11-08 14:28:26 +05:30
Faris Ansari
2dac4f8432
fix(db.sql): Print query in debug mode (#8767) 2019-11-07 17:12:11 +05:30
Arjit Gupta
8d6d6d5d23 chore: Fix typo in docstrings (#8764)
Corrected typo in documentation of find() and find_all()
2019-11-07 14:06:26 +05:30
Faris Ansari
84ba4bec55
Merge pull request #8756 from netchampfaris/fix-xss-in-control-disp-area
fix(security): XSS in display area
2019-11-07 13:58:46 +05:30
mergify[bot]
951415dc4b
Merge pull request #8765 from hrwX/tags_patch_add_parent
fix(Tags): Global Tags fixes
2019-11-07 08:20:22 +00:00
mergify[bot]
19bcc6c131
Merge pull request #8772 from rohitwaghchaure/email_account_permissions_issue_while_checking_the_data
fix: email account permission issue while sending an email
2019-11-07 07:47:02 +00:00
mergify[bot]
866c9956d7
Merge pull request #8773 from saurabh6790/patch_fixes_2
fix: do not process server script or energy points if site is in migrate state
2019-11-07 07:42:25 +00:00
Saurabh
cc2797a08e 1. do not run server side script if site is in migrate state
2. do not process enegery points if site is in migrate state
2019-11-07 12:36:38 +05:30
Shivam Mishra
7eb322f2be
Merge pull request #8672 from scmmishra/group-by-fix
fix: Do not append table name for field with standard sql method
2019-11-07 11:07:55 +05:30
mergify[bot]
95916cacea
Merge pull request #8771 from prssanna/filters-fix
fix: fix for "IN" type filters not being saved
2019-11-06 17:33:54 +00:00
Saurabh
a39c6589c5
Merge pull request #8769 from sahil28297/fix_auth
fix(auth): do not force standard users to reset password
2019-11-06 20:43:04 +05:30
Rohit Waghchaure
83e8288104 fix: email account permission issue while sending an email 2019-11-06 19:55:04 +05:30
prssanna
2a751b13b9 fix: return value in autocomplete validate if 'valid_values' list is empty 2019-11-06 18:34:47 +05:30
Sahil Khan
12ffba815a fix(auth): do not force standard users to reset password 2019-11-06 16:39:33 +05:30
Himanshu Warekar
f6462dab31 Merge develop into tags_patch_add_parent 2019-11-06 15:45:35 +05:30
Himanshu Warekar
51158b7959 fix: add to patches.txt 2019-11-06 15:38:38 +05:30
mergify[bot]
736fc85176
Merge pull request #8738 from gavindsouza/no-name
fix(naming): empty string isnt accepted for rename
2019-11-06 07:12:10 +00:00
Faris Ansari
23ed4e4477
style: Fix key spacing 2019-11-06 12:31:07 +05:30
mergify[bot]
7fc62cb7cd
Merge pull request #8759 from prssanna/notifications-fix
fix(Notifications): Fix for 'New Document Shared' notifications
2019-11-06 06:40:45 +00:00
Himanshu
60a3da2fae
Update filter.js 2019-11-06 10:36:10 +05:30
Himanshu Warekar
a14e8a4859 fix: addfilter operations for tags 2019-11-06 01:13:37 +05:30
Saif Ur Rehman
8e5149099a Merge branch 'develop' of https://github.com/frappe/frappe.git into Grid-Arrow-Nav-V12
# Conflicts:
#	frappe/public/js/frappe/form/grid_row.js
2019-11-05 22:25:26 +05:00
Saif Ur Rehman
ec921fd1a5 fix(Grid Row): Arrow key nav do not prevent default unnecessarily 2019-11-05 22:20:29 +05:00
sahil28297
ebeee12326
fix(notification_log): skip enqueue_create_notification during new site creation 2019-11-05 20:52:04 +05:30
mergify[bot]
0782ebf143
Merge pull request #8761 from frappe/snyk-fix-db0a3e50a0bbf82e5e892e0a315b45e1
[Snyk] Fix for 1 vulnerabilities
2019-11-05 12:11:45 +00:00
snyk-bot
194be49333 fix: package.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SHOWDOWN-469487
2019-11-04 23:06:38 +00:00