Commit graph

26197 commits

Author SHA1 Message Date
prssanna
fa3c6096c5 style: missing semicolons 2020-06-18 14:50:45 +05:30
prssanna
3ec8f85746 fix: trigger stopped typing on doc close 2020-06-18 14:50:45 +05:30
prssanna
1afdc6b992 feat: show users that are currently typing on the form 2020-06-18 14:50:45 +05:30
mergify[bot]
69fc7812ae
Merge pull request #10684 from anupamvs/calendar-view-fix
fix: Calendar View allDay fix
2020-06-18 07:45:55 +00:00
Faris Ansari
0f3a24d0da
Merge pull request #10726 from netchampfaris/website-fixes-2020-06-18 2020-06-18 13:10:24 +05:30
Faris Ansari
0b84f21675 fix: Breadcrumb alignment with sidebar 2020-06-18 13:09:02 +05:30
mergify[bot]
0c240b1821
Merge pull request #10686 from gavindsouza/migrate-to-retry
fix(migrate-to): Auto-retries in case of request failures
2020-06-18 07:31:54 +00:00
Faris Ansari
ec060e0aa3 fix: Remove redundant macro 2020-06-18 12:41:25 +05:30
Faris Ansari
dd51790920 fix: Doc layout
- Add breadcrumbs
- Overridable page_toc block
2020-06-18 12:41:23 +05:30
Faris Ansari
9853187200 fix: Add embed-container 16:9 box styling
Can be used for embeds like videos or embedded code blocks
2020-06-18 12:41:22 +05:30
Faris Ansari
b6a95530a6 fix: Styling for caption below image 2020-06-18 12:41:16 +05:30
Faris Ansari
38f590c1c6 fix: Style breadcrumb container using class 2020-06-18 12:41:10 +05:30
Gavin D'souza
1120982db8 Merge branch 'develop' of github.com:frappe/frappe into calendar-view-fix 2020-06-18 09:39:50 +05:30
gavin
50c6541cd7
fix: Don't pass errored subprocess build
An error like
```subprocess.CalledProcessError: Command '['git', 'diff', '--name-only', '95e5cd97d24d9ce809b8287443e9be230a230179...16f5e48fcbc38aca76cbc5ef531491dfd15d0707']' returned non-zero exit status 128.``` exits with code 1 and exits the build and sets the build as successful
2020-06-18 09:38:47 +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
Himanshu
16f5e48fcb
Update calendar.js 2020-06-17 14:12:44 +05:30
Anupam K
443edf209a calendar view fix 2020-06-17 14:02:30 +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
Anupam K
a3ab33f4da sider fix 2020-06-17 13:44:51 +05:30
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
Suraj Shetty
921d549350
Merge branch 'develop' into migrate-to-retry 2020-06-15 19:24:15 +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