Commit graph

236 commits

Author SHA1 Message Date
Suraj Shetty
4d435e271e
Merge branch 'develop' into coverage 2021-09-30 23:11:26 +05:30
MitulDavid
d8d8c8e54e ci: Code coverage for JS files 2021-09-20 21:11:47 +05:30
Snyk bot
104b903748
fix: package.json & yarn.lock to reduce vulnerabilities (#14175)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908
2021-09-14 14:24:46 +05:30
Shariq Ansari
7caae74004
build: Update datatable to 1.15.4 (#14016)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-24 10:15:37 +05:30
mergify[bot]
bd6ed2033f
Merge pull request #13152 from shariquerik/wiki-based-desk
feat: Workspace 2.0
2021-08-13 06:44:32 +00:00
Saqib Ansari
e742719c56 Merge branch 'develop' of https://github.com/frappe/frappe into frappe-scanner 2021-08-10 19:46:05 +05:30
Shariq Ansari
1ab70d2145
Merge branch 'frappe:develop' into wiki-based-desk 2021-08-10 12:20:08 +05:30
Saqib Ansari
0cf2fd9b5c Merge branch 'frappe-scanner' of https://github.com/netchampfaris/frappe into frappe-scanner 2021-08-09 14:02:37 +05:30
Mitul David
fa6e26f5e1
Merge branch 'develop' into image-processing 2021-08-05 16:41:00 +05:30
Shariq Ansari
cec1de0389
Merge branch 'frappe:develop' into wiki-based-desk 2021-08-05 11:30:18 +05:30
Faris Ansari
bbcead50c1 feat: frappe.ui.Scanner
- Uses https://github.com/mebjas/html5-qrcode
- Supports a number of different formats including barcodes and qrcodes
- Simple and generic API
2021-08-04 15:40:54 +05:30
Snyk bot
3fa9b42f26
chre(Snyk): Security upgrade snyk from 1.520.0 to 1.667.0 (#13790)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-04 13:33:07 +05:30
shariquerik
84f195ca19 fix: Resolved Conflicts 2021-08-03 17:53:14 +05:30
MitulDavid
47ac923b3e feat: Image cropping 2021-08-02 18:22:44 +05:30
Suraj Shetty
40dd522796 feat: Auto generate RTL styles using rtlcss
https://github.com/MohammadYounes/rtlcss
2021-06-25 13:06:09 +05:30
shariquerik
398e591ad1 fix: Removed unused libraries & fixed yarn.lock file 2021-06-22 20:44:35 +05:30
Shariq Ansari
c7ee966acc
Merge branch 'develop' into wiki-based-desk 2021-06-22 18:17:47 +05:30
Suraj Shetty
3b0b147847
Merge pull request #13468 from leela/clickable-urls-in-texteditor 2021-06-14 10:05:45 +05:30
gavin
0ba9cd4ca5
Merge pull request #13405 from frappe/dependabot/npm_and_yarn/jquery-3.5.0
chore(deps): [security] bump jquery from 2.2.4 to 3.5.0
2021-06-11 16:37:52 +05:30
leela
e534dc0a02 feat: Make url's clickable in text editor when typed/copied
Using a Quill module named quill-magic-url to automatically convert
typed/copied urls into links.
2021-06-10 21:30:53 +05:30
dependabot-preview[bot]
14a1b7f4ac
chore(deps): [security] bump jquery from 2.2.4 to 3.5.0
Bumps [jquery](https://github.com/jquery/jquery) from 2.2.4 to 3.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/2.2.4...3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-10 11:13:37 +00:00
snyk-bot
d7d0ddf6ad
fix: package.json & yarn.lock to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NORMALIZEURL-1296539
2021-05-26 02:54:04 +00:00
Shariq Ansari
8165961343
Merge branch 'develop' into wiki-based-desk 2021-05-25 21:20:06 +05:30
shariquerik
3112d6d843 fix: Sidebar Child Item Draggable & minor fixes 2021-05-25 20:42:55 +05:30
Faris Ansari
4b39f7f699 fix: Print rebuilt files in watch mode 2021-05-16 11:13:54 +05:30
Faris Ansari
9000d86681 fix: Pin node version to 14 in package.json
- Install node 14 in CI
2021-05-07 12:33:34 +05:30
Faris Ansari
dacd0bf107 fix: Remove rollup code and unused dependencies 2021-05-04 07:06:26 +05:30
shariquerik
902676ffb3 feat: Wiki based desk page 2021-05-02 16:15:03 +05:30
Faris Ansari
adc236e35d feat: Notify build events to browser
- Update assets_json directly from node
- Show error overlay or success message
- Open file in editor from error overlay
2021-05-01 16:02:49 +05:30
Faris Ansari
86c0f7f9d6 fix: Use yargs for cli argument parsing 2021-05-01 15:50:03 +05:30
Faris Ansari
aac5423600 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-04-29 13:58:27 +05:30
dependabot[bot]
43285fd2d8
chore(deps): bump redis from 2.8.0 to 3.1.1
Bumps [redis](https://github.com/NodeRedis/node-redis) from 2.8.0 to 3.1.1.
- [Release notes](https://github.com/NodeRedis/node-redis/releases)
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-27 17:16:25 +00:00
Faris Ansari
09f5e904a9 fix: Pretty CLI Output 2021-04-24 20:05:10 +05:30
Faris Ansari
c119f9ab3c fix: libs.bundle.js
- Separate file to import jquery and bootstrap
- Remove separate jquery bundle from app as well as web
- Load jquery from node_modules
2021-04-24 14:42:43 +05:30
Faris Ansari
226ad1d91a feat: New Build System based on esbuild
- Deprecate use of build.json
- *.bundle.js files placed anywhere in the public folder are bundled
- Built files are created in public/build folder which is gitignored

WIP
2021-04-22 07:01:36 +05:30
Suraj Shetty
c16584bbf1
chore: Upgrade frappe-charts to rc13 (#12896) 2021-04-19 10:45:54 +05:30
Sagar Vora
fd88e7e1dd fix: change package name to frappe-framework 2021-04-02 16:07:17 +05:30
Snyk bot
3cd4e33469
chore(Snyk): Security upgrade snyk from 1.509.0 to 1.518.0 (#12753)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NETMASK-1089716
2021-04-01 08:34:58 +05:30
Snyk bot
98b1b5be97
chore(Snyk): Security upgrade snyk from 1.431.1 to 1.465.0 (#12653)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-HOSTEDGITINFO-1088355
2021-03-24 10:16:01 +05:30
Suraj Shetty
19a092feec
chore: Update frappe-charts (#12617) 2021-03-19 14:24:57 +05:30
prssanna
89b9c29802 chore: update frappe charts 2021-03-10 18:14:52 +05:30
Suraj Shetty
91176153a2
revert: "fix: Memory limit for watch command" (#12493) 2021-02-25 20:37:12 +05:30
mergify[bot]
49931f8d63
Merge pull request #12377 from CaseSolvedUK/develop
fix: Memory limit for watch command
2021-02-24 11:52:18 +00:00
prssanna
6c490f44e4 feat: replace localStorage with localforage for storing drafts 2021-02-17 19:04:13 +05:30
Richard Case
0c4a18a09c fix: bench watch: FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory 2021-02-14 22:43:28 +00:00
Suraj Shetty
1cdca0c07e chore: Bump frappe-charts version 2021-02-02 12:51:48 +05:30
Suraj Shetty
6c01e9234b chore: Update frappe-charts 2021-01-21 12:14:36 +05:30
Suraj Shetty
b94d5778a8 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-19 10:36:50 +05:30
Rushabh Mehta
c93368b242 fix(minor): merge develop 2021-01-08 14:35:55 +05:30
Snyk bot
f939ec87cc
fix(Snyk): Security upgrade socket.io from 2.3.0 to 2.4.0 (#12181)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SOCKETIO-1024859
2021-01-08 11:31:33 +05:30