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

33397 commits

This branch
This branch
All branches
Author SHA1 Message Date
leela
f31d01a2a6 Revert "Merge pull request #13244 from prssanna/amended-doc-naming" 
This reverts commit 58b95662c2, reversing
changes made to c553b7e23a.
 2021-07-02 17:43:16 +05:30
mergify[bot]
dede680ceb
Merge pull request #13567 from alyf-de/bench_version_branch_commit 
feat: print branch and commit on `bench version`
 2021-07-02 08:24:55 +00:00
Leela vadlamudi
1e42272b32
Merge pull request #13575 from alyf-de/translate_connection_group_label 
feat: translate connection group label
 2021-07-02 13:39:24 +05:30
Leela vadlamudi
4d2a686960
Merge pull request #13500 from sunnyakaxd/develop 
fix: Remove meta from pickling overhead
 2021-07-02 13:36:48 +05:30
Leela vadlamudi
038649489e
Merge pull request #13632 from leela/remove-unnecessaty-imports 
fix: remove not needed six import
 2021-07-02 11:27:04 +05:30
leela
3552132789 fix: remove not needed six import 2021-07-02 11:25:20 +05:30
Leela vadlamudi
58b95662c2
Merge pull request #13244 from prssanna/amended-doc-naming 
refactor: set amended docname to original docname
 2021-07-02 11:23:10 +05:30
Leela vadlamudi
4800ee8725
Merge branch 'develop' into amended-doc-naming 2021-07-02 10:47:47 +05:30
Suraj Shetty
c553b7e23a
Merge pull request #13631 from surajshetty3416/fix-website-base-template 2021-07-02 09:17:16 +05:30
Suraj Shetty
4363e51c6d test: Fix improper tests for website rendering 2021-07-01 22:10:02 +05:30
Suraj Shetty
a93bb67030 test: Add test case to validate raw file load 2021-07-01 22:08:15 +05:30
Suraj Shetty
02e735da8e fix: Do not set base template for resource 2021-07-01 22:06:26 +05:30
gavin
3e92cf2f0e
Merge pull request #13619 from gavindsouza/hide-attachment-cond-dev 
fix: Hide "Attach File" in form if max limit reached
 2021-07-01 17:07:19 +05:30
gavin
f082db0a90
Merge pull request #13621 from frappe/dependabot/npm_and_yarn/socket.io-parser-3.3.2 
chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2
 2021-07-01 13:47:16 +05:30
gavin
4d36821273
Merge pull request #13617 from gavindsouza/safe-web-view-routes 
fix: Safe checks while setting doctypes_with_web_view cache
 2021-07-01 13:42:05 +05:30
Ankush
d58d2ac77f
ci(cypress): use env variable for key (#13616) 
documentation ref: https://docs.cypress.io/guides/guides/command-line#cypress-run
 2021-06-30 23:05:05 +05:30
dependabot-preview[bot]
fd51ba7fcc
chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2 
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.0 to 3.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.2/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.0...3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-30 16:58:54 +00:00
Gavin D'souza
3d36b67152 fix: Hide "Attach File" in form if max limit reached 2021-06-30 17:36:27 +05:30
gavin
dc514905f2
chore: Update CODEOWNERS 2021-06-30 15:49:14 +05:30
Gavin D'souza
6bb96419d4 fix: Safe checks while setting doctypes_with_web_view cache 2021-06-30 15:29:49 +05:30
gavin
a919761d8e
Merge pull request #13612 from marination/premature-commit-in-communication-develop 
fix: Premature commit via notification's `send_an_email`
 2021-06-30 11:56:34 +05:30
marination
36a3504b29 fix: Premature commit via notification's send_an_email 2021-06-30 11:07:43 +05:30
gavin
cceb44a7db
Merge pull request #13606 from conncampbell/12928-OTPLoginFix 
fix: OTP login verification fails
 2021-06-30 11:04:18 +05:30
gavin
117a729c8d
refactor(minor): login-content template 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-06-30 10:51:44 +05:30
Suraj Shetty
866c201fdc
Merge pull request #13503 from frappe/barredterra-patch-1 2021-06-29 10:53:38 +05:30
mergify[bot]
cfd1fac937
Merge pull request #13583 from leela/fix-workspace-loading-error 
fix: workspace loading error
 2021-06-29 05:11:21 +00:00
mergify[bot]
cbfc0e6102
Merge pull request #13515 from hasnain2808/fix--route-to-orignal-form-after-creating-a-link-field 
fix: route to orignal form after creating a new document
 2021-06-29 04:29:52 +00:00
Suraj Shetty
c498562e3f
Merge branch 'develop' into barredterra-patch-1 2021-06-28 19:34:26 +05:30
mergify[bot]
744cc921a8
Merge pull request #13482 from rtdany10/patch-2 
fix: ability to select email account even if only one account is allowed
 2021-06-28 14:03:30 +00:00
Suraj Shetty
714b121e39
Merge pull request #13596 from surajshetty3416/fix-website-rendering 
fix: Prioritse TemplatePage over ListPage
 2021-06-28 18:20:17 +05:30
mergify[bot]
acf8ca79d9
Merge pull request #13593 from nextchamp-saqib/grid-depends-on-fix-2 
fix: incorrect depends on evalutation with parent variables
 2021-06-28 11:47:33 +00:00
Suraj Shetty
44536fac49 fix: Prioritse TemplatePage over ListPage 2021-06-28 15:53:34 +05:30
Saqib Ansari
1f5bcd42ab fix: incorrect depends on evalutation with parent variables 2021-06-28 11:21:52 +05:30
Suraj Shetty
3fe02d2222
Merge branch 'develop' into fix-workspace-loading-error 2021-06-27 11:29:03 +05:30
Suraj Shetty
2e35ac80ba
Merge pull request #13589 from surajshetty3416/fix-styles-27-jun 2021-06-27 11:27:31 +05:30
Suraj Shetty
894e1ec7d0 fix: Datepicker's dark mode style 2021-06-27 10:39:28 +05:30
Suraj Shetty
9c91cc0e5a fix: Editor link popover style 
- "overflow: hidden;" set in ql-container
used to cutoff and hide some parts of link popover of ql editor.
 2021-06-27 09:05:48 +05:30
conncampbell
4983206774 fix: missing otp form template html in prior commit. 2021-06-26 12:27:23 -06:00
conncampbell
b9e85b237e Merge branch 'develop' of https://github.com/frappe/frappe into 12928-OTPLoginFix 
 Conflicts:
	frappe/__init__.py
 2021-06-26 12:16:21 -06:00
Leela vadlamudi
8d6bd82eac
Merge pull request #13586 from leela/fix-calendar-view 
fix: Calendar view of a doctype
 2021-06-26 20:57:39 +05:30
leela
7ad2444e4b fix: Calender view of a doctype 2021-06-26 20:38:14 +05:30
Leela vadlamudi
b7c1a7610c
Merge pull request #13584 from leela/fix-website-link-field-styles 
fix: styles for link field in webpages
 2021-06-26 10:21:29 +05:30
leela
8dd99b6e0e fix: styles for link field in webpages 
The styles are missing for the wepage link field
 2021-06-26 09:59:28 +05:30
leela
b7fb1d475e fix: workspace loading error 
Workspace loads to fail if there are no links in any extended workspaces.
 2021-06-26 09:43:34 +05:30
barredterra
892cf03880 feat: translate connection group label 2021-06-25 13:21:53 +02:00
conncampbell
42546fc3d4 Merge remote-tracking branch 'upstream/version-13-hotfix' into 12928-OTPLoginFix 
# Conflicts:
#	frappe/__init__.py
 2021-06-24 12:53:13 -06:00
barredterra
f8ec3d711c feat: print branch and commit on bench version 2021-06-24 18:43:12 +02:00
Sagar Vora
cb2c013db1
fix: use <strong> instead of <b> (#13557) 
* fix: use `<strong>` instead of `<b>`

* test: fix expected error
 2021-06-24 20:44:11 +05:30
Suraj Shetty
13b14570af
Merge pull request #13558 from surajshetty3416/website-rendering-fixes 2021-06-24 19:29:30 +05:30
Suraj Shetty
b80a808a56 test: Comment flaky assert 2021-06-24 18:51:02 +05:30