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

25206 commits

This branch
This branch
All branches
Author SHA1 Message Date
Abhishek Balam
c16c7fb121 fix typo 'Send Attachements' in Newsletter 2020-05-12 18:23:57 +05:30
mergify[bot]
3db2754b6f
Merge pull request #10290 from netchampfaris/remove-tailwind-page-builder 
fix: Remove Tailwind from Page Builder
 2020-05-12 11:00:27 +00:00
Faris Ansari
efa02b74f3
Merge branch 'develop' into remove-tailwind-page-builder 2020-05-12 15:21:58 +05:30
mergify[bot]
4ff23172cd
Merge pull request #10204 from frappe/snyk-fix-1b018faa364b5dc0e26502cba6099d54 
[Snyk] Fix for 1 vulnerabilities
 2020-05-12 09:23:57 +00:00
Gavin D'souza
946c9e0672 chore: update yarn.lock 2020-05-12 13:00:55 +05:30
Gavin D'souza
cdee2b1673 Merge branch 'develop' of github.com:frappe/frappe into snyk-fix-1b018faa364b5dc0e26502cba6099d54 2020-05-12 13:00:01 +05:30
gavin
e72412b13e
Merge pull request #10295 from frappe/dependabot/pip/markdown2-2.3.9 
chore(deps): [security] bump markdown2 from 2.3.8 to 2.3.9
 2020-05-12 12:24:08 +05:30
Shivam Mishra
06cb560a51 feat: allow body color override 2020-05-12 11:12:10 +05:30
dependabot-preview[bot]
1ed4ebe0fd
chore(deps): [security] bump markdown2 from 2.3.8 to 2.3.9 
Bumps [markdown2](https://github.com/trentm/python-markdown2) from 2.3.8 to 2.3.9. **This update includes a security fix.**
- [Release notes](https://github.com/trentm/python-markdown2/releases)
- [Changelog](https://github.com/trentm/python-markdown2/blob/master/CHANGES.md)
- [Commits](https://github.com/trentm/python-markdown2/compare/2.3.8...2.3.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-12 00:33:33 +00:00
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
1166ae6e04 chore: Install node-sass for website theme test 2020-05-11 17:04:29 +05:30
Faris Ansari
e5c723d4f5 test: Fix Exporter tests 2020-05-11 17:00:58 +05:30
Faris Ansari
218cf41ec4 fix: Stylelint issues 2020-05-11 16:56:58 +05:30
Faris Ansari
30b64c304f chore: Install node requirements in UI tests 2020-05-11 16:45:03 +05:30
Faris Ansari
5b54cba2cb fix: Remove all traces of Tailwind from codebase😢 2020-05-11 16:44:45 +05:30
Faris Ansari
4f8548d0ab fix: Delete unused web templates 
- Also Patch
 2020-05-11 16:28:57 +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
Faris Ansari
19c3352d86 fix: Use new google font api 2020-05-11 16:03:38 +05:30
Faris Ansari
58a85426d4 fix: Revert custom css fields 2020-05-11 16:03:17 +05:30
Faris Ansari
b119b7f6ad fix: Website Settings 
- Navbar Call to Action
- Footer Logo
 2020-05-11 16:00:35 +05:30
Faris Ansari
8c1d6ebe26 fix: Separate fields for Top and Bottom Padding 2020-05-11 15:59:34 +05:30
Faris Ansari
262078dd7f feat: Support Icon in Top Bar Item 2020-05-11 15:58:50 +05:30
Faris Ansari
55e966da27 fix: Revert base templates 2020-05-11 15:58:21 +05:30
Faris Ansari
850848f20b fix: Navbar 
- CTA button
- Unique id for every dropdown
 2020-05-11 15:57:51 +05:30
Faris Ansari
fcf9c9d139 fix: Separate footer group links with normal links 
- Add icon for footer item
- Obey "Right" value for footer item
 2020-05-11 15:54:22 +05:30
Faris Ansari
355393ed0a fix: Port Tailwind styles to Bootstrap 4 SCSS 2020-05-11 15:53:29 +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
Faris Ansari
e0510e2e06 fix: Navbar 2020-05-09 15:38:27 +05:30
Faris Ansari
a2a697b4d5 fix: Remove theme based_on from Website Theme 2020-05-09 15:38:08 +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
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
Suraj Shetty
abc2ec1496
Merge branch 'develop' into snyk-fix-1b018faa364b5dc0e26502cba6099d54 2020-05-08 14:53:05 +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