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

33021 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gavin D'souza
2ad9d202cb Merge branch 'develop' of github.com:frappe/frappe into drop-py2-code 2021-06-03 11:21:55 +05:30
mergify[bot]
099c2f0f0e
Merge pull request #13410 from resilient-tech/fix-customize-form 
fix: removed duplicate fields from Customize Form
 2021-06-02 12:51:37 +00:00
walstanb
a457501422 fix: removed duplicate fields from Customize Form 2021-06-02 16:20:51 +05:30
Nabin Hait
e489c1b594 fix: Added select permission for Module Def doctype to All role 2021-06-02 13:05:24 +05:30
Leela vadlamudi
b40a82a659
Merge pull request #13393 from leela/email-queue 
refactor: build Email queue from send mail request
 2021-06-01 21:56:35 +05:30
leela
8e3b358b9f refactor: email queue builder is added 
replaced queue.send function with Queue builder.
Queue builder builds a queue from sendmail request and sends the mail
if requested to send mail immediately.
 2021-06-01 21:39:02 +05:30
Abhishek Balam
464e93a405
fix: Allow only use of Fernet generated key for using custom encryption_key (#13399) 
* fix: only allow keys generated by fernet in encrypt()/decrypt()

* fix: sider and semgrep fixes
 2021-06-01 21:32:32 +05:30
Abhishek Balam
2da53b652b Merge branch 'develop' of https://github.com/frappe/frappe into develop 2021-06-01 19:42:12 +05:30
Abhishek Balam
f15edd21d1 feat: enable use of custom encryption_key in encrypt()/decrypt() 2021-06-01 19:41:18 +05:30
Suraj Shetty
a0bd52b02b
Merge pull request #13397 from surajshetty3416/fix-awesomeplete-width 
fix: Add min-width for dropdown list
 2021-06-01 19:04:31 +05:30
Suraj Shetty
39eee3e5c8 fix: Add min-width for awesomplete class 2021-06-01 19:02:01 +05:30
Aditya Hase
1d7b72b75d
Merge pull request #13383 from adityahase/fix-server-script-getattr 
fix(server scripts): Restrict access to python's internal attributes
 2021-06-01 10:54:43 +05:30
Aditya Hase
c033e0d34d
fix(server scripts): Restrict access to python's internal attributes 2021-05-31 19:24:36 +05:30
Gavin D'souza
8558116c70 Merge branch 'develop' of github.com:frappe/frappe into drop-py2-code 2021-05-31 18:28:28 +05:30
mergify[bot]
e82c9edc12
Merge pull request #13176 from shariquerik/grid-row-deletion-fix 
fix: Grid row deletion fix
 2021-05-31 11:38:38 +00:00
mergify[bot]
89feae785f
Merge pull request #13301 from resilient-tech/fix-grid-nav 
fix: Grid navigation with keyboard on multiple pages
 2021-05-31 11:28:52 +00:00
Suraj Shetty
f42f93fa65
Merge branch 'develop' into grid-row-deletion-fix 2021-05-31 16:46:43 +05:30
getsali
0afe774ddb
fix: Select appropriate email template response (#13051) 
* Update email_group.py

Fix: Select appropriate email template response, Welcome email template can be either html or rich text

* refactor: Simpify code

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-05-31 16:32:58 +05:30
Fisher Yu
872299b3f3
fix: Translate Strings (#13277) 2021-05-31 16:31:42 +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
leela
384d875b62 refactor: smtp session creation cleanup 2021-05-31 15:42:45 +05:30
Faris Ansari
49901ac239
Merge pull request #13373 from adityahase/fix-jinja-globals 
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals
 2021-05-31 11:27:41 +05:30
Aditya Hase
980f224bba
Merge pull request #13253 from rmehta/safe-json 2021-05-31 10:42:56 +05:30
Saqib
e73efaec04
fix: Return promise while reloading doc (#13219) 2021-05-31 10:42:50 +05:30
Aditya Hase
8aff94d514
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals 2021-05-31 10:37:32 +05:30
Leela vadlamudi
5b3acf7fe8
Merge pull request #13307 from leela/incoming-mail-refactoring 
refactor: Incoming mail refactoring
 2021-05-31 10:16:58 +05:30
leela
4ce8a600e8 fix: Tests and sider issues 2021-05-31 10:02:13 +05:30
Leela vadlamudi
f1d54442e1
Merge pull request #13340 from frappe/mergify/bp/develop/pr-13339 
fix: display currency in auto email report (backport #13339)
 2021-05-31 09:08:12 +05:30
Leela vadlamudi
8935001f1f
Merge pull request #13364 from frappe/mergify/bp/develop/pr-13355 
fix: refresh form section while refreshing the field (backport #13355)
 2021-05-31 09:06:21 +05:30
Gavin D'souza
165ff8e1bf chore: Update PyJWT dependency 
* Update pinned dep fromm 1.7.1 to 2.0.1
* Updated usages as per changelog

ref: https://python.libhunt.com/pyjwt-changelog
 2021-05-29 17:22:30 +05:30
Gavin D'souza
9b4c191928 chore: Update Jinja2 dependency 
Update from 2.11.3 to 3.0.1

Ref: https://jinja.palletsprojects.com/en/3.0.x/changes/
 2021-05-28 23:10:59 +05:30
Gavin D'souza
651a9ff42e fix: Return address 'name' instead of 'parent' field 2021-05-28 21:43:07 +05:30
Gavin D'souza
4e7526066f Merge branch 'develop' into drop-py2-code 2021-05-28 10:51:39 +05:30
leela
f14d9bd3da fix: refresh form section while refreshing the field 
If all the fields with in a section has depends_on property and in such
case section itself stays hidden as all fields with in it are hidden.

Currently when any form field is updated, we are refreshing only the
fields but not the sections. So, field refresh is not affecting the form
because of section being hidden.

Fix is to refresh the sections when ever form fields are refreshed.

(cherry picked from commit 20c6e24a9f58a303b36da8cce247d273e6e3582f)
 2021-05-28 05:00:19 +00:00
mergify[bot]
a440286877
fix: check if salutation already exists in email body (backport #13196) (#13358) 2021-05-28 09:14:27 +05:30
Suraj Shetty
1562f0e72d
Merge pull request #13280 from prssanna/website-theme-fixes 2021-05-28 09:04:13 +05:30
Suraj Shetty
38efba692d fix: Conditionally set css variables 2021-05-28 08:44:41 +05:30
Suraj Shetty
70348977be
Merge branch 'develop' into website-theme-fixes 2021-05-28 08:36:15 +05:30
Abhishek Balam
9cc555d544
Merge pull request #13346 from krishnakanthati/tooltip 
fix: tooltip displays correct title
 2021-05-28 03:28:30 +05:30
Gavin D'souza
72c239342e chore: Remove temporary warnings filter 2021-05-27 16:40:02 +05:30
Faris Ansari
914daed6e4
Merge pull request #13349 from netchampfaris/assets-json-path 2021-05-27 14:17:57 +05:30
Suraj Shetty
e9f040304b
Merge branch 'develop' into website-theme-fixes 2021-05-27 13:56:22 +05:30
Gavin D'souza
96c03fd26d chore: Drop commented out test_translation file 2021-05-27 13:48:58 +05:30
Gavin D'souza
6fb14120d9 fix: Remove trailing whitespace in translatable str 
Simplify conditional block and str appending
 2021-05-27 13:47:55 +05:30
Gavin D'souza
e2ee75e3cb fix: Translate strings passed in frappe.throw 
* Remove trailing whitespaces in translatable strings
* Sort imports appropriately
 2021-05-27 13:47:21 +05:30
Gavin D'souza
793b5638d3 style: Fix E201, E202, E401, E701 
reported by sider: https://sider.review/gh/repos/1864194/pulls/13344?statuses#issues
 2021-05-27 12:48:01 +05:30
Faris Ansari
23406d031a fix: Store assets.json directly in assets folder 
assets.json stores assets of all apps, so doesn't make sense to put it in frappe folder
 2021-05-27 11:50:56 +05:30
Krishna Kant Hati
2ccea73aa2 fix: tooltip displays correct title 2021-05-27 01:52:28 +05:30
Gavin D'souza
eca30667d2 chore: Drop FileNotFoundError handling for PY2 2021-05-26 22:21:23 +05:30
Gavin D'souza
88ef41bc58 fix(typo): Let's try executing bound method instead 2021-05-26 19:49:22 +05:30