Faris Ansari
a2a697b4d5
fix: Remove theme based_on from Website Theme
2020-05-09 15:38:08 +05:30
mergify[bot]
bd4828965b
Merge pull request #10123 from Monogramm/fix/socketio_port
...
fix: socketio default port
2020-05-09 07:23:20 +00:00
mathieu.brunot
cf200c195e
socketio_port default to null
...
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2020-05-08 20:43:52 +02:00
sahil28297
b2aadf626c
Merge pull request #10276 from Thunderbottom/backup-fix
...
fix: use doctype instead of service name to send email
2020-05-08 21:41:23 +05:30
Chinmay D. Pai
9b6f0a2e4c
fix: use doctype instead of service name to send email
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-08 20:18:08 +05:30
Prssanna Desai
25884d2370
fix: Linking of doctype from links table ( #10267 )
...
* fix: fix linking of doctype from links table
* fix: use frappe._dict
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-05-08 09:59:29 +00:00
mergify[bot]
3813aa9287
Merge pull request #10268 from rmehta/fix-link-grouping
...
fix(meta): In add_doctype_links, use frappe._dict
2020-05-08 09:34:48 +00:00
Suraj Shetty
33037a9f95
Merge pull request #10251 from scmmishra/number-card-naming
2020-05-08 15:01:45 +05:30
mergify[bot]
a1539eafca
Merge pull request #10249 from Thunderbottom/comment-xss
...
fix: sanitize comment content before saving
2020-05-08 09:22:31 +00:00
mergify[bot]
8c2cd69767
Merge pull request #10266 from frappe/sahil28297-patch-1
...
fix: bump frappe develop to version 13-dev
2020-05-08 09:19:38 +00:00
mergify[bot]
adf56260c3
Merge pull request #10269 from Mangesh-Khairnar/fix-reviews-section
...
fix: remove reviews label on disabling energy points settings
2020-05-08 08:58:14 +00:00
Suraj Shetty
98a6ac8ec1
Merge pull request #10234 from deepeshgarg007/energy_point_revert_perm
2020-05-08 14:25:46 +05:30
Suraj Shetty
2b8ee1d159
Merge branch 'develop' into comment-xss
2020-05-08 14:23:42 +05:30
Suraj Shetty
38c840a07f
Merge branch 'develop' into fix-link-grouping
2020-05-08 14:19:05 +05:30
Suraj Shetty
df3acd737d
Merge branch 'develop' into sahil28297-patch-1
2020-05-08 14:16:11 +05:30
Suraj Shetty
e5434d471c
Merge branch 'develop' into fix-reviews-section
2020-05-08 14:13:18 +05:30
Suraj Shetty
cc7d89eb2c
Merge pull request #10254 from surajshetty3416/replace-trusty-with-xenial
2020-05-08 14:11:52 +05:30
Suraj Shetty
3ae2c1294d
test: Remove unwanted test and fix permission test
2020-05-08 13:55:56 +05:30
Rushabh Mehta
9724cc273a
fix(minor): In add_doctype_links, use frappe._dict
2020-05-08 12:33:25 +05:30
Mangesh-Khairnar
bae02075d6
fix: remove reviews label on disabling energy points settings
2020-05-08 12:30:52 +05:30
sahil28297
aae45ed98c
fix: bump frappe develop to version 13-dev
2020-05-08 12:18:09 +05:30
Shivam Mishra
e5a1b2239c
Merge pull request #10265 from rohitwaghchaure/fixed-no-module-name-number-cards
...
fix: dashboard sync issue
2020-05-08 11:34:00 +05:30
Suraj Shetty
3296687178
chore: Use python 3.7
2020-05-08 11:00:03 +05:30
Rohit Waghchaure
198041a5ef
fix: dashboard sync issue
2020-05-08 03:54:39 +05:30
Suraj Shetty
a7ba5c9eb0
chore: Try Bionic
2020-05-07 22:26:07 +05:30
Shivam Mishra
97d723606e
Merge branch 'develop' of github.com:frappe/frappe into number-card-naming
2020-05-07 19:03:35 +05:30
Shivam Mishra
0a1aa03bec
Merge pull request #10247 from scmmishra/sync-dashboards
...
feat: sync dashboards
2020-05-07 19:02:39 +05:30
sahil28297
4071176e26
Merge pull request #10118 from Thunderbottom/sanitize-search
...
fix: sanitize input before displaying search results
2020-05-07 18:01:41 +05:30
Suraj Shetty
8f9cfcb55d
chore: Use xenial distribution
2020-05-06 21:42:05 +05:30
Shivam Mishra
192ab2a836
refactor: use autoname
2020-05-06 19:51:13 +05:30
Shivam Mishra
b5d88e42ee
feat: autoname based on label
2020-05-06 19:02:56 +05:30
Shivam Mishra
7dbf38e3ee
feat: prompt user for name
2020-05-06 19:02:48 +05:30
Marica
ea0b10d1a7
fix: navigation issue for quick entry in onboarding ( #10250 )
...
* fix: Sucess Dialog shows up multiple times
* fix: Remove console statements
2020-05-06 17:30:34 +05:30
Shivam Mishra
961fbf6594
feat: sync number cards
2020-05-06 17:26:28 +05:30
Shivam Mishra
213b0a2288
style: remove unused import
2020-05-06 16:50:44 +05:30
Shivam Mishra
7df3d2e585
fix: sync number cards before dashbaords
2020-05-06 16:47:27 +05:30
Shivam Mishra
61d07941b8
feat: allow number cards in sync
2020-05-06 16:46:49 +05:30
Chinmay D. Pai
0caf571fa8
fix: do not sanitize if no html is found
...
return default string if no html tags are found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-06 16:00:51 +05:30
Chinmay D. Pai
fffa3d5114
fix: sanitize comment content before saving
...
comments are handled fine while being created from the frontend, but
when comments are made through a POST request, there's a chance of
rendering javascript in the comment, since there's no way to sanitize
the input on the server side.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-06 15:47:54 +05:30
Shivam Mishra
db152b28de
feat: sync dashboards after setup and migrate
2020-05-06 14:45:07 +05:30
Shivam Mishra
52eee67217
feat: added sync dashboard utility
2020-05-06 14:44:41 +05:30
Shivam Mishra
d62706620f
Merge pull request #10238 from scmmishra/chart-widget-color
...
fix: default light blue color for charts
2020-05-06 13:59:20 +05:30
Shivam Mishra
0ff51a257d
refactor: move dashboard utilities to frappe.utils
2020-05-06 13:18:02 +05:30
mergify[bot]
75f6fa6b17
Merge pull request #10111 from prssanna/setup-search
...
feat: add search box to filter dialog and column picker dialog
2020-05-05 17:18:56 +00:00
Shivam Mishra
04d79001f6
fix: default light blue color for charts
2020-05-05 22:37:35 +05:30
Deepesh Garg
e4dbbfd13f
fix: Ignore energy point log perm on doc cancel
2020-05-05 19:24:34 +05:30
mergify[bot]
cc36d7d8cb
Merge pull request #10230 from prssanna/text-editor-fix
...
fix: replace font tag with span in quill editor
2020-05-05 12:39:36 +00:00
gavin
3af2af2f27
Merge pull request #10231 from gavindsouza/broken-site
...
fix(new-site): broken site if redis is not running
2020-05-05 15:17:11 +05:30
Suraj Shetty
5c8dde1deb
Merge branch 'develop' into setup-search
2020-05-05 14:40:30 +05:30
mergify[bot]
78f174f342
Merge pull request #10226 from prssanna/charts-permission-fix
...
fix: only encode if type is not str while getting allowed reports
2020-05-05 07:56:48 +00:00
