Commit graph

24 commits

Author SHA1 Message Date
Rutwik Hiwalkar
e9c57ee76e
revert: subscription management (#19998)
* chore: add namespaced subscription conf to boot info

* revert: https://github.com/frappe/frappe/pull/18263

* clean: remove daily hook for creating manage subscription btn
2023-02-14 12:04:28 +05:30
mergify[bot]
939d926b91
feat: Added Subscription Banner for remotely logging into FrappeCloud dashboard from site (backport #18263) (#18281)
* feat: Added Subscription Banner for remotely logging into FrappeCloud dashboard from site (#18263)

* feat: added Subscription Banner and Manage Subscription button

* feat[patch]: added a patch for adding `Manage Subscription` button in
navbar_settings

* chore: removed console ;)

* refactor: make the `Manage Subscription` navbar item optional

* keep it hidden by default, only show when the site configs are present

* style: prettier, isort and stuff

* chore: handling null responses, translation and refactored patch

* fix: correct index reset

* perf: reduce network/db calls

If not sys manager then why make a request?

* fix: removed network call and added subscription_expiry to boot process

* chore: added enable_manage_susbcriptions as daily background job and refactored patch

* chore: added hook to hooks.py

* this looks clean enough, also don't have insert for child tables ;)

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 68f315d372cc8c6e41f2aabda61eba0d42dcf6e4)

# Conflicts:
#	frappe/patches.txt

* chore: conflicts

* style: format

[skip ci]

Co-authored-by: Rutwik Hiwalkar <50401596+rutwikhdev@users.noreply.github.com>
2022-10-03 16:41:12 +05:30
Ankush Menat
6ca75357f0
Merge branch 'develop' into plyr_out_of_bundle 2022-06-20 22:37:21 +05:30
Ankush Menat
fd324db67e
chore!: remove deprecated quaggajs based barcode scanner (#17248) 2022-06-20 21:04:30 +05:30
Ankush Menat
69cb144b06 refactor!: move plyr from default bundle 2022-06-20 20:46:57 +05:30
Shariq Ansari
8dcf416eb6
Merge branch 'develop' into wspace-new-design 2022-01-11 17:31:27 +05:30
hrwx
c8c77437fa feat: add translations to datatable 2022-01-06 13:00:16 +05:30
Shariq Ansari
24570fc23d
Merge branch 'develop' into wspace-new-design 2021-12-28 12:38:05 +05:30
Sagar Vora
774b1dcd07 perf: improve translation speed 2021-12-16 13:10:41 +05:30
Shariq Ansari
973de86879 feat: Edit page title, icon, etc from sidebar 2021-12-14 20:53:21 +05:30
Ankush Menat
0cd1b3cc83 feat: diffview for comparing fields in two version 2021-11-09 18:40:51 +05:30
codescientist703
ed13182573 chore: Remove Chat Module 2021-11-09 13:44:57 +05:30
Suraj Shetty
31d5d81e31
revert: "chore: Remove chat module" (#14922) 2021-11-09 10:30:00 +05:30
codescientist703
f1893b1c7b chore: remove chat module references and settings 2021-10-11 15:29:31 +05:30
Suraj Shetty
ed806c2c74 Merge branch 'develop' of https://github.com/frappe/frappe into form-tab-break 2021-09-04 15:37:58 +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
4eb21aaeb2
Merge branch 'develop' into form-tab-break 2021-08-13 09:39:16 +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
Suraj Shetty
63e45dbb1b Merge branch 'develop' of https://github.com/frappe/frappe into form-tab-break 2021-07-27 10:36:28 +05:30
shariquerik
afe1dbe0f8 fix: Workspace 2.0 2021-07-06 22:05:37 +05:30
shariquerik
d7af6173e7 fix: new child page not visible fix 2021-05-27 12:08:55 +05:30
Faris Ansari
e72bb135e1 fix: Asset URLs
Helpers to get asset path
Python: frappe.utils.jinja_globals.bundled_asset
JS: frappe.assets.bundled_asset
2021-04-29 14:47:52 +05:30
Faris Ansari
3b54dac489 fix: Create .bundle.* files that needs to bundled 2021-04-22 07:01:36 +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