Commit graph

27867 commits

Author SHA1 Message Date
Gavin D'souza
f5e1cdc5ce fix: Restore assets during bench init 2020-10-13 17:25:05 +05:30
Marica
1ad3bb76a5
fix: Skip using cookie-jar to set cookies if via tests (#11700) 2020-10-13 13:35:42 +05:30
rohitwaghchaure
7a4ca956ef
Merge pull request #11698 from rohitwaghchaure/patch-travis-fix-13-oct
fix: patch travis
2020-10-13 11:34:28 +05:30
Rohit Waghchaure
88ad462f70 fix: patch travis 2020-10-13 11:27:14 +05:30
mergify[bot]
5eebf3c29b
Merge pull request #11696 from netchampfaris/translate-linter-words-check
chore: Check words in translation lint
2020-10-12 15:50:52 +00:00
Faris Ansari
c7ed6ce977 fix: Remove test strings and early return 2020-10-12 21:12:47 +05:30
Faris Ansari
18bc0d14cf fix: remove hardcoded path 2020-10-12 21:03:22 +05:30
Faris Ansari
8708e56896 fix: Handle f string and fix words check 2020-10-12 21:00:15 +05:30
gavin
253ddd8734
Merge pull request #11692 from gavindsouza/explicitly-pass-distinct
fix: Skip distinct keyword wrapping in DatabaseQuery.prepare_args
2020-10-12 19:07:11 +05:30
Gavin D'souza
e812fb7da5 test: Update test_db_keywords_as_fields for postgres
* Updated styling to fit word limit
2020-10-12 18:36:26 +05:30
Gavin D'souza
992f66e044 test: Use standard distinct 2020-10-12 18:05:04 +05:30
Suraj Shetty
29735517cc
Merge pull request #11695 from surajshetty3416/fix-assignment-rule-bug
fix: Skip due date update during update and install
2020-10-12 18:01:31 +05:30
Faris Ansari
d1b92c66bb fix: eager lookup 2020-10-12 17:36:44 +05:30
Faris Ansari
a113f5c285 fix: add test strings 2020-10-12 17:28:21 +05:30
Suraj Shetty
cf44487acd fix: Skip due date update during update and install 2020-10-12 17:26:42 +05:30
Faris Ansari
5cf39f746a chore: Check existence of words in translation linter 2020-10-12 17:26:36 +05:30
Suraj Shetty
f2ef686797
Merge pull request #11689 from surajshetty3416/replace-template-syntax-for-translations 2020-10-12 17:18:36 +05:30
Suraj Shetty
198e255710
fix: Replace invalid translations
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2020-10-12 16:04:27 +05:30
Gavin D'souza
5097d9cd6e test: Updated tests with changed DatabaseQuery.prepare_args
behaviour
2020-10-12 15:47:28 +05:30
Gavin D'souza
cf1b01fb5e fix: Remove partial support for distinct keyword
* Added supporting sql functions and distinct kw in TODO
2020-10-12 15:34:48 +05:30
loyapeb-ishan
6b939d7841
fix(translations): Marathi translation correction (#11672)
Correct translation for No vs No. (number) in Marathi
2020-10-12 14:15:20 +05:30
mergify[bot]
d2a37dca0f
Merge pull request #11691 from ruchamahabal/fix-communication
fix: First Response Time not getting set when sender is Administrator
2020-10-12 08:38:48 +00:00
Rucha Mahabal
7c4ce7b6e7 fix: First Response Time not getting set when sender is Administrator 2020-10-12 13:46:24 +05:30
mergify[bot]
3b2de947c5
Merge pull request #11676 from scmmishra/fix-int-validation
fix: int validation
2020-10-12 08:06:44 +00:00
Suraj Shetty
9f8fcfe065
feat(Assignment Rule): Option to set custom due_date for assignments (#11669) 2020-10-12 13:30:04 +05:30
Suraj Shetty
89f97257dd fix: Replace incorrect translation syntax usages 2020-10-12 12:26:38 +05:30
Suraj Shetty
23bbbb1bbd chore: Consider template string as invalid 2020-10-12 11:34:51 +05:30
Suraj Shetty
b2ae8b16ae style: Format capture.js
- Replace one invalid translation syntax usage
2020-10-12 11:32:17 +05:30
mergify[bot]
e16a49f496
Merge pull request #11610 from prssanna/grid-upload
fix: convert float type fields from string to float in grid upload
2020-10-12 05:43:40 +00:00
Suraj Shetty
73d1c249cc
Merge branch 'develop' into grid-upload 2020-10-12 10:57:33 +05:30
Suraj Shetty
c4e119338c
fix(report): Always add name & docstatus field to avoid permission error (#11644) 2020-10-12 09:17:09 +05:30
Suraj Shetty
a147e45d0c fix: Replace incorrect translation syntax usages 2020-10-11 22:08:22 +05:30
Frappe PR Bot
7cfa4d59e9
chore: Update translations (#11681)
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-10-10 22:10:02 +05:30
mergify[bot]
622ef2ce31
Merge pull request #11682 from walstanb/fix-list-sidebar
fix(UI): fixed toggle sidebar on md devices
2020-10-10 13:31:38 +00:00
Walstan
4b4ebf6ab6 fix(UI): fixed toggle sidebar on md devices 2020-10-10 18:25:38 +05:30
gavin
c146363162
Merge pull request #11679 from gavindsouza/db-query-incl
fix: Add provision for quotes in DatabaseQuery.prepare_args
2020-10-09 20:26:50 +05:30
Gavin D'souza
b00a389cfd fix: Add provision for quotes in DatabaseQuery.prepare_args 2020-10-09 19:40:45 +05:30
Shivam Mishra
82dca893ba
Merge pull request #11674 from scmmishra/fix-customizations-saved-twice 2020-10-09 17:08:44 +05:30
Shivam Mishra
4072b69f6e chore: formatting fixes 2020-10-09 14:27:03 +05:30
Shivam Mishra
3886d9cfb7 feat: override validation for Int 2020-10-09 14:26:50 +05:30
Shivam Mishra
7edf72b9b0 chore: formatting fixes 2020-10-09 12:35:38 +05:30
Shivam Mishra
9511fcc002 fix: freeze DOM on call 2020-10-09 12:35:29 +05:30
mergify[bot]
f4aa4bb9ae
Merge pull request #11665 from scmmishra/feat-hide-public-stack-traces
feat: hide public stack traces
2020-10-09 07:05:26 +00:00
Suraj Shetty
948ace900b
style: Use tab instead of spaces 2020-10-09 10:42:10 +05:30
Snyk bot
f004b0592d
chore: Security upgrade rsa from 4.0 to 4.1 (#11671)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-RSA-570831
2020-10-09 10:26:33 +05:30
Faris Ansari
0bf1c61356
Merge pull request #11663 from netchampfaris/regenerate-theme-on-migrate
fix: Regenerate active theme on migrate
2020-10-08 23:51:52 +05:30
Shivam Mishra
035df47fba feat: show traceback by default for dev server 2020-10-08 14:53:57 +05:30
Shivam Mishra
0a082e2add feat: don't show traceback to users 2020-10-08 14:50:09 +05:30
Snyk bot
b720726207
chore: Update passlib to fix security issue (#11664)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PASSLIB-569603

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-10-08 09:59:20 +05:30
Prssanna Desai
9546b58183
fix(Query Report): set df options for custom column (#11612) 2020-10-08 09:57:05 +05:30