Commit graph

30561 commits

Author SHA1 Message Date
Suraj Shetty
6c01e9234b chore: Update frappe-charts 2021-01-21 12:14:36 +05:30
Suraj Shetty
6e7fbe157c fix: Show brand logo only if header or with_container is set 2021-01-21 12:13:52 +05:30
Suraj Shetty
5045cdf092 fix: Get brand logo from email account 2021-01-21 11:31:13 +05:30
prssanna
dff870ead6 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-21 11:27:51 +05:30
prssanna
a440a8d7dd fix: escape kanban name in data attribute 2021-01-21 11:27:06 +05:30
Suraj Shetty
425ab65bb4 fix: Post merge issue 2021-01-21 11:23:41 +05:30
Suraj Shetty
e4bdbed414 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-21 11:20:18 +05:30
Suraj Shetty
e6aa5394b8 feat: Add avatars for top performers 2021-01-21 11:18:59 +05:30
Suraj Shetty
e6f551d610 feat: Add with_container argument and update email style 2021-01-21 11:17:08 +05:30
Suraj Shetty
e2c763c989 feat: Add avatar macro 2021-01-21 11:14:04 +05:30
Rucha Mahabal
08b090ed73 Merge branch 'develop' into nested-doc-user-perms 2021-01-21 10:57:45 +05:30
prssanna
aaa4fc6b35 fix: dropdown divider style 2021-01-21 10:48:35 +05:30
prssanna
3026801cf0 fix: kanban switcher in page custom actions 2021-01-21 10:30:16 +05:30
Suraj Shetty
d2b5bd7af7 refactor: Fix address naming 2021-01-21 10:13:19 +05:30
snyk-bot
19c6e0218d
fix: requirements.txt to reduce vulnerabilities
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PYYAML-590151
2021-01-20 22:57:25 +00:00
mergify[bot]
d89ea9ee60
Merge pull request #12176 from nextchamp-saqib/grid-row-refresh-fix
fix: cannot refresh grid_row
2021-01-20 18:08:55 +00:00
Raffael Meyer
f47d2c32b1
feat: Add translation context (#12043)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-20 23:14:18 +05:30
Suraj Shetty
723436ca50
Merge branch 'develop' into grid-row-refresh-fix 2021-01-20 23:11:45 +05:30
mergify[bot]
bd20905818
Merge pull request #12188 from prssanna/grid-form-keyboard-nav
fix: grid row index no longer dependant on doc index for keyboard navigation
2021-01-20 17:41:38 +00:00
Anuja P
8da071edc3 fix: Preventing item qty from resetting to default on Add Multiple 2021-01-20 18:25:11 +05:30
prssanna
e54a1262b4 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-20 17:57:46 +05:30
prssanna
f363863b8c fix: website fixes
-move modal and icon styles to common

primary navbar theme
2021-01-20 17:56:05 +05:30
Suraj Shetty
733d33aad0 fix: Email footer style 2021-01-20 16:03:06 +05:30
mergify[bot]
9c214c836b
Merge pull request #12226 from hasnain2808/fix--hide-theme-url
fix: hide theme url
2021-01-20 09:56:12 +00:00
robert kimutai
9591d01c2c
chore: Update CONTRIBUTING.md (#12241) 2021-01-20 15:22:12 +05:30
shariquerik
bddb7034cf fix: Geolocation field with Column Break & Section Break (Collapsible) does not seems to work. 2021-01-19 22:36:33 +05:30
shariquerik
099474a441 Revert "Link Field Validation doesn't use Filter criteria defined for link field"
This reverts commit 962fff15c4.
2021-01-19 22:29:30 +05:30
shariquerik
bcae1cc294 revert 2021-01-19 22:29:23 +05:30
Suraj Shetty
397848f9f7 fix: Email new notification style 2021-01-19 17:37:05 +05:30
Suraj Shetty
68c340ed72 fix: Timeline action style 2021-01-19 15:39:08 +05:30
shariquerik
83822b14c6 fix: Updated if condition 2021-01-19 14:07:19 +05:30
Suraj Shetty
4627d07bd0 fix: Post merge error 2021-01-19 10:42:30 +05:30
Suraj Shetty
dd7d12df22 fix: Post merge fixes 2021-01-19 10:39:02 +05:30
Suraj Shetty
b94d5778a8 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-19 10:36:50 +05:30
Suraj Shetty
d45b7df7cd fix: Prioritize reply communication_doc sender
- Prioritize reply communication_doc sender email over form email
2021-01-19 09:31:02 +05:30
Suraj Shetty
e14a3de252 fix: Listview setting header refresh issue 2021-01-19 09:00:34 +05:30
Suraj Shetty
f9e5e067ee fix: Text editor tooltip hidding issue
- Fix tooltip style
2021-01-19 08:26:16 +05:30
Suraj Shetty
d75ea19c9e feat: Add read-status & unread-status icons 2021-01-19 07:50:47 +05:30
Suraj Shetty
c291977124 fix: Email template styles 2021-01-19 07:49:57 +05:30
mergify[bot]
33f8ed9677
Merge pull request #12231 from alyf-de/fix_connected_app_tests
test: fix connected app
2021-01-18 18:57:59 +00:00
barredterra
a0678a4d5f test: login twice 2021-01-18 19:27:05 +01:00
barredterra
7fd4a114a1 test: use get for login 2021-01-18 18:53:35 +01:00
barredterra
aa9a8b2f1b fix: remove unused import 2021-01-18 18:46:55 +01:00
barredterra
b9f2f5bc22 test: fix connected app 2021-01-18 18:41:11 +01:00
shariquerik
ebcb8438de fix: semantic commit and sider issues 2021-01-18 21:45:07 +05:30
shariquerik
962fff15c4 Link Field Validation doesn't use Filter criteria defined for link field
In link field if we enter invalid i.e not available record it will clear field but if we enter valid record that is not available in filter but available in db than it will accept that record
2021-01-18 20:49:09 +05:30
hasnain2808@gmail.com
cd693d5a17 fix: hide theme url 2021-01-18 17:45:14 +05:30
Suraj Shetty
eeae50609a Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-18 16:45:24 +05:30
Suraj Shetty
e2c07e375f feat: Add branch icon 2021-01-18 16:45:18 +05:30
Suraj Shetty
d2b7413fab fix: Add doctype and docname to timeline item 2021-01-18 16:44:44 +05:30