Commit graph

2165 commits

Author SHA1 Message Date
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
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
aac5423600 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-04-29 13:58:27 +05:30
Faris Ansari
dd69f1ab43 fix: Hash based file naming
- For better HTTP caching and cache busting
- assets.json is created under [app]/dist folder which contains the map
of input file and output file name, this is used to get the correct path for
bundled assets
2021-04-29 13:30:07 +05:30
Rohan Bansal
dade7ed216 refactor: fix py3 datatypes and remove references to six in oauth 2021-04-28 14:02:23 +05:30
Revant Nandgaonkar
c4a9238549 fix: remove six imports and use py3 defaults 2021-04-27 14:20:26 +05:30
Revant Nandgaonkar
1f54b8b973 fix: sider issues 2021-04-26 22:56:14 +05:30
Revant Nandgaonkar
96d6971ee4 refactor: improve oauthlib implementation
implement openid provider
implement PKCE
improve errors
2021-04-26 22:56:14 +05:30
Faris Ansari
2f10daf562 Merge remote-tracking branch 'upstream/develop' into esbuild 2021-04-24 16:43:06 +05:30
Faris Ansari
34c6d099b1 fix: Update all /assets urls with new urls 2021-04-24 16:24:08 +05:30
mergify[bot]
85cbdf7683
Merge pull request #12895 from revant/feat-auth-hooks
feat(hooks): auth hooks
2021-04-23 06:33:27 +00:00
Faris Ansari
63771417a2 fix: style, script, assets_url jinja helpers
Jinja helpers to load js, css assets
2021-04-23 08:07:47 +05:30
Faris Ansari
6cb64934a8
Merge branch 'develop' into refactor-jinja-hook 2021-04-22 16:26:37 +05:30
Sagar Vora
ab3be339fd fix: remove unsused variables 2021-04-22 12:56:21 +05:30
Sagar Vora
9d3be5160f perf: low priority for backup processes 2021-04-22 12:45:46 +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
Faris Ansari
976ebd5b2c fix: Check if path is a module first then function 2021-04-22 06:03:35 +05:30
mergify[bot]
16f26d61bf
Merge pull request #12807 from resilient-tech/fix-backup
fix(backups): ensure `delete_temp_backups` always respects config
2021-04-20 16:52:35 +00:00
mergify[bot]
3b0909afd0
Merge pull request #12904 from leela/oauth-timeout
fix: OAuth token expiry
2021-04-19 11:40:34 +00:00
leela
1c2d69fbe7 fix: remove the token validation check
Let token be part of state to make state dynamic. But there is no need
to have validation for token.
2021-04-19 14:51:53 +05:30
Rohan Bansal
a7794d9f6c Merge remote-tracking branch 'upstream/develop' into feat-py3-dependencies 2021-04-19 12:51:50 +05:30
Revant Nandgaonkar
d309343c6f feat(hooks): auth hooks
hook for request authentication
2021-04-19 06:31:28 +05:30
Faris Ansari
b32db6e329 fix: method call 2021-04-17 16:11:28 +05:30
Faris Ansari
a78fed4ffc fix: Move standard filters to jinja hooks 2021-04-17 16:11:28 +05:30
Faris Ansari
a62ef80cdd fix: Add jinja hook boilerplate 2021-04-17 16:11:28 +05:30
Faris Ansari
1fd08d3960 refactor: Jinja hooks
- Rename hook from "jenv" to "jinja"
- You can now pass the path to the module and all of the methods in that
module will be added as methods
- You can also pass module path of a method

BREAKING CHANGE: Previous use of "jenv" hook won't work anymore
2021-04-17 16:11:28 +05:30
Suraj Shetty
d8ec0cd4d1
Merge branch 'develop' into fix-backup 2021-04-16 09:08:27 +05:30
Suraj Shetty
a2af812dfb
Merge pull request #12844 from surajshetty3416/group-mentions 2021-04-15 16:38:45 +05:30
Faris Ansari
8678c09e91
feat: Add log_error and FrappeClient to restricted python (#12857) 2021-04-15 14:34:23 +05:30
Rohan Bansal
86851028ea feat: manage Python 3 compatiblity with dependencies 2021-04-14 14:40:58 +05:30
Suraj Shetty
a1190a0c4a feat: Add option to mention a group of users 2021-04-12 16:35:11 +05:30
walstanb
c6497abcd1 fix: minor changes 2021-04-09 13:06:58 +05:30
Leela vadlamudi
e5d3aac707
Merge pull request #12693 from leela/notifications-into-timeline
feat: Include automated mail notifications in timeline
2021-04-08 20:38:29 +05:30
Sagar Vora
08d8e67946 fix(backups): ensure delete_temp_backups always respects config 2021-04-06 14:56:28 +05:30
Suraj Shetty
f53c09ada2
Merge branch 'develop' into custom-user-type-feat 2021-04-05 19:01:42 +05:30
Suraj Shetty
60aae80f39
chore: Update develop with Version 13 (#12803) 2021-04-05 14:10:37 +05:30
leela
5c2bda478c Refactor(Improv): Include automated mail notifications in timeline
Notifications sent through notifications doctype are not part of
communications doctype and also not into timelines. Added these
notifications into timeline by adding docs into Communication doctype.
2021-04-05 09:45:17 +05:30
Suraj Shetty
efba586054
Merge branch 'develop' into remove-password 2021-04-02 09:46:57 +05:30
Faris Ansari
bcb01f6491 fix: Remove encrypted password when it is unset 2021-04-01 17:48:20 +05:30
Rohit Waghchaure
112784e7ae feat: custom user type with doctypes 2021-04-01 13:54:11 +05:30
Leela vadlamudi
4ef7f11751
Merge pull request #12729 from leela/code-cleanup
refactor: Code cleanup and attempt tracker for 2FA
2021-03-31 19:06:44 +05:30
leela
1f6f02fd5a fix: Track 2FA OTP attempts using login tracker 2021-03-31 12:49:31 +05:30
mergify[bot]
a1f15245f7
Merge pull request #12726 from zerodha/check_connections
fix: global get_conf() fails to return site config
2021-03-30 15:11:45 +00:00
Shridhar
86d372c4f6 fix: global get_conf() fails to return site config 2021-03-30 17:13:04 +05:30
Shridhar
5deec996b6 fix: updated postgres default port 2021-03-29 15:16:27 +05:30
Suraj Shetty
ac7b40a7e3 fix: Do not show progress bar in CI environ 2021-03-19 18:57:31 +05:30
Britlog
662f409604
feat: Add quoting parameter in the UnicodeWriter constructor (#12578)
* Add quoting parameter in the constructor

* fix: Use quoting kwarg to pass quoting value

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-17 12:50:20 +00:00
gavin
2536f73e2d
Merge pull request #12502 from gavindsouza/refactor-personal-data-deletion
refactor: Personal Data Deletion Request
2021-03-17 13:31:30 +05:30
Syed Mujeer Hashmi
13a57d141e fix: timespan filter for next and last timespans
The timespan filter now considers calendar month, quarter,
half-year, and year for last and next timespans.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-03-16 21:12:07 +05:30
Gavin D'souza
48c0160b6a Merge branch 'develop' of github.com:frappe/frappe into refactor-personal-data-deletion 2021-03-15 16:07:17 +05:30