Commit graph

26178 commits

Author SHA1 Message Date
Mangesh-Khairnar
64c2fa3744 fix: update google api client 2020-06-27 19:54:41 +05:30
Mangesh-Khairnar
e0ad885944 fix: allow users to disable google drive sync 2020-06-27 19:20:38 +05:30
Shivam Mishra
e5a87aa421
style: remove stray console.log (#10722) 2020-06-17 19:37:30 +05:30
Prssanna Desai
9b9bf410ae
Merge pull request #10720 from frappe/mergify/bp/develop/pr-10714
fix: fetch todos with status not equal to cancelled in assigned to sidebar filter (bp #10714)
2020-06-17 16:01:56 +05:30
mergify[bot]
478ff7b940
Merge pull request #10691 from scmmishra/feat-no-backup-option
feat: add option for no backup in remove app
2020-06-17 10:01:34 +00:00
Prssanna Desai
5f119b33ea fix: fetch todos with status not equal to cancelled in assigned to sidebar filter (#10714)
(cherry picked from commit d682a64ebd3d2cd3d307ff06ceca7a729412dda7)
2020-06-17 09:40:19 +00:00
Shivam Mishra
4c6b58da26
fix: update condition that stringified everything (#10718) 2020-06-17 14:36:47 +05:30
Shivam Mishra
c7b09e7b69
fix: minor styling fixes for onboarding subtitle (#10717) 2020-06-17 13:51:03 +05:30
Shivam Mishra
be1da396e2
Merge pull request #10623 from scmmishra/onboarding-ux-fixes 2020-06-17 08:15:28 +00:00
mergify[bot]
3df4c202aa
Merge pull request #10716 from scmmishra/fix-handle-null
fix: stringify objects before sending
2020-06-17 07:14:57 +00:00
Shivam Mishra
595f37bf10 style: space after if 2020-06-17 11:33:16 +05:30
mergify[bot]
d0cb535d83
Merge pull request #10704 from scmmishra/default-desk-page
refactor: get default desk page from allowed workspaces in boot
2020-06-17 05:31:11 +00:00
Shivam Mishra
3ec76fb7e0 fix: stringify objects before sending 2020-06-16 21:46:22 +05:30
mergify[bot]
d5766eb6cc
Merge pull request #10683 from netchampfaris/website-fixes-2020-06-15
fix: Misc website fixes
2020-06-16 15:18:04 +00:00
Shivam Mishra
aa6495e0da
chore: minor changes to language
Co-authored-by: gavin <gavin18d@gmail.com>
2020-06-16 13:32:06 +00:00
Shivam Mishra
68528ca23d
Merge pull request #10688 from scmmishra/dashboard-import
fix: handle import error explicitly
2020-06-16 13:30:42 +00:00
Suraj Shetty
f52a0f863e
Merge branch 'develop' into website-fixes-2020-06-15 2020-06-16 10:57:11 +05:30
Suraj Shetty
7110bf37c5
Merge branch 'develop' into default-desk-page 2020-06-16 10:56:34 +05:30
Suraj Shetty
2acb8321a9 fix: Remove unused code 2020-06-16 10:50:41 +05:30
rohitwaghchaure
c1fb695ece
Merge pull request #10709 from rohitwaghchaure/fixed-travis-for-frappe-patch
fix: travis
2020-06-16 01:35:12 +05:30
Rohit Waghchaure
c161e4d6f2 fix: travis 2020-06-16 01:33:32 +05:30
rohitwaghchaure
4fb73e9f95
Merge pull request #10700 from rohitwaghchaure/fixed-frappe-test-patch-travis-failed-develop
fix: travis for patch
2020-06-16 00:56:00 +05:30
Suraj Shetty
d42ac30759
fix: Query report failure (#10705) 2020-06-15 22:26:53 +05:30
mergify[bot]
4a2b3210fe
Merge pull request #10590 from prssanna/fetch-from-validation
fix: better validation message if fetch from field doesn't exist
2020-06-15 16:53:08 +00:00
Shivam Mishra
69098ae280 refactor: get default desk page from allowed workspaces in boot 2020-06-15 22:17:37 +05:30
mergify[bot]
52e7f1c55c
Merge pull request #10697 from prssanna/removed-assignment
fix: better message for removed assignment
2020-06-15 16:43:18 +00:00
mergify[bot]
981eb23cf5
Merge pull request #10604 from CaseSolvedUK/canonical-10240
feat: Add canonical head link for SEO [v13]
2020-06-15 16:41:04 +00:00
Suraj Shetty
59e8564dc5
Merge branch 'develop' into fetch-from-validation 2020-06-15 22:06:10 +05:30
Suraj Shetty
0f78ba2216
fix: Query report failure (#10701) 2020-06-15 21:54:23 +05:30
mergify[bot]
dcb28bd104
Merge pull request #10678 from AminovE99/feat/expand_list_extensions
feat: Expand list with extensions for template rendering
2020-06-15 16:08:19 +00:00
Rohit Waghchaure
e12364bb02 fix: travis for patch 2020-06-15 20:09:55 +05:30
prssanna
35430c6a8b fix: update header for assignment email 2020-06-15 19:39:23 +05:30
prssanna
1bdb91402d fix: include name of user who removed the assignment 2020-06-15 19:34:11 +05:30
Prssanna Desai
6ed35fd961
fix: fix report print currency formatting (#10584)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-15 17:12:05 +05:30
gavin
ebe0ccdcc1
Merge pull request #10669 from gavindsouza/web-log-name-conflict
fix: rename web.log generated by frappe to frappe.web.log
2020-06-15 16:36:35 +05:30
Emil
edcdb66b92
🎨 Change indetions to tabs
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-15 12:30:44 +03:00
Shivam Mishra
b36b9c1d67 feat: add option for no backup in remove app 2020-06-15 14:28:08 +05:30
Shivam Mishra
970cf01eb0 fix: handle import error explicitly 2020-06-15 13:17:35 +05:30
Shivam Mishra
dab0ab0db0 feat: remove user can dismiss code 2020-06-15 13:12:58 +05:30
mergify[bot]
95e5cd97d2
Merge pull request #10664 from adityahase/fix-remove-from-installed-apps
fix: Bypass ORM for removing apps from installed_apps list
2020-06-15 07:05:14 +00:00
Faris Ansari
48b6c9543c
fix: Set fallback base_template if source found (#10670)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-15 12:17:25 +05:30
Faris Ansari
a0860c1ac9 fix: Pass context so that it can be inspected in hook methods 2020-06-15 11:57:34 +05:30
Faris Ansari
d10470dc0d fix: Render page_toc if it exists 2020-06-15 11:56:42 +05:30
rohitwaghchaure
517a3f5e32
Merge pull request #10679 from surajshetty3416/fix-query-report-filter-random-failure
fix: Refactor report settings selection to avoid random failure
2020-06-15 10:42:55 +05:30
Suraj Shetty
2bbe449717 fix: Refactor report settings selection to avoid random failure 2020-06-14 19:16:17 +05:30
Emil
8a9ba93119
🎨 change construction for not in
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 14:31:17 +03:00
mergify[bot]
035b31c4c4
Merge pull request #10675 from ruchamahabal/fix-dashboard-chart-permission-query
fix: permission query for dashboard chart and number card
2020-06-14 10:47:37 +00:00
Emil
267d3119f1
🐛 Return way of checking path
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 13:26:43 +03:00
Rucha Mahabal
db4166279e fix: permission query for number card 2020-06-14 15:20:53 +05:30
Emil
3bc66bfea1
add another way to check path
Signed-off-by: Emil <amionv99@gmail.com>
2020-06-14 12:28:21 +03:00