Commit graph

24547 commits

Author SHA1 Message Date
prssanna
b9baa63cfd fix: fix file permissions
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-04-24 13:44:41 +05:30
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
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
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
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
Chinmay Pai
f8f0296e66
Merge pull request #10026 from rmehta/fix-standard-theme 2020-04-21 12:12:54 +05:30
Rushabh Mehta
c0f66f3dac fix(minor): Standard theme naming. It will be common across sites 2020-04-21 11:41:55 +05:30
Suraj Shetty
0fa8266d6d fix: Translate only if column label exists 2020-04-21 09:29:24 +05:30
mergify[bot]
73729e5764
Merge pull request #9941 from scmmishra/sidebar-sorcery
feat: add sidebar items to navbar in mobile
2020-04-21 03:43:57 +00:00
Rushabh Mehta
0c19735386 fix(minor): standard Website Theme 2020-04-21 09:13:27 +05:30
mergify[bot]
00471c2b7b
Merge pull request #10012 from prssanna/form-save-fix
fix: form not being saved on setting empty value for some field types
2020-04-21 03:32:57 +00:00
Suraj Shetty
d74a1686f9
Merge branch 'develop' into sidebar-sorcery 2020-04-21 09:00:45 +05:30
Suraj Shetty
fa39cb3bbe
Merge branch 'develop' into form-save-fix 2020-04-21 08:49:35 +05:30
mergify[bot]
2569db0f79
Merge pull request #10018 from prssanna/multiselectlist-fix
fix: MultiSelectList field being rendered multiple times in dialog
2020-04-20 15:34:58 +00:00
prssanna
83a2b354d9 fix: MultiSelectList field being rendered multiple times in dialog 2020-04-20 20:45:25 +05:30
marination
90dd729496 fix: Migrate fails on move_email_and_phone_to_child_table patch 2020-04-20 20:31:27 +05:30
Rucha Mahabal
1a8e8437a2 fix: Breadcrumb and Desk Page for Video DocType 2020-04-20 20:04:08 +05:30
Shivam Mishra
f0e8c0ae40
Merge pull request #9997 from prssanna/fix-export-hidden-column
fix(Reports): don't export hidden columns in reports
2020-04-20 16:49:06 +05:30
Shivam Mishra
ba03e6ee5d fix: conflict 2020-04-20 16:36:52 +05:30
Aditya Hase
f6f55fa0ad
fix(background jobs): Show method name on Background Jobs page. (#10014)
After https://github.com/frappe/frappe/pull/8486 background jobs page doesn't provide any information.
2020-04-20 13:32:18 +05:30
mergify[bot]
d4625881e1
Merge pull request #10013 from adityahase/fix-uninstall
fix: Check if Event Consumer exists before checking for consumers
2020-04-20 07:45:13 +00:00
Aditya Hase
6f1caf101f fix: Check if Event Consumer exists before checking for consumers
the logic for event streaming has been hardcoded into `document.py`

Scenario:
a site (say, v12) backup needs to be restored on a v13 bench and then updated

Solution:
use `bench migrate`; works flawlessly.

However, if this site has an app installed that isn't available on the v13 bench,
then bench migrate fails.

Also, `bench remove-from-installed-apps` fails,
because of the absence of "Event Consumer"
2020-04-20 12:54:30 +05:30
prssanna
f1806aa8ef fix: form not being saved on setting empty value for some fieldtypes 2020-04-20 12:43:24 +05:30