Commit graph

30307 commits

Author SHA1 Message Date
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
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
Suraj Shetty
214322b1af fix: Trigger timeline refresh for backward compatibility 2021-01-18 16:44:18 +05:30
prssanna
a10623bc71 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-18 14:16:14 +05:30
prssanna
c4bb9408e9 fix: remove overflow-x for editor in print 2021-01-18 14:15:48 +05:30
Rushabh Mehta
62cb5d7793 fix(minor): setting default doctype in customize form 2021-01-18 12:38:08 +05:30
Suraj Shetty
53099b40de Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-18 10:10:24 +05:30
Rushabh Mehta
adb1d5ad28 fix(minor): clear all_apps cache 2021-01-17 17:56:53 +05:30
Suraj Shetty
5b922161f8 fix: Email body width and padding 2021-01-16 14:29:59 +05:30
prssanna
d1e435e5a6 fix: overflow hidden for text editor in print view 2021-01-15 16:10:04 +05:30
Suraj Shetty
3751769c41 fix: Add alt and title to brand logo 2021-01-15 15:29:26 +05:30
Suraj Shetty
8145d2bc93 fix: Update email container padding 2021-01-15 15:05:19 +05:30
Suraj Shetty
20ea40db66 fix: Update email template styles 2021-01-15 14:47:09 +05:30
Faris Ansari
c9eb2a03d9
Merge pull request #12216 from netchampfaris/website-fixes-2021-01-15
fix: Remove whitespace from testimonial text
2021-01-15 14:21:28 +05:30
Faris Ansari
f23d88be5e fix: Remove whitespace from testimonial text 2021-01-15 13:48:53 +05:30
Suraj Shetty
d71f4d5d3a Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-15 11:38:34 +05:30
Rushabh Mehta
4ba65b1332 fix(minor): background in base.html 2021-01-15 09:47:26 +05:30
Rushabh Mehta
30ad27e075 fix(minor): ui fixes to grid scrolling, etc 2021-01-14 15:38:47 +05:30
mergify[bot]
86a1cfefae
Merge pull request #12200 from netchampfaris/website-fixes-2021-01-12
fix: Center align hero title
2021-01-14 08:20:24 +00:00
Rushabh Mehta
e88b5f6a85 fix(minor): keep form dashboard sections expanded by default 2021-01-14 09:49:44 +05:30
Rushabh Mehta
a003bd5d7b
Merge pull request #12101 from scmmishra/fix-image-link-print
fix: Allow images from links in print formats
2021-01-14 09:29:16 +05:30
Rushabh Mehta
2b40c5505c
Merge pull request #11000 from alyf-de/generic_oauth_client
feat: generic oauth client
2021-01-14 09:28:07 +05:30
mergify[bot]
1ac556d30e
Merge pull request #12111 from prssanna/rename-error
fix: Throw error if name already exists
2021-01-13 17:14:40 +00:00
Suraj Shetty
00896f36fe
revert: "fix: improve translation pattern" (#12205) 2021-01-13 20:46:27 +05:30
mergify[bot]
5f2dda205c
Merge pull request #12022 from saurabh6790/v13-patch-fixes-1
fix: setup record for background color while setting up website theme
2021-01-13 15:05:21 +00:00
mergify[bot]
a7c3b15b3d
Merge pull request #12154 from frappe/secondary-button-in-dialog-for-website
fix: secondary button in dialog for website
2021-01-13 14:27:40 +00:00
mergify[bot]
df7c274b03
Merge pull request #12120 from ruchamahabal/fix-child-table-sync
fix(Event Streaming): row removed in the child table not syncing when it has a dependency field
2021-01-13 14:21:51 +00:00
mergify[bot]
d3e5b82c0d
Merge pull request #12040 from frappe/translation_pattern
fix: improve translation pattern
2021-01-13 14:13:21 +00:00
Suraj Shetty
f619ef4a5b
fix: Skip "Attach" from auto image render
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-01-13 19:32:31 +05:30
Suraj Shetty
c63e0b66cf
Merge branch 'develop' into rename-error 2021-01-13 19:26:23 +05:30
mergify[bot]
aa0dca1832
Merge pull request #12201 from adityahase/fix-link-control
fix(desk): Correctly format and render Link fields
2021-01-13 13:54:57 +00:00
Shivam Mishra
26e40a9d68
fix: data.non_standard_fieldnames is None (#12174)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-13 19:24:24 +05:30
UrvashiKishnani
8ac66bbb37
fix: removed keyboard smash (#12186) 2021-01-13 19:22:08 +05:30
Suraj Shetty
474cd334da
Merge branch 'develop' into secondary-button-in-dialog-for-website 2021-01-13 19:16:38 +05:30
mergify[bot]
0506c13329
Merge pull request #12194 from nextchamp-saqib/cancel-msg-fix
fix: Remove unwanted message
2021-01-13 13:25:21 +00:00
Rushabh Mehta
bebfc491a4 fix(minor): setup-wizard page_name shows as undefined 2021-01-13 16:23:00 +05:30
Suraj Shetty
52de32aeb7 fix: Report routing issue 2021-01-13 16:01:08 +05:30