vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
28063 commits 1 branch 0 tags 587 MiB
Commit graph

566 commits

Author SHA1 Message Date
Suraj Shetty
0c929a4435 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-25 14:34:31 +05:30
Saurabh
534cf5c512
fix: Handle empty conditions in s3 backup (#11258) 2020-08-24 16:38:51 +05:30
mergify[bot]
2d074541f8
Merge pull request #11332 from Mangesh-Khairnar/add-dashbord-changes 
fix: Add validation for twilio sid and token
 2020-08-21 15:32:46 +00:00
Saurabh
fa1e8aef02
fix: upload file backup on S3 (#11326) 
1. if file backup is scheduled, and system not have file backup tar t…hen prepare files bakcup before uploading it to s3

2. fix regex for public files
 2020-08-21 15:58:32 +05:30
Mangesh-Khairnar
0631055369 feat: add validation for twilio credentials 2020-08-19 22:32:45 +05:30
mergify[bot]
e819c75734
Merge pull request #11217 from gavindsouza/rename-backups 
fix: fetch correct backup files
 2020-08-15 06:04:50 +00:00
Gavin D'souza
9e00039351 style: Black 2020-08-14 17:25:18 +05:30
Mangesh-Khairnar
b49571f9b3
feat(notification): Add WhatsApp/SMS channels (#9623) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-08-13 17:53:09 +05:30
Suraj Shetty
4863d511ab Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-08-10 17:09:20 +05:30
gavin
5b3fa971b5 Revert "fix: add a distinct identifier for public files backup (#11201)" 
This reverts commit ef4a28e10c.
 2020-08-07 13:14:29 +05:30
Gavin D'souza
62e718a813 fix: Remove duplicate code 
Use BackupGenerator instead of custom code for integrations
 2020-08-07 13:13:49 +05:30
Mangesh-Khairnar
ef4a28e10c
fix: add a distinct identifier for public files backup (#11201) 2020-08-06 09:32:04 +05:30
Matteo D
219fbc8e88
fix: Added AWS S3 missing regions (#11109) 2020-07-29 20:58:46 +05:30
Suraj Shetty
942835b581
Merge branch 'develop' into fix-google-drive-backups 2020-07-27 19:09:53 +05:30
Mangesh-Khairnar
ab8a63d6fe fix: minor changes 2020-07-24 22:59:16 +05:30
Mangesh-Khairnar
bc56a59671 fix(paytm-integration): simplify code and remove additional loop 2020-07-24 20:19:35 +05:30
Mangesh-Khairnar
441630acc4 fix: check file backup config before backing up files 2020-07-23 23:43:35 +05:30
Mangesh-Khairnar
48e6f8999d
Merge branch 'develop' into paytm-integration 2020-07-21 00:13:59 +05:30
Mangesh-Khairnar
0ae7d40ebe fix(paytm-integration): use checksum library to generate/verify checksum 2020-07-20 23:08:50 +05:30
Suraj Shetty
886cc8913c Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-07-18 17:15:36 +05:30
mergify[bot]
62957312c5
Merge pull request #10965 from gavindsouza/mv-migrate-to 
fix: remove Frappe Cloud migrator logic from frappe
 2020-07-13 06:24:55 +00:00
Aditya Hase
912763d3b9
fix: Typo 2020-07-13 10:53:44 +05:30
Gavin D'souza
7e223f3f3a fix: typo 2020-07-10 12:08:41 +05:30
Gavin D'souza
6f51b12fe4 fix: run file directly instead of using exec 2020-07-10 12:03:00 +05:30
Gavin D'souza
517752c4d4 fix: PY2 compatibility change 2020-07-10 11:14:52 +05:30
Mangesh-Khairnar
d2c913331e fix(google-drive): fetch basename for backup 2020-07-10 00:14:09 +05:30
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