Commit graph

30903 commits

Author SHA1 Message Date
shariquerik
3717c98154 fix: implemented suggestions 2021-03-09 15:18:44 +05:30
shariquerik
e8d050a4f1 fix: Email Password popup grammer fix 2021-02-25 18:17:35 +05:30
Suraj Shetty
3aea7c4416
fix: Do not render multiple login blocks (#12490) 2021-02-25 17:14:48 +05:30
mergify[bot]
434a1e065b
Merge pull request #12465 from prssanna/select-field-placholder
feat: placeholder for Select fields
2021-02-25 10:34:35 +00:00
mergify[bot]
64abd9d3e4
Merge pull request #12253 from pateljannat/newsletter-modifications
feat: Newsletter modifications
2021-02-25 10:07:31 +00:00
prssanna
24e2b3d2ad Merge branch 'develop' of https://github.com/frappe/frappe into select-field-placholder 2021-02-25 15:25:05 +05:30
Suraj Shetty
0b158d7e59
Merge branch 'develop' into newsletter-modifications 2021-02-25 14:51:05 +05:30
prssanna
64359e3323 fix: remove item from localforage while deleting draft 2021-02-25 14:40:55 +05:30
mergify[bot]
3842edcac3
Merge pull request #12328 from tulukakaniwa/upstream_develop_fix
fix: incoming data type incompatible with old dashboard serialization logic
2021-02-25 08:50:48 +00:00
prssanna
b6faa877eb style: missing semicolon 2021-02-25 14:03:25 +05:30
prssanna
2f9627386e test: ui test for select control 2021-02-25 14:00:55 +05:30
prssanna
6bb76cfa39 fix: make control styles common with website 2021-02-25 13:59:06 +05:30
prssanna
a709f66889 fix: placeholder for form control fields 2021-02-25 13:58:24 +05:30
mergify[bot]
465404f66e
Merge pull request #12447 from adityahase/perf-cli
perf: Faster CLI
2021-02-25 01:44:36 +00:00
Prssanna Desai
cb221a9ded
Merge pull request #12475 from prssanna/fix-link-preview 2021-02-24 19:54:37 +05:30
mergify[bot]
f36e23e003
Merge pull request #12470 from revant/fix_openid_profile
fix(integrations): fix base url for openid_profile
2021-02-24 11:54:42 +00:00
mergify[bot]
49931f8d63
Merge pull request #12377 from CaseSolvedUK/develop
fix: Memory limit for watch command
2021-02-24 11:52:18 +00:00
prssanna
73e6b9bfc2 fix: cleanup code 2021-02-24 17:07:24 +05:30
mergify[bot]
340446c313
Merge pull request #12270 from deepeshgarg007/rebuild_tree
feat: Provision to rebuild NSM from treeview
2021-02-24 11:24:51 +00:00
mergify[bot]
cbbddafc0f
Merge pull request #12268 from hasnain2808/no-assignment-rule-on-todo
fix: Do not Allow Assignment Rule on Todo
2021-02-24 11:24:12 +00:00
Suraj Shetty
2a5fbe4566
fix: Modal design for website (#12474) 2021-02-24 16:52:09 +05:30
pateljannat
58091f2692 Merge branch 'newsletter-modifications' of https://github.com/pateljannat/frappe into newsletter-modifications 2021-02-24 16:46:36 +05:30
pateljannat
5b92c3d18d style: added margin 2021-02-24 16:46:26 +05:30
prssanna
14c4638f29 fix: get_avatar function for images 2021-02-24 16:38:24 +05:30
prssanna
4c910ab8db fix: refactor link preview popover style 2021-02-24 16:36:08 +05:30
prssanna
0006ad2867 fix: enable link preview 2021-02-24 16:35:41 +05:30
Deepesh Garg
f2d619bb2c fix: Check for command in case of API call 2021-02-24 15:43:03 +05:30
mergify[bot]
86407e5b48
Merge pull request #12446 from leela/login-attempt-tracker
refactor: Track consecutive login attempts
2021-02-24 10:11:04 +00:00
mergify[bot]
3e76842765
Merge pull request #12347 from hasnain2808/better-way-to-extract-fieldname
fix: better way to extract fieldname from key_name
2021-02-24 10:08:04 +00:00
mergify[bot]
3f817a6d4f
Merge pull request #12467 from pateljannat/email-recipient-through-reply-all
fix: Email recipient through reply all
2021-02-24 10:02:02 +00:00
Deepesh Garg
38861decab fix: Only for system manager 2021-02-24 15:23:49 +05:30
Deepesh Garg
ce9843ee4a fix: Only for system manager 2021-02-24 15:22:17 +05:30
mergify[bot]
db36708bd8
Merge pull request #12348 from alyf-de/communication_language
fix: Communication language
2021-02-24 09:46:32 +00:00
hasnain2808@gmail.com
fb40a48338 chore: better error message
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-24 15:12:26 +05:30
Suraj Shetty
e906479c0f
style: Fix formatting 2021-02-24 14:38:17 +05:30
mergify[bot]
a5d5f113e5
Merge pull request #12322 from hasnain2808/email-account-status
fix(Email Account): if incoming/outgoing disabled it cannot be default
2021-02-24 09:06:28 +00:00
mergify[bot]
f955b6f5a0
Merge pull request #12282 from nextchamp-saqib/image-pf-fix
fix: broken image rendering in print format
2021-02-24 09:04:23 +00:00
Deepesh Garg
d3dbd74a0a Merge branch 'develop' of https://github.com/frappe/frappe into rebuild_tree 2021-02-24 13:00:44 +05:30
hasnain2808@gmail.com
a55e1a6394 fix(ToDo): cypress tests 2021-02-24 12:56:05 +05:30
Saqib
d9737c1d25
Merge branch 'develop' into image-pf-fix 2021-02-24 12:45:21 +05:30
Revant Nandgaonkar
3d26f84d33 fix(integrations): fix base url for openid_profile
if the server is behind proxy the frappe.request.url scheme
is http instead of https causing mixed content errors in browser
2021-02-24 12:31:34 +05:30
hasnain2808@gmail.com
17e68da296 fix(Email Account): change warning message 2021-02-24 12:03:48 +05:30
Mohammad Hasnain Mohsin Rajan
72ad3e0711
fix: use frappe bold instead of tags
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-24 11:45:09 +05:30
pateljannat
3a713a015f fix: corrections to subject 2021-02-23 21:06:17 +05:30
pateljannat
1524663c6f fix: unnecesary condition removed 2021-02-23 20:06:59 +05:30
prssanna
6632920246 fix: trigger select-change event on .val() call 2021-02-23 19:58:10 +05:30
pateljannat
9e3e779442 fix: communication subject 2021-02-23 19:44:17 +05:30
prssanna
936078e899 fix: remove custom select style 2021-02-23 17:42:20 +05:30
prssanna
977adc4afd style: fix formatting 2021-02-23 16:58:41 +05:30
prssanna
1caca3a3d2 feat: placeholder for Select fields
- set select icon for only_input field as well
2021-02-23 16:52:06 +05:30