Commit graph

21267 commits

Author SHA1 Message Date
Himanshu
eb9b034c2b
Update frappe/integrations/doctype/google_settings/google_settings.js
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 15:34:01 +05:30
Himanshu
b320318878
Update frappe/integrations/doctype/google_contacts/google_contacts.js
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 15:33:54 +05:30
Himanshu Warekar
43ce576e49 chore: rename drive to contacts 2019-08-23 13:54:43 +05:30
Himanshu Warekar
a8ff36ec0b fix: ux fixes for google integrations 2019-08-23 13:51:29 +05:30
rohitwaghchaure
5c7d1fd1ae
Merge pull request #8182 from rohitwaghchaure/fix_using_custom_script_barcode_not_working
fix: using custom script barcode is not generated
2019-08-23 11:48:07 +05:30
mergify[bot]
57dd1757ef
Merge pull request #8203 from prssanna/created-by
feat: Add 'Created By' to default sidebar filters
2019-08-23 05:53:40 +00:00
mergify[bot]
3b104f593d
Merge pull request #8242 from netchampfaris/website-theme-font-awesome
fix: Include font-awesome in website.scss
2019-08-23 04:56:37 +00:00
mergify[bot]
7a1da3a9bd
Merge pull request #8245 from scmmishra/webform-payment-redirect
fix: redirect after payment
2019-08-22 17:18:41 +00:00
Shivam Mishra
ec5917a682 fix: redirect after payment 2019-08-22 19:21:12 +05:30
Faris Ansari
ea0737fc06 fix: Include font-awesome in website.scss 2019-08-22 17:36:36 +05:30
mergify[bot]
1de4dd9cb2
Merge pull request #8236 from hrwX/xss_ignore_webpage
fix(Webpage): ignore xss for html field
2019-08-22 08:06:11 +00:00
Sahil Khan
175818675d Merge branch 'develop' into version-12 2019-08-22 13:08:23 +05:30
Sahil Khan
c3a9449f92 bumped to version 12.0.8 2019-08-22 13:28:23 +05:50
Himanshu Warekar
e98a42780d fix: ignore xss for html field 2019-08-22 13:07:50 +05:30
rohitwaghchaure
684d3887ab
Merge pull request #8235 from rohitwaghchaure/unknown_column_seen_in_database
fix: Unknown column seen in field list
2019-08-22 12:13:15 +05:30
Rohit Waghchaure
06c8503142 fix: Unknow column seen in field list 2019-08-22 12:11:46 +05:30
mergify[bot]
807e39efe1
Merge pull request #8234 from hrwX/misc_fixes
chore: codacy fixes
2019-08-22 06:27:20 +00:00
Himanshu Warekar
37565bfefa chore: codacy fixes 2019-08-22 10:11:25 +05:30
mergify[bot]
596f80a7f9
Merge pull request #8157 from hrwX/gdrive
feat(Google Drive): Google Drive
2019-08-21 18:29:56 +00:00
Himanshu Warekar
2ba5f6e0ac fix: remove unnecessary check 2019-08-21 23:20:40 +05:30
Himanshu Warekar
6ae434c937 fix: codacy 2019-08-21 21:50:40 +05:30
Himanshu Warekar
2373014e11 fix: codacy 2019-08-21 21:32:16 +05:30
Himanshu Warekar
b4084de9ab fix: create folder if not exists 2019-08-21 19:04:38 +05:30
Himanshu Warekar
8e578d3b0f fix: find folder if already exists 2019-08-21 18:22:29 +05:30
Himanshu Warekar
38e2fad23a fix: do not show take backup if not enable 2019-08-21 17:57:12 +05:30
Himanshu Warekar
c33317ccf8 fix: reset folder id on reauthorize 2019-08-21 17:45:54 +05:30
Himanshu Warekar
1abf318b49 fix: import enqueue 2019-08-21 17:40:38 +05:30
Himanshu Warekar
9b70c01e87 fix: queue google drive backup 2019-08-21 17:37:48 +05:30
Himanshu Warekar
7aa975a98f fix: upload gz files 2019-08-21 17:23:09 +05:30
Himanshu Warekar
951cb5459b fix: dashboard headline 2019-08-21 16:54:17 +05:30
Himanshu Warekar
bb1c1c150c fix: reset auth refresh token when email change 2019-08-21 16:44:43 +05:30
Prssanna Desai
1fb0f9df89 fix: PyYAML version in requirements (#8219) 2019-08-21 14:27:34 +05:30
mergify[bot]
3bdb4313ef
Merge pull request #8188 from surajshetty3416/enhance-energy-point-system
feat(eps): Add ability to make point rule for document creation
2019-08-21 08:38:20 +00:00
mergify[bot]
005c1951b0
Merge pull request #8204 from ashish-greycube/patch-8
fix(email): AttributeError: 'Message' object has no attribute 'encode' #8148
2019-08-21 08:20:12 +00:00
mergify[bot]
5c24a25d12
Merge pull request #8213 from netchampfaris/msgprint-anchor-tags
fix: Underline anchor tags in msgprint
2019-08-21 08:11:46 +00:00
mergify[bot]
49a8cbd546
Merge pull request #8215 from netchampfaris/dashboard-chart-results
fix: Add date for last period if results exists
2019-08-21 08:07:54 +00:00
Suraj Shetty
3eb6a22989
fix: Remove unwanted str() 2019-08-21 13:28:14 +05:30
Suraj Shetty
ad28a6aefe fix: Remove checkbox instead add select option with doc events
- Add options for special Doc Events like New, Submit and Cancel
2019-08-21 12:52:15 +05:30
Ashish Shah
4c7cbd6d7a
Update receive.py 2019-08-21 12:01:06 +05:30
Himanshu Warekar
917b410632 fix: refresh form after creating folder 2019-08-21 11:06:00 +05:30
Himanshu Warekar
6a9d995a2b chore: remove test files 2019-08-20 20:25:54 +05:30
Himanshu Warekar
f8126340b9 Merge branch 'version-12-hotfix' of https://github.com/frappe/frappe into gdrive 2019-08-20 20:22:02 +05:30
Himanshu Warekar
cab10700f4 fix: show headline when no refresh token 2019-08-20 20:20:59 +05:30
Himanshu Warekar
34d729a468 fix: backup path 2019-08-20 19:54:03 +05:30
Himanshu Warekar
3f6ced434f fix: private files path 2019-08-20 19:49:39 +05:30
Faris Ansari
93dffdf493 fix: Add date for last period if results exists 2019-08-20 19:05:36 +05:30
Faris Ansari
e3f0f62448 fix: Underline anchor tags in msgprint 2019-08-20 18:37:42 +05:30
mergify[bot]
87074ae149
Merge pull request #8205 from netchampfaris/add-events-for-workflow-action
feat: Add events for Workflow Action
2019-08-20 12:34:34 +00:00
Saurabh
e5a03d3180
Merge pull request #8212 from sahil28297/merge_v12_hotfix_1
Merge version-12-hotfix into develop
2019-08-20 17:49:46 +05:30
Sahil Khan
9b65a7c4a1 Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:09:39 +05:30