Commit graph

1040 commits

Author SHA1 Message Date
Gavin D'souza
f9bf0c1951 fix: remove Frappe Cloud migrator logic from frappe 2020-07-09 20:22:21 +05:30
Suraj Shetty
5e8422ae42 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-07-06 13:19:59 +05:30
Suraj Shetty
b4fc08883a
Merge branch 'develop' into fix-sync-password 2020-07-01 13:01:02 +05:30
Chinmay D. Pai
adadb26732
chore: only validate s3 settings if enabled
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-30 17:55:25 +05:30
Shivam Mishra
a862fab4dd feat: add icons to desk pages 2020-06-30 16:39:09 +05:30
Mangesh-Khairnar
001a7dc59d
chore: remove whitespace from translatable string
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-30 10:20:53 +05:30
Chinmay Pai
f8377a515a
Merge pull request #10837 from Mangesh-Khairnar/disable-google-drive 2020-06-27 20:10:49 +05:30
Mangesh-Khairnar
e0ad885944 fix: allow users to disable google drive sync 2020-06-27 19:20:38 +05:30
Mangesh-Khairnar
d213f0c4b6
fix(google-drive): check file list before finding latest (#10767)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-24 11:18:47 +05:30
Sahil Khan
2a303d0ffd feat: take site_config backup
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-22 17:00:03 +05:30
Mangesh-Khairnar
25667cde1e fix(google-calendar): pass page token to load the next set of events 2020-06-22 16:43:27 +05:30
Mangesh-Khairnar
010dbc402e fix(google-calendar): reset sync token incase of invalid next sync token 2020-06-22 16:29:44 +05:30
Gavin D'souza
2f332f75c5 fix: dont overwrite upload status 2020-06-15 12:49:08 +05:30
Gavin D'souza
fd25401273 fix(migrate-to): retry if network errors occur 2020-06-15 12:36:45 +05:30
Suraj Shetty
f322a7a4a8
Merge branch 'develop' into dropbox-email-fix 2020-06-09 08:15:48 +05:30
Mangesh-Khairnar
a9a8fc953f fix: update the checksum logic 2020-06-08 17:06:48 +05:30
Mangesh-Khairnar
eefa54bcaa Merge branch 'develop' of https://github.com/frappe/frappe into paytm-integration 2020-06-03 11:24:01 +05:30
Faris Ansari
1f1c7b1390 fix: Init site before calling migrate_to
Locals are not initialized otherwise which is required to access site_config
2020-06-02 12:58:50 +05:30
Mangesh-Khairnar
0781d048d1 fix: add docs link to the settings page dashboard 2020-06-02 12:33:01 +05:30
mergify[bot]
eabdb84947
Merge pull request #10528 from gavindsouza/migrate-to-new-feat
feat(migrate-to): switch Teams and restore existing Sites
2020-06-02 06:57:42 +00:00
Suraj Shetty
4e1ad550ec
Merge branch 'develop' into rpay-webhook-verification 2020-06-01 07:58:04 +05:30
Suraj Shetty
06c54f5322
Merge branch 'develop' into paytm-integration 2020-05-30 21:08:47 +05:30
Shivam Mishra
55aca943c3 feat: make verification function python 3 only 2020-05-29 14:09:19 +05:30
Shivam Mishra
2ef76f2572 style: linting fixes 2020-05-29 13:24:04 +05:30
Shivam Mishra
5e7fcb46f2 refactor: use six instead of sys.version_info 2020-05-29 13:22:52 +05:30
Chinmay D. Pai
3d0529c18c
fix: send email for successful backup only if checked
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-29 13:15:16 +05:30
Mangesh-Khairnar
7a6746bf32
fix(google-contacts): add additional params to prevent rate limiting (#10491) 2020-05-29 11:42:34 +05:30
Gavin D'souza
4f99b5879e fix: set frappecloud_url in conf to override specified url 2020-05-28 20:28:55 +05:30
Gavin D'souza
a65be3e22a fix: undefined variables 2020-05-28 18:51:17 +05:30
Gavin D'souza
a1ee529cb7 fix: show only Active and Broken sites in Sites List 2020-05-28 18:42:06 +05:30
Gavin D'souza
b8138004d9 feat: allow restoring to existing FC sites 2020-05-28 18:20:02 +05:30
Gavin D'souza
aabbfb8df8 feat: switch teams if you are a part of multiple 2020-05-28 18:17:41 +05:30
karthikeyan5
bba7336b6c fix(dropbox): dropbox timeout for large files 2020-05-27 08:39:50 +05:30
Shivam Mishra
2813a0edc1 feat: added webhook hmac verification 2020-05-22 13:31:49 +05:30
Gavin D'souza
f7f81a0843 chore: add missed import 2020-05-15 17:52:40 +05:30
Gavin D'souza
7a58cbeff2 fix: hardcode url frappe.cloud => frappecloud.com 2020-05-15 16:30:17 +05:30
Faris Ansari
4af13edc87 fix: Remove hardcoded url 2020-05-15 16:13:16 +05:30
Faris Ansari
ce734e88e5
Merge branch 'develop' into migrate-to 2020-05-15 15:34:03 +05:30
Faris Ansari
a8c01a0915 fix: Success message 2020-05-15 15:32:13 +05:30
Gavin D'souza
db3b57116d fix: consistent UI and minor fixes 2020-05-15 15:16:56 +05:30
Gavin D'souza
85d86fbedf refactor: moved remote_migrations to
frappe.integrations.frappe_providers

fix: exit code fixes and minor bug fix
2020-05-15 11:21:24 +05:30
mergify[bot]
41d0d22edc
Merge pull request #10298 from Mangesh-Khairnar/fix-google-contacts-isse
fix(google-contact): remove parent kwarg from create contact
2020-05-13 17:33:13 +00:00
Mangesh-Khairnar
4f3c40ae3d fix(google-contact): remove parent kwarg from create contact 2020-05-12 15:52:03 +05:30
Chinmay D. Pai
9b6f0a2e4c
fix: use doctype instead of service name to send email
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-08 20:18:08 +05:30
Suraj Shetty
97f6d8f209
Merge branch 'develop' into s3-backup-update 2020-05-03 12:54:38 +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
Gavin D'souza
a09e0f339b fix(webhooks): error message on invalid json 2020-05-01 14:19:59 +05:30
Mangesh-Khairnar
25c9ac0022 chore: remove initial validation check 2020-04-22 16:12:49 +05:30
Mangesh-Khairnar
6eaefb35c7 fix: add finalize request to complete the transaction 2020-04-22 11:40:08 +05:30