Commit graph

181 commits

Author SHA1 Message Date
Rushabh Mehta
ff71329b03 fix(merge): develop 2020-12-02 10:54:10 +05:30
Snyk bot
a459ce40ed
fix(snyk): Security upgrade highlight.js from 9.18.1 to 9.18.2 (#11999)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HIGHLIGHTJS-1045326
2020-11-26 09:11:01 +05:30
Snyk bot
1154cc931f
fix(Snyk): Security upgrade snyk from 1.398.1 to 1.425.4 (#11990)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-Y18N-1021887
2020-11-25 10:59:34 +05:30
Suraj Shetty
b5d9c1e816 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-11-06 10:42:37 +05:30
sezanzeb
429cbb17eb chore: github shorthand for air-datepicker 2020-10-21 13:39:11 +02:00
sezanzeb
8906c1eba4 chore: git url format for air-datepicker 2020-10-21 12:57:37 +02:00
Shivam Mishra
9e39a7464a Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-10-21 11:55:13 +05:30
prssanna
2f890c1391 chore: update datatable to 1.15.3 2020-10-20 16:51:01 +05:30
Shivam Mishra
3f64bec4b9 feat: add Plyr 2020-10-15 13:55:19 +05:30
Gavin D'souza
40ee03c21d Merge branch 'develop' of github.com:frappe/frappe into move-cypress 2020-10-12 17:32:16 +05:30
Suraj Shetty
2f4f5dd4ad refactor: Re-organize scss
Co-Authored-By: Shivam Mishra <scm.mymail@gmail.com>
Co-Authored-By: Faris Ansari <netchamp.faris@gmail.com>
Co-Authored-By: Prssanna Desai <prssud@gmail.com>
2020-10-01 13:49:17 +05:30
Suraj Shetty
ba29d8d8b4 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-10-01 13:10:37 +05:30
Gavin D'souza
436ebde0ec fix: yarn upgrade node-sass 2020-09-24 15:13:43 +05:30
barredterra
7fe2b356ec Merge branch 'develop' into website_theme_hook 2020-09-18 13:30:07 +02:00
Snyk bot
d08fc9e2c1
[Snyk] Fix for 1 vulnerabilities (#11523)
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-09-17 10:00:48 +05:30
Snyk bot
8e9b1805e8
fix(security):[Snyk] 1 vulnerabilities (#11507)
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-09-16 08:45:54 +05:30
Rushabh Mehta
b09c1ef179
Merge pull request #11220 from revant/fix-node-sass
fix: move node-sass to dependencies from devDependencies
2020-09-15 11:08:29 +05:30
Gavin D'souza
8cc1636a8c fix: Install Cypress only if running UI tests 2020-09-14 17:01:18 +05:30
barredterra
735788370a Merge branch 'develop' into website_theme_hook 2020-09-10 14:50:49 +02:00
barredterra
0139de6c4e tests: create and update test cases 2020-08-28 14:48:01 +02:00
barredterra
8398b8b6d8 feat: add autoprefixer 2020-08-27 18:11:29 +02:00
Suraj Shetty
7035eff6e3 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-27 19:32:57 +05:30
Gavin D'souza
f8dcc60bb6 chore: frappe.io => frappeframework.com 2020-08-26 17:32:58 +05:30
Suraj Shetty
0c929a4435 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-25 14:34:31 +05:30
snyk-bot
c12668ecbf fix: package.json, yarn.lock & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-08-24 23:07:36 +00:00
Revant Nandgaonkar
6a2248eef3 fix: move node-sass to dependencies from devDependencies
node-sass is required in production for Website Theme
yarn --prod will install only dependencies and reduce size

fixes #11219
2020-08-07 20:12:33 +05:30
Suraj Shetty
94a81f17c4
Merge branch 'develop' into resize-image-editor 2020-08-04 17:55:03 +05:30
Suraj Shetty
886cc8913c Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-07-18 17:15:36 +05:30
Shivam Mishra
241062aa0b feat: update frappe charts 2020-07-07 23:22:09 +05:30
Suraj Shetty
5e8422ae42 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-07-06 13:19:59 +05:30
Ronel Cabrera
26063d88a2 feat(controls/text_editor): resize image for markdown editor 2020-06-26 13:28:02 +08:00
Suraj Shetty
19e38502c1
Merge branch 'develop' into fix-text-editor-issues 2020-06-22 17:10:51 +05:30
Faris Ansari
49d6d54a24 fix: Gantt
- Update gantt to 0.5.0
- Move gantt styles to gantt.less
- Remove local lib files and use from node_modules
2020-06-19 18:38:03 +05:30
Suraj Shetty
74db2ef88b fix: Update quill editor 2020-06-06 10:47:23 +05:30
Suraj Shetty
4b83f29a98 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-05-26 00:38:03 +05:30
Shivam Mishra
26ef8fc034 Merge branch 'develop' of github.com:frappe/frappe into onboarding-enhancements 2020-05-12 19:45:59 +05:30
Faris Ansari
efa02b74f3
Merge branch 'develop' into remove-tailwind-page-builder 2020-05-12 15:21:58 +05:30
Faris Ansari
5b54cba2cb fix: Remove all traces of Tailwind from codebase😢 2020-05-11 16:44:45 +05:30
Suraj Shetty
8caa480dba chore: Update node-sass 2020-05-11 14:01:13 +05:30
Shivam Mishra
be27513a56 feat: added driver.js with style overrides 2020-05-11 12:09:54 +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
snyk-bot
d11463dfd6 fix: .snyk & package.json to reduce vulnerabilities
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
2020-05-01 04:32:35 +05:30
Shivam Mishra
a32f718647 chore: update frappe charts 2020-04-30 15:16:01 +05:30
Faris Ansari
f7109d6294 Merge branch 'develop' of https://github.com/frappe/frappe into page-builder-tailwind-blurred-images 2020-04-25 19:52:17 +05:30
Suraj Shetty
2ed8cacd2f chore: Use chrome browser for test
- Remove unused cypress:run command from package.json
2020-04-25 12:52:14 +05:30
Suraj Shetty
cbaa3b2f8e chore: Use chrome browser for test 2020-04-25 11:48:26 +05:30
Suraj Shetty
22f4a074cf chore: Update cypress
- To leverage testing performance enhancements made in cypress v3.3.0

https://www.cypress.io/blog/2019/05/22/how-we-improved-network-speed-by-300-in-cypress-3-3-0/
2020-04-23 14:41:50 +05:30
Faris Ansari
42c5a1a572 fix: Update tailwind to 1.3.x 2020-04-21 16:49:41 +05:30
Faris Ansari
6ac3fe4ed7 chore: Add postcss-nested plugin 2020-04-19 16:17:41 +05:30