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

1725 commits

Author SHA1 Message Date
mergify[bot]
4a56ae4557 Merge pull request #10248 from ruchamahabal/duration-control 
feat: Duration Control
 2020-05-27 06:53:46 +00:00
Rucha Mahabal
1078b0e2da fix(print preview): add formatter for duration fieldtype 2020-05-23 21:48:47 +05:30
Gavin D'souza
fd9fd7c940 fix: backwards compatible verbose flag 2020-05-22 12:12:14 +05:30
mergify[bot]
a2550faa0f
Merge pull request #10232 from scmmishra/web-analytics-report 
feat: Website module enhancements
 2020-05-22 04:51:25 +00:00
mergify[bot]
c706870977
Merge pull request #10447 from saurabh6790/fix-return-value-for-flt 
fix: default return value for flt
 2020-05-21 13:28:37 +00:00
Saurabh
895ffc3fec fix: default return value for flt 2020-05-21 18:22:32 +05:30
Aditya Hase
33a52fcff2 fix(background-jobs): Include traceback in error logs 2020-05-21 10:28:45 +05:30
mergify[bot]
98050bc6b7
Merge pull request #10371 from scmmishra/web-page-builder-enhancements 
fix: Web page builder enhancements
 2020-05-20 18:27:36 +00:00
Shivam Mishra
2328fe5aa3 style: linting fixes from sider 2020-05-20 19:07:05 +05:30
Gavin D'souza
716ae57b29 style: sort imports and spacing 2020-05-20 18:01:32 +05:30
Gavin D'souza
931e35b554 fix: handle verbose kwarg in BackupGenerator 2020-05-20 17:59:08 +05:30
Faris Ansari
2f5ff98240 fix: web_blocks global method to render web blocks 2020-05-20 16:35:23 +05:30
Gavin D'souza
f3ccdd9ebc fix: dont convert from md if html 2020-05-20 13:18:19 +05:30
Shivam Mishra
eef38a1802
fix: layout for new version available dialog (#10389) 2020-05-18 23:24:15 +05:30
Shivam Mishra
c615767aec style: remove unused imports 2020-05-18 13:49:12 +05:30
mergify[bot]
5e744a8c7a
Merge pull request #9692 from hrwX/cust_export 
feat(Package): Export and Import Customizations in Packages
 2020-05-15 12:36:24 +00:00
Faris Ansari
ce734e88e5
Merge branch 'develop' into migrate-to 2020-05-15 15:34:03 +05:30
Gavin D'souza
ed344ae8cf chore: updated docstrings for command APIs 2020-05-15 12:11:05 +05:30
Gavin D'souza
85d86fbedf refactor: moved remote_migrations to 
frappe.integrations.frappe_providers

fix: exit code fixes and minor bug fix
 2020-05-15 11:21:24 +05:30
mergify[bot]
b15f2844f1
Merge pull request #9934 from Thunderbottom/bench-ux-fix 
feat: show message on migrate when services are not running
 2020-05-14 17:06:22 +00:00
mergify[bot]
1a523b24c3
Merge pull request #10193 from prssanna/heatmap-chart 
feat: Heatmap type Dashboard Charts
 2020-05-14 12:27:12 +00:00
Gavin D'souza
8df9cb6bed chore: optimize imports, style fixes 2020-05-14 17:09:27 +05:30
Gavin D'souza
3fcc15685a fix: dont show any output unless verbose set 2020-05-14 13:13:29 +05:30
Gavin D'souza
a48c24e4bf chore: consistent functions used for inputs, removed unused imports 2020-05-14 13:01:46 +05:30
Gavin D'souza
637409095c fix: simplyify and segregate migrator utils 2020-05-14 12:24:00 +05:30
Shivam Mishra
8de7f7602e refactor: replace pandas date range with native function 2020-05-13 19:56:16 +05:30
Shivam Mishra
218e945b26 feat: add get_last_day_of_week function 2020-05-13 19:56:00 +05:30
Gavin D'souza
e559e30d02 refactor(migrate-to): code restructure and bug fixes 2020-05-13 19:45:19 +05:30
Himanshu Warekar
1cde88949c Merge branch 'develop' of https://github.com/frappe/frappe into cust_export 2020-05-13 15:46:01 +05:30
mergify[bot]
7065d2dc51
Merge pull request #10242 from hrwX/website_search_fix 
fix(Website Search): Remove exact phrase search
 2020-05-13 06:56:02 +00:00
Himanshu Warekar
a70bc3dbb6 Merge branch 'develop' of https://github.com/frappe/frappe into cust_export 2020-05-13 11:41:49 +05:30
Shivam Mishra
0ff0e1f7d0 Merge branch 'develop' of github.com:frappe/frappe into web-analytics-report 2020-05-12 17:00:19 +05:30
Himanshu Warekar
209d27047a Merge branch 'develop' of https://github.com/frappe/frappe into website_search_fix 2020-05-12 16:18:50 +05:30
Faris Ansari
efa02b74f3
Merge branch 'develop' into remove-tailwind-page-builder 2020-05-12 15:21:58 +05:30
Chinmay Pai
e527191975
fix: do not setup charts if not setup_complete (#10282) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-11 19:55:51 +05:30
Faris Ansari
7a87be29c4 fix: Remove components 
- Use render_template to render web_block and image_with_blur
 2020-05-11 16:28:29 +05:30
gavin
d902699695
fix: handle invalid date parsing (#10273) 
* fix: handle invalid date parsing

* chore: combine invalid date strings function

* chore: rename api to conform with convention
 2020-05-11 10:37:57 +00:00
Gavin D'souza
451772dfab refactor(commands): migrate-to frappecloud connector 2020-05-11 15:47:19 +05:30
Chinmay Pai
9cdcf56288
Merge branch 'develop' into bench-ux-fix 2020-05-10 15:43:56 +05:30
prssanna
31a523a720 feat: add year filter to heatmap charts 2020-05-08 18:33:23 +05:30
Shivam Mishra
ba18500c39 Merge branch 'develop' of github.com:frappe/frappe into web-analytics-report 2020-05-08 18:19:01 +05:30
Suraj Shetty
2b8ee1d159
Merge branch 'develop' into comment-xss 2020-05-08 14:23:42 +05:30
Rohit Waghchaure
198041a5ef fix: dashboard sync issue 2020-05-08 03:54:39 +05:30
Shivam Mishra
ec38380c91 Merge branch 'develop' of github.com:frappe/frappe into web-analytics-report 2020-05-07 19:10:56 +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
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