Suraj Shetty
ffd74ef356
chore: Semantic PR check is not required if Squash label is added
2021-02-09 22:40:51 +05:30
mergify[bot]
67d2c165c1
Merge pull request #12107 from frappe/letter-head-disabled-and-default-validation
...
fix: letter head disabled and default validation issues
2021-02-09 17:01:08 +00:00
mergify[bot]
1e375a2345
Merge pull request #12177 from pilou-/create_notification_settings_remove_commit
...
fix: Ensure rollback works with User entity
2021-02-09 16:55:07 +00:00
Suraj Shetty
5af5165218
Merge branch 'develop' into letter-head-disabled-and-default-validation
2021-02-09 22:15:33 +05:30
Rushabh Mehta
ba053c190e
chore(Snyk): Security upgrade cryptography from 3.2 to 3.3.2 ( #12350 )
...
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-09 19:12:41 +05:30
Rushabh Mehta
7196040481
chore(Snyk): Security upgrade rsa from 4.5 to 4.7 ( #12352 )
...
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-RSA-1038401
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2021-02-09 16:30:33 +05:30
mergify[bot]
7cf91eb400
Merge pull request #12330 from netchampfaris/feat-default-site-env-var
...
feat: Set default site using FRAPPE_SITE env var
2021-02-09 11:00:15 +00:00
Suraj Shetty
47d6e7c22f
Merge pull request #12354 from surajshetty3416/design-fixes
2021-02-09 16:16:19 +05:30
Suraj Shetty
8ea6a8eb10
fix: Typo
2021-02-09 16:13:11 +05:30
Suraj Shetty
206a26f9df
fix: Enable send_me_a_copy option
2021-02-09 16:10:44 +05:30
Suraj Shetty
2cdd686cdd
fix: Minimized modal shadow to make it more visible
2021-02-09 16:09:22 +05:30
Suraj Shetty
c4c79ab8f6
fix: Control in BG in dark mode
2021-02-09 16:08:42 +05:30
Prssanna Desai
bf4cb6f39e
Merge pull request #12351 from frappe/rebrand-ui-fixes
2021-02-09 15:54:50 +05:30
Prssanna Desai
474f6468bc
Merge pull request #12329 from shariquerik/RTL-print-preview-fix
2021-02-09 15:48:25 +05:30
shariquerik
73f7fff00f
fix: fixed sider
2021-02-09 15:18:34 +05:30
Prssanna Desai
09794aac9c
Merge pull request #12332 from prssanna/pdf-image
2021-02-09 14:14:15 +05:30
prssanna
4996d79322
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui-fixes
2021-02-09 14:12:04 +05:30
prssanna
59b56cf14a
fix: restricted button style fix
2021-02-09 14:11:26 +05:30
Faris Ansari
5c7197a790
fix: Set default site for socketio using env var
2021-02-09 13:39:59 +05:30
mergify[bot]
0fd1a39369
Merge pull request #12160 from resilient-tech/feat-camera-attach
...
feat: ability to attach photo from webcam
2021-02-09 08:05:16 +00:00
prssanna
241ad01929
fix: grid form scrollable style
2021-02-09 13:30:46 +05:30
prssanna
f86335551b
fix: dropdown hidden in grid form
2021-02-09 13:30:12 +05:30
Suraj Shetty
205d1217b8
Merge pull request #12346 from surajshetty3416/misc-fixes-8-feb-2021
2021-02-08 20:14:06 +05:30
Suraj Shetty
7ec36b6d52
fix: Remove unnecessary line-height
2021-02-08 18:37:47 +05:30
Suraj Shetty
3cadc52fb3
fix: Update style for disabled checkbox
2021-02-08 18:31:13 +05:30
Suraj Shetty
f00ab6f3c9
fix: Typo in timeline
2021-02-08 18:30:51 +05:30
Suraj Shetty
3529955615
fix: Use SVG icon for link arrow
2021-02-08 18:30:29 +05:30
Suraj Shetty
2407263d1f
feat: Add arrow-right icon
2021-02-08 18:29:52 +05:30
walstanb
79b2f17dd1
fix: centered buttons
2021-02-08 18:25:43 +05:30
prssanna
0d693d72e6
fix: dark theme button styles
2021-02-08 16:52:59 +05:30
prssanna
3c2708d66f
fix: restricted button style
2021-02-08 16:52:14 +05:30
Faris Ansari
c740b40d61
Merge pull request #12325 from netchampfaris/fix-website-rules-cache-dev-mode
...
fix: Dont cache website rules in development
2021-02-08 16:28:06 +05:30
walstanb
196a534c0e
fix: failing ui test cases
2021-02-08 15:56:12 +05:30
Faris Ansari
d7b531e63c
Merge remote-tracking branch 'upstream/develop' into feat-camera-attach
2021-02-08 13:25:15 +05:30
Faris Ansari
ce4cf6035e
fix: formatting and cleanup
2021-02-08 13:23:24 +05:30
Faris Ansari
9b6d353b4d
fix: Stop media stream on dialog hide
2021-02-08 13:23:01 +05:30
shariquerik
b42c3d05cc
fix: updated is_rtl function
2021-02-08 12:32:07 +05:30
Suraj Shetty
473cb16093
fix: Miscellaneous changes ( #12343 )
2021-02-08 12:05:37 +05:30
prssanna
96f0bab661
Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui-fixes
2021-02-08 11:45:27 +05:30
prssanna
15969a2f83
fix: remove deleted file from build
2021-02-08 11:44:11 +05:30
prssanna
05fdd6d0da
fix: dashboard shortcut route on workspace
2021-02-08 11:43:50 +05:30
mergify[bot]
1133f40dd2
fix: Don't overwrite source_name if source_name is defined (bp #12280 ) ( #12341 )
...
Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-07 12:49:43 +05:30
shariquerik
e992e638f9
fix: Added has_rtl function on client side
2021-02-07 12:42:06 +05:30
mergify[bot]
4d9b8f86f6
fix: Anomalous behaviour of save button (bp #12326 ) ( #12336 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2021-02-06 11:45:10 +05:30
mergify[bot]
99f0b223ce
Merge pull request #12338 from hasnain2808/compile-re-before-execute
...
fix: trailing spaces match only when re compile
2021-02-06 03:17:47 +00:00
hasnain2808@gmail.com
81a7626815
fix: use search instead of match
2021-02-06 00:06:40 +05:30
hasnain2808@gmail.com
521968e72b
fix: trailing spaces match only when re compile
2021-02-05 21:54:12 +05:30
mergify[bot]
bf4b80aa9c
Merge pull request #12333 from netchampfaris/misc-fixes-2021-02-04
...
fix: Misc fixes
2021-02-05 09:02:30 +00:00
Faris Ansari
46d2ede2e3
fix: Use hooks for handling /desk and /app routes
...
No need for random if statements, use the framework!
2021-02-05 13:05:14 +05:30
prssanna
898922f03e
fix: letterhead image doesn't show up in pdf
2021-02-05 11:45:40 +05:30
