Commit graph

25001 commits

Author SHA1 Message Date
Suraj Shetty
175fcf92be fix: Do not set contribution_docname because it will not exist in new server 2020-05-04 14:55:27 +05:30
mergify[bot]
9081cb976f
Merge pull request #10216 from sagarvora/patch-6
fix(python 3.8): explicit digestmod in hmac.new
2020-05-04 08:36:28 +00:00
mergify[bot]
46e42071d4
Merge pull request #9742 from ruchamahabal/event_streaming_mapping_fix
feat(Event Streaming): Configure dependency mapping and default values for sync
2020-05-04 08:29:45 +00:00
Faris Ansari
741dc2c47e
Merge pull request #9636 from surajshetty3416/contextual-translation 2020-05-04 12:28:17 +05:30
mergify[bot]
3f0ca5743f
Merge pull request #10218 from rohitwaghchaure/fixed-get_default_contact-issue
fix: '>' not supported between instances of 'int' and 'NoneType'
2020-05-04 03:57:53 +00:00
Rohit Waghchaure
ee0e4e0a44 fix: '>' not supported between instances of 'int' and 'NoneType' 2020-05-03 20:46:21 +05:30
Suraj Shetty
afe31ac7c0 style: Fix few deepsource issues 2020-05-03 19:31:20 +05:30
Suraj Shetty
ca6e910743
Merge branch 'develop' into contextual-translation 2020-05-03 18:52:46 +05:30
Suraj Shetty
001127ce42
Merge pull request #10217 from surajshetty3416/improve-progress 2020-05-03 18:51:48 +05:30
Suraj Shetty
41c5b35636 feat: Show percent complete with progress bar 2020-05-03 18:45:40 +05:30
Suraj Shetty
ba162425ac test: Add translation extraction test 2020-05-03 18:41:19 +05:30
Sagar Vora
28cd2c66f9
fix(python 3.8): explicit digestmod in hmac.new 2020-05-03 18:15:22 +05:30
Suraj Shetty
b1f3aa576c fix: Move patch to right folder 2020-05-03 16:21:06 +05:30
Suraj Shetty
a2facbd9d3 Merge branch 'develop' of https://github.com/frappe/frappe into contextual-translation 2020-05-03 16:01:52 +05:30
Suraj Shetty
fdd06a6bf5 Merge branch 'contextual-translation' of https://github.com/frappe/frappe into contextual-translation 2020-05-03 15:55:47 +05:30
Suraj Shetty
b59d2f7c7e chore: Update Translations 2020-05-03 10:23:48 +00:00
Chinmay Pai
aacfdeeb10
Merge pull request #9843 from P-Froggy/feat-email-improvements 2020-05-03 15:09:47 +05:30
Suraj Shetty
a32bf5c5b1 fix: Translation strings 2020-05-03 13:17:35 +05:30
mergify[bot]
6851abf2e2
Merge pull request #9936 from Thunderbottom/s3-backup-update
fix(s3): make backup files optional and ux fixes
2020-05-03 07:37:41 +00:00
Suraj Shetty
97f6d8f209
Merge branch 'develop' into s3-backup-update 2020-05-03 12:54:38 +05:30
Suraj Shetty
541e86d358 style: Fix formatting 2020-05-03 12:30:30 +05:30
Suraj Shetty
af093561fb Merge branch 'develop' of https://github.com/frappe/frappe into contextual-translation 2020-05-03 12:28:13 +05:30
Suraj Shetty
be885caf81 Merge branch 'contextual-translation' of https://github.com/surajshetty3416/frappe into contextual-translation 2020-05-03 12:27:28 +05:30
mergify[bot]
32541ca6ad
Merge pull request #10160 from sagarvora/patch-4
fix: werkzeug.exceptions.BadRequestKeyError
2020-05-02 17:46:09 +00:00
Suraj Shetty
f1e050a348
Merge branch 'develop' into patch-4 2020-05-02 23:02:40 +05:30
mergify[bot]
4d937584f9
Merge pull request #10209 from gavindsouza/webhooks-validate
fix(webhooks): error message on invalid json
2020-05-02 15:30:17 +00:00
Gavin D'souza
5a3f2380d1 fix: handle specific exceptions and add exc title 2020-05-02 19:05:44 +05:30
Suraj Shetty
904889522f
Merge branch 'develop' into patch-4 2020-05-02 09:44:14 +05:30
Suraj Shetty
c733e52d19
Merge pull request #10154 from surajshetty3416/remove-web-view 2020-05-02 09:43:10 +05:30
Suraj Shetty
a39994617c
Merge branch 'develop' into patch-4 2020-05-01 19:50:39 +05:30
Afshan
cf878a2f4d
fix: Use text instead of icon to show or hide password (#10200)
* reversed the order of visibility icon in password field that show/hide the password

* implemented changes the way suggested by suraj

* requested changes implemented

* fix: Make Show/Hide text smaller

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2020-05-01 14:01:45 +00:00
mergify[bot]
1a46e74ea9
Merge pull request #10213 from marination/report-dashboard-chart
fix: Missing argument on Creating Report Chart
2020-05-01 13:53:14 +00:00
marination
3cae5980c9 fix: Missing argument on Creating Report Chart 2020-05-01 18:59:34 +05:30
mergify[bot]
b553834bd4
Merge pull request #10211 from prssanna/chart-date-range-fix
fix: Date Range for Dashboard Charts
2020-05-01 13:15:12 +00:00
Suraj Shetty
09e2e426b2
Merge branch 'develop' into remove-web-view 2020-05-01 18:44:12 +05:30
Suraj Shetty
61d47f9120
Merge pull request #10212 from surajshetty3416/fix-translation-linter 2020-05-01 18:43:44 +05:30
Afshan
b28eac2beb added flag to skip deleted files from check 2020-05-01 18:34:12 +05:30
mergify[bot]
4eba3bc60f
Merge pull request #10210 from prssanna/number-card-fix
fix: Number Card improvements
2020-05-01 11:58:58 +00:00
Suraj Shetty
f3d553d05f
style: Fix formatting 2020-05-01 17:15:43 +05:30
prssanna
48b39a0a2b fix: convert to date to datetime 2020-05-01 16:27:24 +05:30
Suraj Shetty
4638272475
Merge branch 'develop' into contextual-translation 2020-05-01 15:40:48 +05:30
prssanna
5f3d9d2b98 fix: fix description of is_public field 2020-05-01 15:24:08 +05:30
prssanna
ae2bedd457 fix: set is_public permlevel as 0 for dashboard charts 2020-05-01 15:22:38 +05:30
prssanna
2fc6663473 fix: confirm before resetting customizations 2020-05-01 15:20:41 +05:30
prssanna
f1bed50a85 fix: underline customize option on hover 2020-05-01 15:20:41 +05:30
prssanna
9b79174924 fix: number style 2020-05-01 15:20:41 +05:30
Gavin D'souza
a09e0f339b fix(webhooks): error message on invalid json 2020-05-01 14:19:59 +05:30
Faris Ansari
a4b68338a4
Merge pull request #10208 from netchampfaris/hero-image-object-contain 2020-05-01 14:03:43 +05:30
Faris Ansari
00eb6506a4 fix: Aspect ratio fix for Safari 2020-05-01 14:03:12 +05:30
Prssanna Desai
6bf7ce6501
Merge pull request #10124 from Thunderbottom/blog-sanitize
fix: sanitize blog category before rendering
2020-05-01 13:38:01 +05:30