Commit graph

24566 commits

Author SHA1 Message Date
mergify[bot]
852741581a
Merge pull request #10044 from prssanna/code-expand-button
fix: move expand button after description and change label according to state
2020-04-24 18:03:06 +00:00
mergify[bot]
4e3706763a
Merge pull request #10040 from Thunderbottom/data-validation-fix
fix: skip validation if oldfieldtype is not set to data
2020-04-24 17:26:11 +00:00
mergify[bot]
c4f8471960
Merge pull request #10011 from gavindsouza/update-password
fix: Message on reset password
2020-04-24 17:25:02 +00:00
Gavin D'souza
442810e7c0 fix: updated http_status_code and message 2020-04-24 18:33:53 +05:30
Gavin D'souza
e0d9cf50df fix: update password API mapping for /update-password 2020-04-24 18:32:03 +05:30
Suraj Shetty
a3b9761f76
style: Fix formatting 2020-04-24 13:43:35 +05:30
Suraj Shetty
d678fc62ab
fix: Clear __unsaved flag after document save (#10082) 2020-04-24 11:25:36 +05:30
Suraj Shetty
c3519b5a12
fix: Do not check for module for custom doctypes (#10081) 2020-04-24 10:31:08 +05:30
Suraj Shetty
9122866c62
fix: Consider __unsaved flag while getting doc as_dict (#10067)
Co-authored-by: Prssanna Desai <prssud@gmail.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-23 20:38:33 +05:30
Chinmay Pai
0296908f18
fix: only allow ldap reset password for system manager (#10076)
* fix: only allow ldap reset password for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: only check for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Syntax error

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-23 17:52:15 +05:30
mergify[bot]
6a75ae229d
Merge pull request #10068 from ruchamahabal/fix-migrate
fix(minor): Value Error during importing or exporting doc files in migrate
2020-04-23 08:15:23 +00:00
mergify[bot]
20083c743e
Merge pull request #10065 from Thunderbottom/site-based-logging
feat: Separate frappe log by site
2020-04-23 08:00:41 +00:00
Rucha Mahabal
8c63e4de2e fix(minor): Value Error during importing or exporting document files in migrate 2020-04-23 01:49:43 +05:30
Chinmay D. Pai
1bd5c916ce
chore: separate frappe log by site
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 16:23:02 +05:30
mergify[bot]
c3befc5652
Merge pull request #10053 from Thunderbottom/version-upgrade-check-fix
fix: compare and sort release list to get latest release
2020-04-22 10:50:31 +00:00
mergify[bot]
fad6c59a98
Merge pull request #10034 from surajshetty3416/fix-print-format-builder
fix(print-format-builder): Retain customisation
2020-04-22 09:19:10 +00:00
Suraj Shetty
7b41e942f1
Merge pull request #10027 from surajshetty3416/fix-prepared-report-creation
fix: Translate only if column label exists
2020-04-22 14:46:29 +05:30
mergify[bot]
ff523c8341
Merge pull request #9974 from gavindsouza/email-domain-fixes
fix: Attribute errors and better msgprint
2020-04-22 09:09:54 +00:00
Chinmay D. Pai
96c5162c7e
fix: compare and sort release list to get latest release
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 14:18:38 +05:30
mergify[bot]
b18f7866d9
Merge pull request #10046 from rohitwaghchaure/fixed-user-permissions-issue-develop
fix: ignore user permissions not working from the JS side
2020-04-22 08:41:53 +00:00
mergify[bot]
118d1e3de6
Merge pull request #10042 from ruchamahabal/move-video
fix: Permissions for Video DocType
2020-04-22 08:22:35 +00:00
mergify[bot]
7fb8dac072
Merge pull request #10030 from Thunderbottom/validate-name-data-options
feat: Add name validation to data fieldtype
2020-04-22 07:43:25 +00:00
Suraj Shetty
d0a2995cc8
Merge pull request #10043 from prssanna/timestap-case-fix
fix: Case of timestamps
2020-04-22 12:58:39 +05:30
Rohit Waghchaure
02b3ccc935 fix: ignore user permissions not working from the JS side 2020-04-22 12:49:24 +05:30
Suraj Shetty
3cb0675bf2
Merge branch 'develop' into fix-prepared-report-creation 2020-04-22 12:44:10 +05:30
Suraj Shetty
0cbe457206
Merge branch 'develop' into fix-print-format-builder 2020-04-22 12:44:00 +05:30
prssanna
a3059b10d1 fix: move expand button after description and change label according to state 2020-04-22 12:32:52 +05:30
Chinmay D. Pai
919562e60e
fix: skip data validation on creation if oldfieldtype is set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 12:22:46 +05:30
Rucha Mahabal
be6c58d606 fix: permissions for Video DocType 2020-04-22 12:10:18 +05:30
mergify[bot]
dab475b37c
Merge pull request #10036 from sagarvora/cssmap
feat: source maps for css/scss/less files!
2020-04-22 06:38:06 +00:00
mergify[bot]
283cca4879
Merge pull request #10039 from scmmishra/module-less-fix
fix: add modules.less
2020-04-22 06:36:30 +00:00
prssanna
774f990260 fix: fix case of timestamps 2020-04-22 12:03:35 +05:30
Chinmay D. Pai
27b5819e34
fix: skip validation if oldfieldtype is not set to data
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:55:46 +05:30
Shivam Mishra
db120f4793 fix: add modules.less 2020-04-22 11:39:37 +05:30
Sagar Vora
18cd93eb7f missing semicolons 2020-04-22 11:29:38 +05:30
mergify[bot]
e950b2e45d
Merge pull request #9910 from ruchamahabal/move-video
feat: Add Video DocType
2020-04-22 05:20:55 +00:00
Rushabh Mehta
04e6e8125e fix(minor): editable title for Web View 2020-04-22 10:29:06 +05:30
mergify[bot]
677f0e7fc4
Merge pull request #10031 from Thunderbottom/sanitize-all-html-input
fix: sanitize all html input
2020-04-22 04:40:53 +00:00
Sagar Vora
c2f566163e feat: source maps for css/scss/less files! 2020-04-22 01:56:58 +05:30
mergify[bot]
7035588bdc
Merge pull request #10028 from scmmishra/mail-minimizable
feat(UX): allow minimizing new email dialog
2020-04-21 18:38:24 +00:00
Suraj Shetty
3a48fd858f fix: Use currentTarget to find right parent 2020-04-21 23:06:14 +05:30
Chinmay D. Pai
108fa0f42e
fix: sanitize all html input
use beautifulsoup to parse if string contains html and then sanitize the
input html

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-21 17:22:44 +05:30
Chinmay D. Pai
6f63b03aeb
chore: fix sider issues
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-21 16:09:09 +05:30
Chinmay D. Pai
1dfa8ccbc4
feat: add name validation to data fieldtype
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-21 15:49:55 +05:30
sahil28297
ad8403034c
Merge pull request #10017 from marination/contacts-patch-fix
fix: Migrate fails on `move_email_and_phone_to_child_table` patch
2020-04-21 14:13:33 +05:30
Prssanna Desai
f9e898eea4
Merge pull request #9959 from scmmishra/tracking
feat: web page tracking
2020-04-21 14:08:41 +05:30
Shivam Mishra
2fccdd5bd2 fix: resolve conflicts in standard.json 2020-04-21 13:34:00 +05:30
Shivam Mishra
7d6adb9430 feat: allow minimizing new email dialog 2020-04-21 13:25:24 +05:30
Shivam Mishra
ceabdf7403 feat: better handling of website tracking flag 2020-04-21 12:43:26 +05:30
Shivam Mishra
d265f00f9b fix: update timestamp 2020-04-21 12:38:04 +05:30