Commit graph

21535 commits

Author SHA1 Message Date
mergify[bot]
7267d4eaff
Merge pull request #8396 from surajshetty3416/fix-timeline
fix: Improper "bold text" in timeline
2019-09-11 05:21:53 +00:00
Suraj Shetty
c89b8fc919 fix: Improper text bold in timeline.js 2019-09-11 09:49:57 +05:30
Suraj Shetty
3b3b90234f fix: Do not bold text parts unwanted
- Complete text finally gets wrapped inside bold
2019-09-11 09:35:51 +05:30
Aditya Hase
9928aa38d7 feat(scheduler): Show popup if scheduler is inactive (#8391) 2019-09-10 17:08:35 +05:30
mergify[bot]
5c5a9af97d
Merge pull request #8389 from adityahase/fix-time
fix(backgorund_job): Convert UTC time to local time
2019-09-10 10:39:10 +00:00
Aditya Hase
2de55ab5c6
fix(backgorund_job): Convert UTC time to local time 2019-09-10 15:50:43 +05:30
Sahil Khan
b53a03e963 Merge branch 'develop' into version-12 2019-09-10 14:36:48 +05:30
Sahil Khan
f0103083ce bumped to version 12.0.12 2019-09-10 14:56:48 +05:50
mergify[bot]
fcb080625c
Merge pull request #8367 from netchampfaris/comment-fullname-fix-d
fix: Fetch fullname from User then Contact
2019-09-10 09:04:04 +00:00
Faris Ansari
183d87a73c fix: Fallback for first_name, last_name 2019-09-10 13:53:14 +05:30
Suraj Shetty
07e273a672 chore: Remove unwanted website.less file (#8384) 2019-09-10 13:36:48 +05:30
Saurabh
dd4761e404
Merge pull request #8380 from nabinhait/bulk-delete-error-handling
fix: Handle error on bulk deletion
2019-09-10 11:26:46 +05:30
Suraj Shetty
7a8c1d3f17
fix(Patch): batch insert query for contacts (#8370)
fix(Patch): batch insert query for contacts
2019-09-10 08:16:25 +05:30
Nabin Hait
b86dbf1c82 fix: Handle error on bulk deletion 2019-09-09 16:18:02 +05:30
Himanshu
cdbf7eae63 fix: remove mandatory for title (#8378) 2019-09-09 13:12:43 +05:30
Suraj Shetty
99b3651a06 fix: Use .get() to avoid attribute error (#8379) 2019-09-09 10:31:30 +05:30
Himanshu Warekar
7377d162d8 fix: list to tuple 2019-09-08 15:39:25 +05:30
Himanshu Warekar
14b4991d62 fix: query 2019-09-08 15:32:02 +05:30
Himanshu Warekar
5039ee03f1 Merge branch 'develop' of https://github.com/frappe/frappe into contacts_patch_fix 2019-09-08 15:06:23 +05:30
mergify[bot]
1436c93a03
Merge pull request #8375 from netchampfaris/duplicate-file-error
fix(File): Use url when uploading duplicate files
2019-09-08 08:41:51 +00:00
mergify[bot]
10ea3964bd
Merge pull request #8376 from netchampfaris/text-overflow-fix
fix: Overflowing values for Text, Small Text
2019-09-08 08:39:44 +00:00
mergify[bot]
70d3d4eeaa
Merge pull request #8377 from netchampfaris/form-save-istable-check
fix: Check istable using meta
2019-09-08 08:38:55 +00:00
Rucha Mahabal
0c44fb837d fix: Dont allow sending Newsletter when there are 0 recipients (#8362) 2019-09-08 13:46:47 +05:30
Shivam Mishra
58b94c561a fix: use doc in webform save (#8353)
* fix: use doc in webform save

* style: better comments

* fix: redirect to successurl fix
2019-09-08 12:29:54 +05:30
Faris Ansari
d3eda5408f fix: Check istable using meta
- Log errors during save in console
2019-09-08 02:31:19 +05:30
Rohan
355fc4b49e feat: allow extending doctype dashboards via hooks (develop) (#8336)
* feat: allow overriding dasboards via hooks

* fix: allow extending dashboard data in hooks

* fix: move logic to generic function

* format: added description to hook
2019-09-08 02:29:43 +05:30
Aditya Hase
7ffd2f4298 fix(cypress): Use cypress:run command (#8352) 2019-09-08 02:27:52 +05:30
gavin
6b5eefbb37 fix: Disable Has Web View section for custom doctypes (#8214) 2019-09-08 02:25:14 +05:30
Faris Ansari
fedf971d71 fix: Overflowing values for Text, Small Text 2019-09-07 23:57:24 +05:30
Faris Ansari
f5ce57ff5f fix(File): Use url when uploading duplicate files
When a duplicate file is uploaded, a file record will be created using
the url of the original file.
2019-09-07 23:39:11 +05:30
Suraj Shetty
33a99f2392 feat: Show signature placeholder in print view (#8354) 2019-09-07 21:18:15 +05:30
Himanshu Warekar
cc96cad445 chore: code cleanup 2019-09-07 17:20:30 +05:30
mergify[bot]
119511ceff
Merge pull request #8371 from hrwX/id_to_help
chore: add id to help
2019-09-07 11:36:05 +00:00
Himanshu Warekar
b015fbf6c3 chore: add id to help 2019-09-07 16:51:52 +05:30
mergify[bot]
208ed0b826
Merge pull request #8368 from sagarvora/fix-smtp
fix: incorrect if condition in smtp module
2019-09-07 10:23:41 +00:00
Himanshu Warekar
b1eb2d1ab6 fix: escape everything! and batch insert query 2019-09-07 14:39:46 +05:30
Faris Ansari
dddb39abb0 fix: Fetch fullname from User then Contact 2019-09-07 13:11:01 +05:30
Sagar Vora
cfd7f8bf37 fix: incorrect if condition in smtp module 2019-09-07 12:54:52 +05:30
Suraj Shetty
639da6ec54
fix(Email): Could not find row fix (#8364)
fix(Email): Could not find row fix
2019-09-07 11:46:13 +05:30
Himanshu Warekar
a5e327216a fix: could not find row fix 2019-09-07 11:32:00 +05:30
mergify[bot]
6b41a07981
Merge pull request #8357 from prssanna/dashboard-fix
fix: dashboard chart get function
2019-09-06 09:05:41 +00:00
prssanna
8962f05f4c fix: whitespace 2019-09-06 13:53:52 +05:30
prssanna
15371ae435 fix: fix dashboard chart tests 2019-09-06 13:26:08 +05:30
mergify[bot]
f4b2616e8d
Merge pull request #8358 from adityahase/fix-file
fix(file): Don't overwrite private files
2019-09-06 07:50:31 +00:00
mergify[bot]
6e264c9e4a
Merge pull request #8356 from prssanna/user-profile-fix
fix: fix monthly and all time rank query
2019-09-06 07:41:48 +00:00
Aditya Hase
5b662ea56b
fix(file): Don't overwrite private files. 2019-09-06 12:56:50 +05:30
prssanna
6f564e46c5 fix: pass chart name or chart object to dashboard get function 2019-09-06 12:51:14 +05:30
prssanna
0a3a157aa4 fix: fix monthly and all time rank query 2019-09-06 12:20:54 +05:30
mergify[bot]
b30cec042b
Merge pull request #8345 from frappe/pr-stale-time
chore: Reduce PR stale and close time
2019-09-06 02:39:27 +00:00
Aditya Hase
fe0c399750
fix(cypress): Use cypress:run command 2019-09-05 17:57:13 +05:30