Suraj Shetty
|
02954c3cd7
|
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
|
2020-05-11 08:57:36 +05:30 |
|
mergify[bot]
|
f5f3ed4488
|
Merge pull request #10274 from prssanna/links-fix
fix(Document Link): Error when group is set in link
|
2020-05-10 18:49:54 +00:00 |
|
mergify[bot]
|
30e2fc77df
|
Merge pull request #10272 from adityahase/perf-recorder
perf(recorder): Don't store context (code) and frame locals
|
2020-05-10 07:10:46 +00:00 |
|
mergify[bot]
|
9dd38eccdd
|
Merge pull request #10223 from sagarvora/ipython
chore: Update ipython compatible with python 3.8
|
2020-05-10 03:50:13 +00:00 |
|
mergify[bot]
|
d5fde2a500
|
Merge pull request #10252 from prssanna/export-columns-fix
fix: Report column headers not being exported
|
2020-05-10 03:15:30 +00:00 |
|
Suraj Shetty
|
94e957a284
|
Merge branch 'develop' into ipython
|
2020-05-10 08:39:03 +05:30 |
|
Suraj Shetty
|
95cc874052
|
Merge branch 'develop' into ipython
|
2020-05-10 08:36:16 +05:30 |
|
Suraj Shetty
|
7eff236df1
|
refactor: Init navbar rewrite
|
2020-05-09 13:57:47 +05:30 |
|
Suraj Shetty
|
ecfa933277
|
feat: Add global.scss & use scss for new ui
|
2020-05-09 13:55:49 +05:30 |
|
Suraj Shetty
|
72eb28722a
|
Merge branch 'develop' into export-columns-fix
|
2020-05-09 12:58:13 +05:30 |
|
Suraj Shetty
|
6e474efbea
|
Merge branch 'develop' into links-fix
|
2020-05-09 12:56:03 +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 |
|
Suraj Shetty
|
666929865f
|
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui
|
2020-05-08 16:27:07 +05:30 |
|
prssanna
|
4508c6be99
|
fix: fix error when group is set in link
|
2020-05-08 15:43:56 +05:30 |
|
Aditya Hase
|
cb294329ad
|
style: Black + Flake8
|
2020-05-08 15:35:53 +05:30 |
|
Aditya Hase
|
95f3add3d3
|
chore(requirements): Remove Pygments from requirements.txt
|
2020-05-08 15:35:28 +05:30 |
|
Aditya Hase
|
2ed69034cb
|
perf(recorder): Don't store context (code) and frame locals
|
2020-05-08 15:34:55 +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
|
88ec1f1d62
|
Merge branch 'develop' into export-columns-fix
|
2020-05-08 14:24:02 +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 |
|
Suraj Shetty
|
cd7fd2f31d
|
chore: Use bootstrap CSS from website.scss
|
2020-05-08 10:18:08 +05:30 |
|
Suraj Shetty
|
4aecae1ce9
|
feat: Add color variables
|
2020-05-08 10:17:13 +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
|
db943b1002
|
chore: Remove popper dependency
- Use bootstrap bundle instead
|
2020-05-07 14:43:09 +05:30 |
|
Suraj Shetty
|
7e180546fb
|
feat: Use Bootstrap 4
|
2020-05-07 12:30:03 +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 |
|