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

27916 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
e90faf76b5 fix: Remove unnecessary code 
- Extra spacing is only applied to templates of type Section
- should be able to call web_block without values
- default type should be Section
- set_query can be set once
 2020-10-22 17:43:31 +05:30
barredterra
5d3178ed19 fix: disable padding and container by default 2020-10-20 14:53:23 +02:00
barredterra
aba8bf28bc feat: set filter on Web Page Blocks 
Component is not allowed as a page section, only as part of another Web Template.
 2020-10-19 15:52:01 +02:00
barredterra
dc98dba97f fix: "Component" istead of empty type 2020-10-19 14:48:49 +02:00
barredterra
7770cac9dc Merge branch 'develop' into fix_web_template_type 2020-10-19 13:57:37 +02:00
dependabot[bot]
f3077f3f12
chore(deps): bump lodash from 4.17.15 to 4.17.20 (#11728) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-19 09:14:24 +05:30
mergify[bot]
66dcaf1e4e
Merge pull request #11489 from gavindsouza/move-cypress 
fix: Install Cypress only if running UI tests
 2020-10-18 11:38:48 +00:00
Suraj Shetty
365b7b0561 test: Pass force upload to avoid failure during dragleave 2020-10-18 15:54:54 +05:30
Frappe PR Bot
76a1057e7b
chore: Update translations (#11726) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-10-18 12:02:53 +05:30
mergify[bot]
4545deb685
Merge pull request #11725 from braunse/fix-respect-postgres-port 
fix: use configured postgres port in setup_db
 2020-10-18 06:31:09 +00:00
Manuel
8a8e898ccb
fix: Copy incoming_port from Email Domain to Email Account (#11558) 
When changing an Email Domain, the configuration fields are copied
to all Email Accounts using this domain. This happens in the method
`on_update`

- Include `incoming_port` when copying fields
- Add test case for `on_update`

Co-authored-by: mtraeber <mtraeber@linux-ag.com>
 2020-10-18 11:55:54 +05:30
Suraj Shetty
d546a84659
refactor: Make code more readable 2020-10-18 11:47:28 +05:30
Suraj Shetty
4ba6044f2f
Merge branch 'develop' into move-cypress 2020-10-17 15:04:13 +05:30
Sebastien Braun
cbf815f25b fix: use configured postgres port in setup_db 2020-10-17 08:08:44 +02:00
mergify[bot]
0555536f34
Merge pull request #11712 from abhishekbalam/address_x_company_flag 
fix(Address): Move 'Is Your Company Address' field to ERPNext
 2020-10-16 11:57:41 +00:00
Faris Ansari
398451103a fix(customization): Only read .json files from custom folder 2020-10-16 15:43:17 +05:30
mergify[bot]
39a40b81ee
Merge pull request #11719 from resilient-tech/fix-readme-link 
fix: broken link in README
 2020-10-16 06:59:25 +00:00
Akash Hamirwasia
a3cdb8413e
fix: back navigation on user-profile (#11627) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-10-16 11:32:02 +05:30
mergify[bot]
f7b264afaf
Merge pull request #11670 from gregor-horvath/patch-2 
fix: py3 AttributeError decode
 2020-10-16 05:37:07 +00:00
mergify[bot]
88a1af1732
Merge pull request #11714 from abhishekbalam/webhooks_xss_fix 
fix(Request): Sanitize Error Report Email Message
 2020-10-16 04:57:57 +00:00
mergify[bot]
79bfbe0416
Merge pull request #11637 from conncampbell/11636-WebForm-Clear-Attach 
fix: Clearing attachment from web form causes error on save.
 2020-10-16 04:10:55 +00:00
Sagar Vora
eabe58148e fix: broken link in README 2020-10-16 08:52:42 +05:30
Abhishek Balam
c9e2922591 fix: santize email content 2020-10-15 15:52:28 +05:30
Abhishek Balam
21ab499989 fix: sanitize error report email message 2020-10-15 14:56:39 +05:30
Abhishek Balam
e31162e9f1 fix: move get_shipping_address() from frappe to erpnext since it has no references 2020-10-14 21:10:16 +05:30
Abhishek Balam
37a3096b68 fix: remove serverside validation 2020-10-14 19:09:36 +05:30
Abhishek Balam
fb40044496 fix: moving 'is your company address' field to erpnext 2020-10-14 18:09:28 +05:30
Shivam Mishra
02e7844690
Merge pull request #11709 from scmmishra/fall-back-desk 
fix: better handling of default page
 2020-10-14 13:07:03 +05:30
Shivam Mishra
9c5f4d5dff fix: better handling of default page 2020-10-14 13:05:21 +05:30
Kenneth Sequeira
09c625cc67
fix: Add default timezone for Laos (#11705) 2020-10-14 13:04:42 +05:30
gavin
e9fa3164fe
Merge pull request #11703 from gavindsouza/fix-build-for-init 
fix: Restore assets during bench init
 2020-10-14 11:40:05 +05:30
Gavin D'souza
86dd74f277 perf: Maintain set of created paths to reduce path.exists calls 2020-10-13 17:53:46 +05:30
Suraj Shetty
76ab7fa490
Merge pull request #11702 from surajshetty3416/fix-assignment-rule-based-on 2020-10-13 17:34:33 +05:30
mergify[bot]
31e5b78fca
Merge pull request #11701 from walstanb/perf-success-action 
perf(form): use get_list with limit instead of count
 2020-10-13 11:56:10 +00:00
Gavin D'souza
f5e1cdc5ce fix: Restore assets during bench init 2020-10-13 17:25:05 +05:30
Gavin D'souza
5cf1568248 fix: Don't make lockfile changes 
* Adding --no-save still updates the package.json. Unsure what to do
next.
 2020-10-13 16:48:37 +05:30
Gavin D'souza
c266d8b7a8 Merge branch 'develop' of github.com:frappe/frappe into move-cypress 2020-10-13 16:35:21 +05:30
Suraj Shetty
30d4686bc9 fix: Add due_date based on description 2020-10-13 16:27:49 +05:30
Suraj Shetty
792913a37d test: Update test to check if the due date is only updated in ref doc. 2020-10-13 16:24:57 +05:30
Suraj Shetty
719920d7e0 fix: Update due date of reference doc only 2020-10-13 16:24:14 +05:30
Gavin D'souza
05feb9d42c fix: Don't remove cypress after installation 2020-10-13 15:58:27 +05:30
Walstan
763972898d perf(form): use get_list with limit instead of count 2020-10-13 14:13:46 +05:30
Marica
1ad3bb76a5
fix: Skip using cookie-jar to set cookies if via tests (#11700) 2020-10-13 13:35:42 +05:30
rohitwaghchaure
7a4ca956ef
Merge pull request #11698 from rohitwaghchaure/patch-travis-fix-13-oct 
fix: patch travis
 2020-10-13 11:34:28 +05:30
Rohit Waghchaure
88ad462f70 fix: patch travis 2020-10-13 11:27:14 +05:30
mergify[bot]
5eebf3c29b
Merge pull request #11696 from netchampfaris/translate-linter-words-check 
chore: Check words in translation lint
 2020-10-12 15:50:52 +00:00
Faris Ansari
c7ed6ce977 fix: Remove test strings and early return 2020-10-12 21:12:47 +05:30
Faris Ansari
18bc0d14cf fix: remove hardcoded path 2020-10-12 21:03:22 +05:30
Faris Ansari
8708e56896 fix: Handle f string and fix words check 2020-10-12 21:00:15 +05:30
Gavin D'souza
6d364222ea Merge branch 'develop' of github.com:frappe/frappe into move-cypress 2020-10-12 19:54:28 +05:30