Commit graph

34327 commits

Author SHA1 Message Date
Suraj Shetty
8b707278b9 fix: Redirect after login 2021-09-09 15:29:02 +05:30
Suraj Shetty
7f7ab76479 fix: Update login page & footer style 2021-09-08 16:59:50 +05:30
Suraj Shetty
fd26415993 fix: Show login page instantly 2021-09-08 16:57:10 +05:30
Suraj Shetty
4be9994d43
Merge pull request #14138 from surajshetty3416/fix-flaky-tests-3
test: Fix flaky UI tests
2021-09-08 12:12:19 +05:30
Suraj Shetty
842f947301 test: Comment out a flaky test case
- It is flaky possibly because of different timezone in CI
2021-09-08 11:49:22 +05:30
Suraj Shetty
3aa569182a Merge branch 'fix-flaky-tests-3' of https://github.com/surajshetty3416/frappe into fix-flaky-tests-3 2021-09-08 11:45:19 +05:30
Suraj Shetty
4441eb7d90 test: Fix test_request_language_resolution_with_cookie 2021-09-08 11:45:15 +05:30
Suraj Shetty
14cca39a5e
Merge branch 'develop' into fix-flaky-tests-3 2021-09-07 20:34:59 +05:30
Suraj Shetty
3fb93b9b3d
ci: Update threshold for codecov 2021-09-07 20:34:31 +05:30
Suraj Shetty
5f9340fda2 test: Set delay for fill_field 2021-09-07 20:33:08 +05:30
Suraj Shetty
8e9a46fff9 test: Miscellaneous fixes to avoid flaky tests 2021-09-07 19:57:57 +05:30
Suraj Shetty
a56b117ca4 test: Wait for filter save on clear filter 2021-09-07 19:23:32 +05:30
mergify[bot]
04b4417540
Merge pull request #14062 from saxenabhishek/aks-fix-postgres
fix: miscellaneous Postgres issues
2021-09-07 12:58:00 +00:00
Abhishek Saxena
1d02d26a2b
Merge branch 'develop' into aks-fix-postgres 2021-09-07 17:42:03 +05:30
Your Name
74d6ed32d6 test: add frappe.db.add_index 2021-09-07 17:40:55 +05:30
Suraj Shetty
3aed8f9e22 test: Miscellaneous fixes to avoid flaky tests 2021-09-07 16:19:27 +05:30
Suraj Shetty
b4bb4c039f test: Update click_sidebar_button to accept btn_name
- to make tests cases readable
2021-09-07 15:24:32 +05:30
gavin
620cad18d6
Merge pull request #14129 from gavindsouza/timeline-missing-comments
fix: Bring back the missing Comments
2021-09-07 11:35:46 +05:30
Gavin D'souza
07c5d0a28c fix(db_pg): Strip index size from each field 2021-09-07 11:27:38 +05:30
Gavin D'souza
2178ea7c96 style: Fix indentation for get_all query 2021-09-07 11:08:02 +05:30
Leela vadlamudi
8968653072
Merge pull request #14133 from frappe/mergify/bp/develop/pr-14132
fix: customizing print formats (backport #14132)
2021-09-07 06:50:47 +05:30
leela
3594890eb2 fix: customizing print formats
Currently system managers can only customize the print formats even though
the other roles has a permissions to do so. Fixed it to show
customize button based on permissions.

(cherry picked from commit f9486fce5fb24402fce31e3d36370120c4524a9b)
2021-09-07 01:16:16 +00:00
Suraj Shetty
92fceb88d5
Merge branch 'develop' into timeline-missing-comments 2021-09-06 22:57:59 +05:30
Suraj Shetty
ecf08e9886
Merge pull request #14108 from frappe/mergify/bp/develop/pr-14099 2021-09-06 22:55:35 +05:30
Suraj Shetty
084be78f95
Merge branch 'develop' into mergify/bp/develop/pr-14099 2021-09-06 22:51:29 +05:30
Suraj Shetty
fba196484c
ci: Conditionally run codecov upload 2021-09-06 22:50:42 +05:30
Suraj Shetty
8b252d493a
ci: Conditionally run codecov upload 2021-09-06 22:49:48 +05:30
Suraj Shetty
9d9ca1c2dd
Merge branch 'develop' into mergify/bp/develop/pr-14099 2021-09-06 22:45:25 +05:30
Suraj Shetty
4e200d13a5
Merge pull request #14127 from frappe/mergify/bp/develop/pr-14114 2021-09-06 22:44:25 +05:30
mergify[bot]
cea341ccf5
Merge pull request #13594 from shariquerik/custom-doctype-webform-perm
fix: Webform Permission for custom doctype
2021-09-06 17:06:13 +00:00
Gavin D'souza
d55254e7dc feat(minor): Show title for form timeline icons 2021-09-06 19:45:44 +05:30
Gavin D'souza
ab7dee13cf chore: Added return type for DatabaseQuery.execute 2021-09-06 19:44:25 +05:30
Gavin D'souza
f0b9eb5f7c fix: Update available Frappe icons
* Added icons for milestone
* Updated Workflow and Branch icons for consistency
2021-09-06 19:41:49 +05:30
Gavin D'souza
a233bf1061 fix: Add workflow comments in form timeline
* Add Edit, Label along with Info timeline logs
* Added title field for timeline icon
2021-09-06 19:39:08 +05:30
Gavin D'souza
6f0a02aaa5 fix: Handle multiple comment types in get_comments 2021-09-06 19:37:39 +05:30
Your Name
08b7430ba2 fix: change fieldname for postgres create index 2021-09-06 16:41:50 +05:30
Your Name
5669d9c559 fix: pass distinct as argument in set_modules 2021-09-06 16:41:41 +05:30
Rushabh Mehta
c3c4057866
Merge pull request #14111 from shariquerik/wspace-2-fixes
fix: Dashboard Settings already exist error on first login
2021-09-06 14:41:21 +05:30
Shariq Ansari
4f76c56347
Merge branch 'frappe:develop' into wspace-2-fixes 2021-09-06 14:32:08 +05:30
mergify[bot]
f4d260de0d
fix: Problems while using translations via Globe Symbol (#14128)
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 40f2e915918860ade1e514c8b0bb4cf1bb6d0b2b)

Co-authored-by: vama <vamagithub@gmail.com>
2021-09-06 14:16:27 +05:30
Saqib
62a205fe2e
feat: change custom button type (#14074)
* feat: change custom button type using frm
2021-09-06 12:43:17 +05:30
Leela vadlamudi
3527731b93
Merge pull request #14124 from frappe/mergify/bp/develop/pr-14113
fix: RTL support for text editor (backport #14113)
2021-09-06 12:35:24 +05:30
leela
768e4052f9 fix: node creation from tree view
(cherry picked from commit f8cd2ad388c96eefff4730ce130806231bc0d87e)
2021-09-06 07:04:05 +00:00
leela
5ccda1d5ac fix: RTL support for text editor
(cherry picked from commit 99f914698f7b86048c25087eb74dbd1fae707ac4)
2021-09-06 05:15:14 +00:00
Rushabh Mehta
ea27dd001a
Merge pull request #14123 from rmehta/packages
feat(minor): Packages! also cleanup of DocField and other minor fixes
2021-09-06 10:03:22 +05:30
Rushabh Mehta
d807e3b1e2 fix(minor): fix for aggregate functions, use special query 2021-09-06 09:11:58 +05:30
Rushabh Mehta
5befc80cd4 fix(minor): linting 2021-09-05 22:30:09 +05:30
Rushabh Mehta
c2e93256f2 fix(minor): remove test modules 2021-09-05 22:14:24 +05:30
Rushabh Mehta
20dea90670 feat(minor): Packages! also cleanup of DocField and other minor fixes 2021-09-05 22:01:55 +05:30
Shariq Ansari
b20e543de9 test: test hook to get website_list_context 2021-09-03 16:55:44 +05:30