Commit graph

30040 commits

Author SHA1 Message Date
Suraj Shetty
03abe4abeb fix: Get brand logo from app 2021-01-13 14:03:54 +05:30
Suraj Shetty
8bb00f72e6 fix: Add header to workflow action 2021-01-13 10:49:24 +05:30
Suraj Shetty
7e4bc4d9b3 fix: Update workflow action email template style 2021-01-13 10:38:35 +05:30
Suraj Shetty
607b5f8eb4 refactor: Move verification code email msg to template 2021-01-13 10:36:49 +05:30
Suraj Shetty
a7aead676f feat: Set frappe.bold as safe global 2021-01-13 10:36:34 +05:30
Suraj Shetty
5e63531ba8 feat: Update standard email template to match new style 2021-01-13 10:34:16 +05:30
Suraj Shetty
e09a0d61d2 fix: Update preview_email function to return only HTML 2021-01-13 10:33:06 +05:30
Suraj Shetty
53923264b3 refactor: Move email.less to email.scss
- Updated email container layout & btn style
2021-01-13 10:31:14 +05:30
Rushabh Mehta
1104e3aac2
Merge pull request #12195 from rmehta/rename-workspace-child-tables
BREAKING CHANGE: rename child tables of Workspace
2021-01-12 18:55:29 +05:30
Rushabh Mehta
e21b320355 fix(minor): typo 2021-01-12 18:13:31 +05:30
Suraj Shetty
e376e55c90 fix: Keep email.css inside frappe assets 2021-01-12 16:32:25 +05:30
prssanna
f755a60008 fix: disable print margin in ace editor 2021-01-12 14:19:23 +05:30
prssanna
eefb9747c9 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-12 14:17:03 +05:30
prssanna
040923ef4b fix: remove disabled attribute from disabled checkbox 2021-01-12 13:43:27 +05:30
Rushabh Mehta
f8ea6ff9c6 fix(minor): revert force reloading of workspace 2021-01-12 13:34:20 +05:30
Rushabh Mehta
7fd6346bf8 BREAKING CHANGE: rename child tables of Workspace 2021-01-12 13:33:15 +05:30
Rushabh Mehta
a29074c9da
Merge pull request #12192 from rmehta/fix-guest-routing
fix(minor): redirect to login if original route is broken
2021-01-12 11:59:17 +05:30
Rushabh Mehta
779a4f85c3 fix(minor): redirect to login if original route is broken 2021-01-12 11:43:26 +05:30
Suraj Shetty
d0c8b93260 fix: Sync comment update realtime 2021-01-12 11:19:11 +05:30
Suraj Shetty
6cf67c8702 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-11 18:57:00 +05:30
Suraj Shetty
06e6053175 fix: Comment unhandled code 2021-01-11 18:56:54 +05:30
prssanna
0ac0bfcb60 fix: re route issue for new docs 2021-01-11 18:31:44 +05:30
prssanna
3447669465 fix: disabled checkbox design 2021-01-11 17:56:05 +05:30
prssanna
368cc760e0 fix: disabled attribute for disabled checkboxes 2021-01-11 17:41:32 +05:30
prssanna
fe9d598132 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-11 17:38:00 +05:30
prssanna
e44c2cea4f fix: add Tree to view modes 2021-01-11 17:37:49 +05:30
Suraj Shetty
c6f3e8d74a fix: Show owner name for versions of child tables 2021-01-11 17:21:19 +05:30
Suraj Shetty
44358a38f4 fix: Sync comment updates realtime 2021-01-11 17:19:56 +05:30
Suraj Shetty
18eb2a0fb4 fix: Comment update bug
Do not wait for socketio to update owner's timeline... update immediately.
2021-01-11 16:36:40 +05:30
Suraj Shetty
83a13540f7 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-11 16:17:48 +05:30
Suraj Shetty
4d0ecee43f fix: Disable comment box till the comment is created on server-side 2021-01-11 16:17:43 +05:30
prssanna
148f18633c Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-11 15:55:00 +05:30
prssanna
bc580bf848 fix: page form layout 2021-01-11 15:54:47 +05:30
gavin
8c67318c3c fix: Strip HTML only if string is passed, else evaluate like before (#12157) 2021-01-08 15:50:09 +05:30
hasnain2808@gmail.com
51b089e2d6 fix: strip_html breaks when it gets undefined 2021-01-08 15:47:11 +05:30
Suraj Shetty
3b07859e21 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui 2021-01-08 15:38:38 +05:30
Suraj Shetty
8694e48cea fix: Remove unnecessary margin left 2021-01-08 15:38:32 +05:30
Rushabh Mehta
c93368b242 fix(minor): merge develop 2021-01-08 14:35:55 +05:30
Suraj Shetty
fa0c33d7a1 fix: Remove unnecessary z-index from phone icon 2021-01-07 15:54:59 +05:30
Suraj Shetty
04fb383f7f fix: Update disabled-text-color 2021-01-07 13:24:40 +05:30
Suraj Shetty
578bb6f5bc fix: Update grays for better contrast 2021-01-07 12:56:37 +05:30
Rushabh Mehta
4db2fb4062
Merge pull request #12145 from rmehta/build-workspace
feat(minor): Build Workspace, renamed frappe.views.Views => frappe.views.ListViewSelect, fixed recurring dependency issue on grids
2021-01-07 09:30:48 +05:30
prssanna
78340853d8 fix: progress bar background color 2021-01-04 18:37:20 +05:30
prssanna
7843f87a0c fix: overflow in address box 2021-01-04 18:36:07 +05:30
Rushabh Mehta
72a28547ea feat(minor): Build Workspace, renamed frappe.views.Views => frappe.views.ListViewSelect, fixed recurring dependency issue on grids 2021-01-02 14:04:32 +05:30
Rushabh Mehta
6bfd482032
Merge pull request #12143 from rmehta/workspace-routing
fix(routing): removed /space from routing
2021-01-02 10:49:22 +05:30
Rushabh Mehta
864956e30f fix(minor): homepage for frappe and tests 2021-01-01 18:03:06 +05:30
Rushabh Mehta
bb9dead0e4 fix(minor): javascript lint 2021-01-01 16:57:44 +05:30
Rushabh Mehta
1341988530 fix(minor): homepage and tests 2021-01-01 16:54:06 +05:30
Rushabh Mehta
b2686e0623 fix(routing): removed /space from routing 2021-01-01 12:30:35 +05:30