vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
27327 commits 1 branch 0 tags 587 MiB
Commit graph

27327 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Rushabh Mehta
c53813950f fix(minor): Server Script can return values in frappe.flags 2020-09-01 12:59:22 +05:30
Rushabh Mehta
ed1514c58b
Merge pull request #11393 from rmehta/safe-exec-flags 
fix(minor): don't give flags to safe_exec
 2020-09-01 12:50:59 +05:30
Rushabh Mehta
f772aee211 fix(minor): don't allow access to global flags 2020-09-01 12:48:26 +05:30
Anupam K
431596cccf fix: conflict resolved 2020-09-01 12:46:40 +05:30
Anupam K
8f819da4ff fix: failed test case 2020-09-01 12:43:58 +05:30
mergify[bot]
64fbad9103
Merge pull request #11342 from Mangesh-Khairnar/enable-disable-custom-script 
feat: add option to disable custom script
 2020-09-01 06:11:41 +00:00
mergify[bot]
204c5c8424
Merge pull request #11337 from frappe/image-in-comment-fix 
fix: Image shown as broken in comment
 2020-08-31 17:20:36 +00:00
mergify[bot]
c12eb3c093
Merge pull request #11386 from marination/query-report-status 
feat: Show Status Section in Query Report
 2020-08-31 15:02:07 +00:00
Marica
04dbb4c261
fix: Spacing 2020-08-31 20:16:02 +05:30
Faris Ansari
4b2c82b9c9 fix: Set blog route if title and category are set 
Set blog route on client side as soon as title and category are selected.
This behavious is in line with Web Page, where the route is set as soon
as the title is entered. This will ensure blog routes are consistent and
contain category as the part of the route. The user can change the route
ofcourse, but this behaviour is the most common expectation.
 2020-08-31 20:14:34 +05:30
marination
1eb1cba666 feat: Show Status Section in Query Report 2020-08-31 19:54:19 +05:30
Shivam Mishra
1d39b699cc
Merge pull request #11380 from scmmishra/fix-child-table-rendering 2020-08-31 17:16:34 +05:30
Rushabh Mehta
6e3d3c5b74 fix(minor): allow tags in markdown 2020-08-31 16:56:41 +05:30
mergify[bot]
16e3cb9f9e
Merge pull request #11314 from gavindsouza/safe-take-backups 
fix: Create backups folder if doesn't exist
 2020-08-31 10:48:24 +00:00
mergify[bot]
a9ae71ec15
Merge pull request #11376 from michellealva/print-format-fix 
fix: Typo in Print Format Help
 2020-08-31 10:12:55 +00:00
gavin
e860ac1108
fix: Don't raise FileExistsError if directory already exists 
Co-authored-by: Aditya Hase <aditya@adityahase.com>
 2020-08-31 15:14:20 +05:30
Gavin D'souza
afe5959963 fix: Unbreaking change for kwarg backup_path_conf 2020-08-31 14:30:33 +05:30
Anupam K
c3c2edd660 Merge branch 'newsletter-fix' of https://github.com/anupamvs/frappe into newsletter-fix 2020-08-31 11:56:31 +05:30