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

33117 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gavin D'souza
ffb2aceb43 fix: Logical bug in DatabaseQuery.extract_tables 
Introduced via 888aa8ad84
 2021-06-15 12:50:29 +05:30
mergify[bot]
cb4f36a546
Merge pull request #13478 from ankush/implicit_commit_tests 
fix: test failure due to uncommited transaction
 2021-06-14 11:28:19 +00:00
Suraj Shetty
fb8ecd6b26
Merge pull request #13464 from frappe/mergify/bp/develop/pr-13463 2021-06-14 15:20:56 +05:30
Suraj Shetty
020596ac17
Merge pull request #13433 from frappe/mergify/bp/develop/pr-13427 2021-06-14 15:20:10 +05:30
Suraj Shetty
d11e8e1d08
Merge branch 'develop' into mergify/bp/develop/pr-13427 2021-06-14 15:19:51 +05:30
gavin
da38adbc6d
Merge pull request #13454 from gavindsouza/retry-flaky-tests 
fix(test): Flaky TestAPI.test_update_document
 2021-06-14 15:05:55 +05:30
mergify[bot]
f73572e695
Merge pull request #13489 from resilient-tech/fix-grid-row-css 
fix(UI): fixed grid view for uneditable rows
 2021-06-14 08:58:41 +00:00
Suraj Shetty
55d3d7a41b
Merge branch 'develop' into mergify/bp/develop/pr-13463 2021-06-14 14:28:38 +05:30
Gavin D'souza
91fd070d41 Merge branch 'develop' of github.com:frappe/frappe into retry-flaky-tests 2021-06-14 14:07:41 +05:30
Gavin D'souza
e5db89dd4d fix: commit for postgres db_type before each TestAPI test 2021-06-14 13:44:20 +05:30
Gavin D'souza
3b310afc68 Revert "fix(test): Retry flaky test" 
This reverts commit 7a30b2455e.
 2021-06-14 13:43:52 +05:30
mergify[bot]
7c5624dd56
Merge pull request #13173 from ankush/unnecessary_comprehensions 
perf(minor): remove unnecessary comprehensions
 2021-06-14 07:14:20 +00:00
walstanb
abebc91872 fix(UI): fixed grid view for uneditable rows 2021-06-14 12:33:12 +05:30
Leela vadlamudi
5a2ea4edc8
Merge pull request #13476 from leela/email-account-based-mail-usage 
fix: consider email accounts while checking email limits
 2021-06-14 12:10:34 +05:30
Suraj Shetty
daeb615423
Merge pull request #13486 from surajshetty3416/fix-shortcut-filter 2021-06-14 11:59:03 +05:30
Gavin D'souza
e6bdfd8d4f Merge branch 'develop' of github.com:frappe/frappe into unnecessary_comprehensions 2021-06-14 11:53:21 +05:30
Suraj Shetty
e7d1eecef9 fix: Remove "No filter" message only if filter exists 2021-06-14 11:53:20 +05:30
Suraj Shetty
425b73ab6a fix: Remove "No filter" message while adding filters 2021-06-14 11:03:13 +05:30
Suraj Shetty
a571cb9f91 fix: Allow to remove filters from shortcut 
completely
 2021-06-14 11:02:17 +05:30
Leela vadlamudi
b4f4e48bd6
Merge pull request #13484 from frappe/mergify/bp/develop/pr-13314 
fix: encode error to add outgoing mail to sent folder
 2021-06-14 10:53:12 +05:30
Suraj Shetty
3b0b147847
Merge pull request #13468 from leela/clickable-urls-in-texteditor 2021-06-14 10:05:45 +05:30
Suraj Shetty
eae6ab3cf9
style: Add missing semicolon 2021-06-14 10:05:14 +05:30
Suraj Shetty
fa97515cf2
Merge pull request #13396 from nextchamp-saqib/shortcut-for-actions-menu-item 
fix: cannot set shortcut for actions menu item
 2021-06-14 09:44:22 +05:30
Suraj Shetty
62bcd72400
Merge pull request #13479 from frappe/mergify/bp/develop/pr-13439 2021-06-14 09:42:53 +05:30
Suraj Shetty
c299dead5e
Merge pull request #13483 from surajshetty3416/fix-grid-delete-all 
fix: Grid delete all should trigger form change
 2021-06-14 09:41:48 +05:30
leela
c523e760fd fix: encode error to add outgoing mail to sent folder 
Failed to add outgoing mail to sent folder because of encoding issue.
fixed it by using safe_encode method.

(cherry picked from commit 5165e2afa3884310fd653280c834d984a5feda8d)
 2021-06-14 09:37:02 +05:30
Suraj Shetty
ff75a72a6e fix: Grid delete all should trigger form change 2021-06-14 09:13:26 +05:30
Gavin D'souza
254b8ae1b3 fix: Use set difference instead of comprehension 
Bug introduced via b0bb0cf2c4 due to
improper comprehension definition
 2021-06-11 21:07:16 +05:30
Gavin D'souza
1b6c41cbfc fix: Don't re-define pluck bug 
Introduced via 974bf463df
 2021-06-11 19:44:22 +05:30
Rohit Waghchaure
0e99ea6c4c fix: property to hide grid delete button 
(cherry picked from commit d44a4ad730464137cac7a52b372163862687516b)
 2021-06-11 14:07:00 +00:00
Gavin D'souza
f92c5d9898 refactor: Unnecessary/illogical check 
because cint(False) gives 0
 2021-06-11 19:34:34 +05:30
Gavin D'souza
888aa8ad84 refactor(minor): DatabaseQuery.extract_tables 2021-06-11 19:34:24 +05:30
Gavin D'souza
ee75fb38cc style: Restructured if blocks in db_query 2021-06-11 19:34:16 +05:30
Gavin D'souza
974bf463df refactor: Simplify string representations 
* Simplify existing %s, .format representations to f-string
* Simplify logic
* Remove redundant tokens
 2021-06-11 19:34:00 +05:30
Gavin D'souza
b0bb0cf2c4 refactor(minor): Use set comprehension instead of difference 2021-06-11 19:33:44 +05:30
Gavin D'souza
cd6f353175 chore: Remove dead and sort imports 2021-06-11 19:33:32 +05:30
Gavin D'souza
c489846547 Merge branch 'develop' into unnecessary_comprehensions 2021-06-11 19:30:23 +05:30
gavin
0ba9cd4ca5
Merge pull request #13405 from frappe/dependabot/npm_and_yarn/jquery-3.5.0 
chore(deps): [security] bump jquery from 2.2.4 to 3.5.0
 2021-06-11 16:37:52 +05:30
Ankush Menat
a164dd0a8c
fix: test failure due to uncommited transaction 
Steps to reproduce:
- Create a fresh new site with Frappe
- Add and install a new app.
- Add basic test_file.py anywhere in module.
- Run the single using test with bench command:
`bench --module module.dotted.path --test testname`

The test will not run and complain about implicit commit.

- root cause: test runner makes changes to DB but does not commit. e.g.
disabling of scheduler on L57.

Note: this is not reproducible in FF or when ERPNext is installed
because in many places of "test process" somethng else commits the
changes like `before_tests` hook, which usually isn't present in new
apps.
 2021-06-11 16:27:55 +05:30
Gavin D'souza
1e7cffe8bc chore(ci): Add wait time before checking list view 
Cypress form.js tests run just fine locally but not on GHA :thonk:
 2021-06-11 16:22:00 +05:30
leela
97ac79a295 fix: consider email account while checking email limits 
Added email_account argument for out going email count utility functions as
these are used to validate email limits.
 2021-06-11 13:54:54 +05:30
leela
e534dc0a02 feat: Make url's clickable in text editor when typed/copied 
Using a Quill module named quill-magic-url to automatically convert
typed/copied urls into links.
 2021-06-10 21:30:53 +05:30
mergify[bot]
88cb19c64c
Merge pull request #13467 from frappe/dependabot/npm_and_yarn/normalize-url-4.5.1 
chore(deps): bump normalize-url from 4.5.0 to 4.5.1
 2021-06-10 12:40:25 +00:00
dependabot[bot]
f3550f8461
chore(deps): bump normalize-url from 4.5.0 to 4.5.1 
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 11:34:24 +00:00
gavin
dcffc3da42
Merge pull request #13342 from frappe/snyk-fix-6e146ccf3b6880cf19fb4ae0c547a43b 
chore(Snyk): Security upgrade cssnano from 4.1.10 to 5.0.0
 2021-06-10 17:03:51 +05:30
Gavin D'souza
8524c289f4 Merge branch 'develop' of github.com:frappe/frappe into snyk-fix-6e146ccf3b6880cf19fb4ae0c547a43b 2021-06-10 16:45:49 +05:30
dependabot-preview[bot]
14a1b7f4ac
chore(deps): [security] bump jquery from 2.2.4 to 3.5.0 
Bumps [jquery](https://github.com/jquery/jquery) from 2.2.4 to 3.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/2.2.4...3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-10 11:13:37 +00:00
mergify[bot]
75a5eb2444
Merge pull request #13341 from alyf-de/messages-translation-context 
feat: add context to strings in confirm and prompt dialogs
 2021-06-10 10:00:40 +00:00
barredterra
bd1cca90c5 Merge branch 'develop' into messages-translation-context 2021-06-10 09:36:47 +02:00
GangaManoj
a039576bb5 fix(Workspace): Filter cards by country if specified 
(cherry picked from commit b84ff3e9f3750da6966bad4360e0342e92b02063)
 2021-06-10 07:34:17 +00:00