Commit graph

260 commits

Author SHA1 Message Date
Faris Ansari
5345d4ce7b Merge branch 'develop' of https://github.com/frappe/frappe into print-format-builder-beta 2021-10-20 18:40:18 +05:30
dependabot[bot]
4d1a49f4fe
chore(deps): bump nth-check from 2.0.0 to 2.0.1
Bumps [nth-check](https://github.com/fb55/nth-check) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/fb55/nth-check/releases)
- [Commits](https://github.com/fb55/nth-check/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: nth-check
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-21 06:12:46 +00:00
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
Faris Ansari
b8fbed0f66 feat: New Print Format Builder
- Print Format Builder Beta page
- Add margin fields in Print Format
- Using vuedraggable for drag and drop
2021-09-06 16:56:00 +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
Suraj Shetty
66924817ca
Merge pull request #13909 from frappe/dependabot/npm_and_yarn/path-parse-1.0.7
chore(deps): bump path-parse from 1.0.6 to 1.0.7
2021-08-13 09:45:20 +05:30
dependabot[bot]
6af73a1155
chore(deps): bump path-parse from 1.0.6 to 1.0.7
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-10 22:18:59 +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
c5c79ea2fd Merge branch 'develop' of https://github.com/frappe/frappe into auto-generate-rtl-style 2021-07-21 10:52:31 +05:30
dependabot-preview[bot]
8bc498c18c
chore(deps): [security] bump minimist from 1.2.0 to 1.2.5
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.5. **This update includes security fixes.**
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-07-13 10:42:00 +00:00
Shariq Ansari
29616c080e
Merge branch 'develop' into wiki-based-desk 2021-07-06 22:38:59 +05:30
Suraj Shetty
3d3d8bdfca Merge branch 'develop' of https://github.com/frappe/frappe into auto-generate-rtl-style 2021-07-05 12:04:04 +05:30
dependabot-preview[bot]
fd51ba7fcc
chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.0 to 3.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.2/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.0...3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-06-30 16:58:54 +00:00
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
dependabot[bot]
207791d712
chore(deps): bump set-getter from 0.1.0 to 0.1.1
Bumps [set-getter](https://github.com/doowb/set-getter) from 0.1.0 to 0.1.1.
- [Release notes](https://github.com/doowb/set-getter/releases)
- [Commits](https://github.com/doowb/set-getter/commits/0.1.1)

---
updated-dependencies:
- dependency-name: set-getter
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-21 21:44:22 +00:00
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[bot]
f3550f8461
chore(deps): bump normalize-url from 4.5.0 to 4.5.1
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-10 11:34:24 +00:00
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
Suraj Shetty
bedefbfe32
Merge branch 'develop' into snyk-fix-6e146ccf3b6880cf19fb4ae0c547a43b 2021-05-31 16:29:11 +05:30
dependabot[bot]
7759018492
chore(deps): bump ws from 7.4.2 to 7.4.6 (#13369)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 16:26:38 +05:30
shariquerik
d7af6173e7 fix: new child page not visible fix 2021-05-27 12:08:55 +05:30
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
dependabot[bot]
62015292da
chore(deps): bump browserslist from 4.4.2 to 4.16.6
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.4.2 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.4.2...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-25 00:44:04 +00:00
Suraj Shetty
938317b6c0
Merge pull request #13148 from frappe/dependabot/npm_and_yarn/lodash-4.17.21 2021-05-20 10:24:32 +05:30
dependabot-preview[bot]
44c481a893
chore(deps): [security] bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. **This update includes a security fix.**
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-19 06:22:02 +00:00
dependabot-preview[bot]
6b5680c0ac
chore(deps): [security] bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-18 11:30:36 +00:00
Faris Ansari
4b39f7f699 fix: Print rebuilt files in watch mode 2021-05-16 11:13:54 +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