vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
26612 commits 1 branch 0 tags 587 MiB
Commit graph

26612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chinmay D. Pai
f12ed9791a
fix: remove example users email ids from notifications 
currently the system tries sending emails to all users that have
'thread_notify' enabled, including the default example emails that the
Administrator and Guest accounts have. this patch disables email
notifications for these accounts, and additionally tries to disable it
for any other user accounts with example emails

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-17 11:32:02 +05:30
mergify[bot]
34b529f581
Merge pull request #11023 from marination/workflow-state-field 
fix: Made Workflow State Field Mandatory
 2020-07-16 16:34:00 +00:00
mergify[bot]
23a2f52e89
Merge pull request #11009 from netchampfaris/fix-blog-md-content 
fix: Markdown content in Blog Post
 2020-07-16 16:29:16 +00:00
mergify[bot]
1aa2d6d97f
Merge pull request #10910 from Thunderbottom/printview-xss 
fix: escape unwanted tags before displaying printview
 2020-07-16 16:29:09 +00:00
Suraj Shetty
b03035daae
Merge branch 'develop' into printview-xss 2020-07-16 18:02:37 +05:30
mergify[bot]
dfb073e007
Merge pull request #11021 from rohitwaghchaure/fixed-route-issue-if-autoname-is-prompt 
fix: Edit in full page broken link
 2020-07-16 12:25:29 +00:00
Suraj Shetty
80fb256421
style: Add space after if 2020-07-16 17:41:37 +05:30
Suraj Shetty
4cdaedcbad
style: Add space after if 2020-07-16 17:38:34 +05:30
Faris Ansari
434c892ac0
feat: Bench command to open ngrok tunnel (#11024) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-07-16 17:05:08 +05:30
Rohit Waghchaure
79e3f88a65 fix: Edit in full page broken link 2020-07-16 15:34:59 +05:30
marination
92a778c44a fix: Made Workflow State Field Mandatory 2020-07-16 14:03:11 +05:30
mergify[bot]
31b0e81629
Merge pull request #11020 from netchampfaris/fix-canonical-url 
fix: Canonical URL
 2020-07-16 08:07:26 +00:00
Faris Ansari
9890ae6ff2 fix: Canonical URL 
Must obey hostname value in config.
 2020-07-16 13:23:16 +05:30
mergify[bot]
85111d841c
Merge pull request #11007 from surajshetty3416/notifications-ui-fixes 
fix: Strip HTML from notification subject
 2020-07-15 10:30:21 +00:00
mergify[bot]
c4947606f2
Merge pull request #10970 from prssanna/chart-link 
feat(Dashboard Chart): allow user to set doctype or report only once
 2020-07-15 10:25:35 +00:00
Suraj Shetty
87805fdfd8
Merge branch 'develop' into chart-link 2020-07-15 15:40:44 +05:30
mergify[bot]
a58a854aff
Merge pull request #10585 from prssanna/sync-dashboards 
feat: sync dashboards from json files
 2020-07-15 09:55:32 +00:00
Faris Ansari
3b09087c5b fix: Markdown content in Blog Post 
`markdown` checks if the content is html, if not, converts to markdown.
This breaks when there are html tags in markdown. Instead we can
use `md_to_html` directly.
 2020-07-15 14:46:39 +05:30
Suraj Shetty
67aca7c9ad fix: Update modified value for dashboard 2020-07-15 14:45:00 +05:30
prssanna
3c7b9f9986 fix: remove unused import 2020-07-15 14:32:11 +05:30
prssanna
fc9401fb1a fix: allow rename for dashboard chart and number card 2020-07-15 14:32:11 +05:30
prssanna
e6a986559e fix(patch): create new docs for customized standard dashboards 2020-07-15 14:31:26 +05:30
Chinmay Pai
cc96a3f09c
Merge pull request #11006 from scmmishra/fix-desk-rtl 2020-07-15 14:26:16 +05:30
Suraj Shetty
72615449db fix: Use import_file_by_path to sync dashboard 2020-07-15 14:19:51 +05:30
rohitwaghchaure
b45a8e7660
Merge pull request #11008 from rohitwaghchaure/fixed-patch-replace-old-data-import 
fix: replace_old_data_import patch failing
 2020-07-15 14:17:48 +05:30
Shivam Mishra
5ce6940aa6
feat: reset driver on hash change (#11005) 2020-07-15 14:05:12 +05:30
Rohit Waghchaure
43a8a7c71c fix: replace_old_data_import patch failing 2020-07-15 14:02:54 +05:30
Suraj Shetty
84a5e0a983 Merge branch 'sync-dashboards' of github.com:prssanna/frappe into sync-dashboards 2020-07-15 13:32:09 +05:30
Suraj Shetty
13a1bda364 fix: Strip HTML from notification subject 2020-07-15 13:15:12 +05:30
Shivam Mishra
52f2b944ff fix: rtl layout for desk 2020-07-15 13:08:59 +05:30
Faris Ansari
e0545099fc
Merge pull request #10990 from netchampfaris/dib-fixes-2020-07-14 2020-07-15 11:43:42 +05:30
prssanna
6eab1091b0 fix: set dynamic filter value in dialog 2020-07-14 19:16:29 +05:30
mergify[bot]
2c286e0a46
Merge pull request #10992 from surajshetty3416/fix-pdf-format 
fix(pdf): Use non-pretty version of HTML for pdf generation
 2020-07-14 12:19:22 +00:00
Suraj Shetty
49aba26696 fix: Use non-pretty version of HTML for pdf generation 2020-07-14 16:36:24 +05:30
mergify[bot]
e3fd051fbf
Merge pull request #10988 from surajshetty3416/fix-assign-patch 
fix(patch): Ignore cancelled ToDos while setting _assign
 2020-07-14 08:31:59 +00:00
Faris Ansari
2e4ac0515c fix: Handle parsed date values 2020-07-14 13:54:39 +05:30
Suraj Shetty
684250fb53
Merge branch 'develop' into fix-assign-patch 2020-07-14 13:46:33 +05:30
Abhishek Balam
8a747eec27
fix: Move checkbox from Print Settings to System Settings (#10905) 2020-07-14 13:45:44 +05:30
Faris Ansari
f17b8a95dc fix: Child row docs must have blank parent values 2020-07-14 12:41:17 +05:30
Michelle Alva
44b61d66fa
fix: Add Global Defaults under Core in Settings (#10989) 
* fix: Add Global Defaults under Settings

* fix: add changes in desk page
 2020-07-14 10:51:14 +05:30
mergify[bot]
1c6a64b2c6
Merge pull request #10986 from gavindsouza/unsaved-for-singles 
fix: dont set '__unsaved' for single doctypes
 2020-07-13 16:44:52 +00:00
Suraj Shetty
21277403a7 fix: Re-run fixed patch 2020-07-13 22:11:15 +05:30
Suraj Shetty
448c2f4e3f fix(patch): Ignore cancelled ToDos while setting _assign 2020-07-13 22:05:54 +05:30
Gavin D'souza
90cab5a2aa fix: dont set '__unsaved' for single doctypes 2020-07-13 17:42:23 +05:30
Faris Ansari
2ca691feed
Merge pull request #10982 from netchampfaris/image-with-blur-width-height 
fix(image-with-blur): Set width, height in CSS
 2020-07-13 16:26:28 +05:30
mergify[bot]
04516c8dd9
Merge pull request #10734 from Thunderbottom/cookie-stonks 
fix: make cookies more secure
 2020-07-13 10:20:16 +00:00
mergify[bot]
6ffb6174db
Merge pull request #10983 from netchampfaris/data-import-patch-fix 
fix: Better check to skip patch
 2020-07-13 10:00:40 +00:00
Suraj Shetty
05ccc8f135
fix: Properly retain whitespace sequence (#10984) 2020-07-13 15:15:08 +05:30
Faris Ansari
cb7bea27ea fix(image-with-blur): Set width, height in CSS 2020-07-13 13:31:52 +05:30
Faris Ansari
a871934f68 fix: Better check to skip patch 2020-07-13 13:11:49 +05:30