Commit graph

27347 commits

Author SHA1 Message Date
Suraj Shetty
94cfd20a77
Merge branch 'develop' into razorpay 2020-09-07 09:24:51 +05:30
dependabot-preview[bot]
4f5acf3d9b
chore(deps): [security] bump js-yaml from 3.12.2 to 3.14.0 (#11413)
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.2 to 3.14.0. **This update includes security fixes.**
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.2...3.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-07 09:21:07 +05:30
mergify[bot]
ba51f71001
Merge pull request #11424 from ruchamahabal/fix-event-streaming-test-flag
fix(Event Streaming): remove in_test flag from Event Consumer
2020-09-07 03:45:13 +00:00
mergify[bot]
e85871b0b5
Merge pull request #11425 from netchampfaris/fix-ui-test-helper-permissions
fix: Restrict ui test helper method to dev server mode
2020-09-07 03:42:30 +00:00
Faris Ansari
3f5a50d677 fix: Restrict ui test helper method to dev server mode 2020-09-06 18:37:22 +05:30
Rucha Mahabal
e48ed816c3 fix(Event Streaming): remove in_test flag from Event Consumer 2020-09-06 16:35:28 +05:30
mergify[bot]
330f14be14
Merge pull request #11362 from deepeshgarg007/section_with_tab_subtitle
fix: Subtitle in Section With Tabs web template
2020-09-05 16:10:47 +00:00
mergify[bot]
dbb1a05402
Merge pull request #11421 from prssanna/email-header-fix
fix: Handle exception while setting In-Reply-To in email header
2020-09-05 11:53:35 +00:00
prssanna
d94a1313f0 fix: catch exception while setting In-Reply-To in email header 2020-09-05 14:15:02 +05:30
Aditya Hase
2f1db9b751
Merge pull request #11419 from adityahase/fix-image-disclosure
fix(minor): Prevent path traversal
2020-09-04 16:55:27 +05:30
Aditya Hase
3349c9f942
fix(minor): Prevent path traversal 2020-09-04 16:31:10 +05:30
Shivam Mishra
cd39bbc338 feat: add init client API 2020-09-04 15:52:21 +05:30
Shivam Mishra
0109bde065 feat: add razorpay dependency 2020-09-04 15:52:13 +05:30
mergify[bot]
63bab8166f
Merge pull request #11412 from netchampfaris/fix-check-name-exists
fix: Also check if name is set, since empty object is truthy
2020-09-04 08:05:06 +00:00
mergify[bot]
24f26371c4
Merge pull request #11416 from adityahase/fix-locals
fix(minor): Use get_safe_globals
2020-09-04 08:03:13 +00:00
Aditya Hase
dffc0ca5b7
fix(minor): Use get_safe_globals 2020-09-04 13:15:12 +05:30
mergify[bot]
31fa5b4e6e
Merge pull request #11387 from netchampfaris/fix-consistent-blog-routes
fix: Set blog route if title and category are set
2020-09-04 06:40:47 +00:00
mergify[bot]
1ce1019466
Merge pull request #11398 from deepeshgarg007/notification_enhance
feat: Enhancement in notifications
2020-09-03 15:28:32 +00:00
Rushabh Mehta
8c8f7313f4
fix(minor): make utils explicit in safe_globals (#11408)
* fix(minor): make utils explicit in safe_globals

* fix(minor): import subprocess

* fix(minor): fix globals in safe_eval;

* fix(minor): import subprocess

* fix(minor): add test

* fix(minor): webhook.py

* fix(minor): document_type_mapping.py
2020-09-03 14:26:01 +05:30
Deepesh Garg
5b449d1084 chore: Add comments 2020-09-03 14:24:19 +05:30
Faris Ansari
ba9c7bdc09 fix: Also check if name is set, since empty object is truthy 2020-09-03 13:55:55 +05:30
mergify[bot]
4fac4bf1a8
Merge pull request #11406 from surajshetty3416/refactor-perm
refactor: Client-side get_role_permissions
2020-09-03 06:10:25 +00:00
Rushabh Mehta
38e024ebbb
Merge pull request #11306 from rmehta/system-console
feat(system console): Added a System Console to help in debugging and Console Log
2020-09-03 11:12:23 +05:30
Rushabh Mehta
f6a486a487
Merge pull request #11405 from rmehta/move-get-source
fix(minor): move get_source_value to data_migration_mapper
2020-09-03 10:29:53 +05:30
Suraj Shetty
4d91d72d1a refactor: Client-side get_role_permissions 2020-09-03 09:00:58 +05:30
Rushabh Mehta
9eb9030381 fix(minor): move get_source_value to data_migration_mapper 2020-09-03 08:42:42 +05:30
dependabot-preview[bot]
66934b311f
chore(deps): [security] bump bl from 3.0.0 to 3.0.1 (#11403)
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-02 22:18:05 +05:30
Deepesh Garg
0bdb4c8b4e fix: Linting issues 2020-09-02 21:12:26 +05:30
Deepesh Garg
b65e658828 fix: Move notification creation in setup 2020-09-02 20:42:43 +05:30
Deepesh Garg
b373f10432 fix: Add sleep to fix test cases 2020-09-02 20:00:36 +05:30
Shivam Mishra
96e003af2d
Merge pull request #11401 from anupamvs/newsletter-fix
fix: Newsletter fix
2020-09-02 17:28:30 +05:30
Anupam K
2c5272553a fix: updating branch 2020-09-02 17:22:46 +05:30
Anupam K
87c06ef5a4 fix: tabs 2020-09-02 17:19:00 +05:30
mergify[bot]
a2db07c448
Merge pull request #11370 from alyf-de/autoprefixer
feat: add autoprefixer
2020-09-02 11:44:12 +00:00
mergify[bot]
c2dfea55ba
Merge pull request #11352 from scmmishra/fix-translation
fix: translation for persian
2020-09-02 11:28:04 +00:00
Suraj Shetty
c1579aa405
Merge branch 'develop' into section_with_tab_subtitle 2020-09-02 16:46:55 +05:30
Suraj Shetty
becb6ec721
Merge branch 'develop' into fix-translation 2020-09-02 16:41:51 +05:30
Deepesh Garg
6ef4536c69 fix: Update comment 2020-09-02 16:20:32 +05:30
Deepesh Garg
07728df16a fix: Add test cases 2020-09-02 15:49:55 +05:30
Deepesh Garg
fda7999bdd fix: Send email notification by child table fields 2020-09-02 15:48:49 +05:30
Anupam Kumar
0b8ac586c0
fix: newsletter issues (#11321)
* fix: newsletter fix

* fix: review changes

* fix: test case

* fix: failed test case

* fix: removing condition

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-09-02 07:21:15 +00:00
Anupam K
aecb77ce9b fix: removing condition 2020-09-02 12:19:34 +05:30
Rushabh Mehta
ac76c55160
Update frappe/desk/doctype/system_console/system_console.json
Co-authored-by: Aditya Hase <aditya@adityahase.com>
2020-09-02 09:22:28 +05:30
Rushabh Mehta
3eb0e5ce8a
Update frappe/desk/doctype/system_console/system_console.js
Co-authored-by: Aditya Hase <aditya@adityahase.com>
2020-09-02 09:21:24 +05:30
Deepesh Garg
428080bc56 fix: Send email notification to all document assignees 2020-09-01 21:04:57 +05:30
mergify[bot]
c8016584b0
Merge pull request #11358 from gavindsouza/consistency-is-key
fix(backups): Allow naming conf file via BackupGenerator
2020-09-01 09:52:52 +00:00
mergify[bot]
6da3036181
Merge pull request #11253 from saurabh6790/email-formatting-patch
fix: email formatting in communication and email queue
2020-09-01 08:46:24 +00:00
Shivam Mishra
8a1220dade
Merge pull request #11394 from frappe/revert-11380-fix-child-table-rendering
Revert "fix: child table rendering with escape_html"
2020-09-01 14:07:46 +05:30
Shivam Mishra
7efe1db628
Revert "fix: child table rendering with escape_html" 2020-09-01 14:07:16 +05:30
Shivam Mishra
9b72b19d86
Merge pull request #11340 from Mangesh-Khairnar/fix-dashboard-cards
fix: group dashboard cards based on label
2020-09-01 13:32:01 +05:30