Commit graph

418 commits

Author SHA1 Message Date
mergify[bot]
99c73bfae1
Merge pull request #8243 from hrwX/contacts-ref
feat(Contacts): Multiple emails and phones in a contact
2019-08-31 18:08:58 +00:00
Rushabh Mehta
64b409134a
Merge pull request #8264 from Alchez/dev-webhook-json
feat: allow forming JSON requests in webhook  (develop)
2019-08-30 09:31:03 +05:30
mergify[bot]
d4c801ef3d
Merge pull request #8288 from hrwX/gs-fix
fix: js translation for google settings
2019-08-29 13:07:34 +00:00
Himanshu Warekar
52d9b3b749 fix: translations 2019-08-29 18:12:57 +05:30
mergify[bot]
e039167dc1
Merge pull request #8122 from danielmorlock/develop
feat: properly support multiple email values in ldap entries.
2019-08-29 05:31:11 +00:00
Himanshu Warekar
4b750f7c02 fix: js translation for google settings 2019-08-29 02:08:45 +05:30
Rohan Bansal
85614fa8be test: fix header assertion 2019-08-28 16:55:15 +05:30
Rohan Bansal
d768763da4 test: fix tests 2019-08-28 16:55:10 +05:30
Rohan Bansal
ef31f44a0b test: add tests for webhook additions 2019-08-27 16:27:22 +05:30
Rohan Bansal
2e86ed58ec feat: allow forming JSON requests in webhook 2019-08-26 15:09:17 +05:30
Himanshu Warekar
5ca8bbdd36 Merge branch 'develop' of https://github.com/frappe/frappe into contacts-ref 2019-08-26 12:51:26 +05:30
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
Himanshu Warekar
378bbc5ed0 fix: review changes 2019-08-22 23:15:36 +05:30
Himanshu Warekar
23216591f0 Merge branch 'develop' of https://github.com/frappe/frappe into contacts-ref 2019-08-22 09:19:27 +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
Himanshu Warekar
8a978b1f6c Merge develop into contacts-ref 2019-08-21 13:19:20 +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
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
Sahil Khan
9b65a7c4a1 Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:09:39 +05:30
Himanshu Warekar
612a7336e8 fix: folder creation 2019-08-19 19:29:43 +05:30
Himanshu Warekar
7a5b0a7575 fix: folder creation 2019-08-19 18:55:45 +05:30
Himanshu Warekar
1b78800351 fix: create folder 2019-08-19 18:34:32 +05:30
Himanshu Warekar
f56e0fa5ab fix: folder creation 2019-08-19 18:14:59 +05:30
Himanshu Warekar
f3bc7b0e30 fix: single value 2019-08-19 17:52:35 +05:30
Himanshu Warekar
c7a40c7b39 chore: codacy 2019-08-19 11:59:15 +05:30
Himanshu Warekar
1480cb3285 fix: show dashboard if gdrive is disabled 2019-08-16 20:36:16 +05:30
Himanshu Warekar
b4bb801f59 fix: return if file not found 2019-08-16 20:29:55 +05:30
Himanshu Warekar
babefc7380 chore: code cleanup 2019-08-16 20:27:06 +05:30
Himanshu Warekar
e2e76055d8 fix: handle ioerror 2019-08-16 20:25:01 +05:30
Himanshu Warekar
cee21f1a70 fix: file name 2019-08-16 17:14:21 +05:30
Himanshu Warekar
a709d9bcb1 fix: redirect 2019-08-16 17:07:45 +05:30
Himanshu Warekar
6d2a072b9a fix: scopes 2019-08-16 17:03:03 +05:30