Suraj Shetty
2ce7d42e77
Merge branch 'develop' into notification_while_import
2020-06-30 18:13:46 +05:30
mergify[bot]
b1bdb3286e
Merge pull request #10880 from Thunderbottom/s3-backup-fix
...
fix: only validate s3 settings if enabled
2020-06-30 12:43:43 +00:00
mergify[bot]
9dbe5f17d6
Merge pull request #10878 from sahil28297/fix_develop_version
...
fix: set develop version as 13.x.x
2020-06-30 12:40:28 +00:00
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
Sahil Khan
124db4170c
chore: set develop version as 13.x.x
2020-06-30 17:52:57 +05:30
Suraj Shetty
a6c68f7dc0
fix: Initialize email_sent_to_any_recipient outsite try block ( #10866 )
...
to avoid UnboundLocalError: local variable
'email_sent_to_any_recipient' referenced before assignment
2020-06-30 17:38:27 +05:30
mergify[bot]
9be1b09587
Merge pull request #10759 from netchampfaris/dib-fixes-2020-06-22
...
fix: Data Import
2020-06-30 10:32:17 +00:00
Suraj Shetty
84f448d13d
Merge branch 'develop' into dib-fixes-2020-06-22
2020-06-30 15:48:00 +05:30
mergify[bot]
0cc30296e8
Merge pull request #10872 from prssanna/fix-chart-dates
...
fix(Dashboard Chart): always append start date to result
2020-06-30 10:16:57 +00:00
prssanna
63cdb5f506
fix: always append start date to result
2020-06-30 15:07:05 +05:30
Faris Ansari
45d097f6b5
fix(patch): Use rename_doc
2020-06-30 13:14:24 +05:30
Faris Ansari
0d73eb9c85
Merge remote-tracking branch 'upstream/develop' into dib-fixes-2020-06-22
2020-06-30 12:51:43 +05:30
Faris Ansari
e5e6c7c9fe
fix: Extract gid from google sheets url
2020-06-30 12:15:12 +05:30
Faris Ansari
c2135f2471
fix: Missing semicolon
2020-06-30 10:21:23 +05:30
Suraj Shetty
c1ba123735
Merge branch 'develop' into notification_while_import
2020-06-30 09:30:11 +05:30
Suraj Shetty
9f769b980c
chore: Mergify configuration update ( #10862 )
2020-06-30 09:26:49 +05:30
Suraj Shetty
16d8376b58
Merge branch 'develop' into notification_while_import
2020-06-30 09:08:09 +05:30
Prssanna Desai
20815aa349
refactor: remove unnecessary code from get_submitted_linked_docs ( #10844 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-06-30 08:03:28 +05:30
Suraj Shetty
5ff6d3fa0a
Merge branch 'develop' into notification_while_import
2020-06-29 19:53:18 +05:30
Chinmay Pai
04d2d710a0
Merge pull request #10858 from sahil28297/fix_site_config_backup
...
fix: declare site_config_backup_path variable before referencing
2020-06-29 19:35:32 +05:30
Sahil Khan
94bfc16bfb
fix: declare site_config_backup_path variable before referencing
2020-06-29 19:30:43 +05:30
Suraj Shetty
5712a22a0e
Merge branch 'develop' into notification_while_import
2020-06-29 17:23:49 +05:30
mergify[bot]
389876f0a9
Merge pull request #10816 from prssanna/chart-start-date-fix
...
fix(Dashboard Chart): include start date in chart result
2020-06-29 11:11:20 +00:00
Faris Ansari
a317f675e7
Merge pull request #10663 from gavindsouza/dont-allow-downgrade
2020-06-29 14:30:20 +05:30
Gavin D'souza
478b87e5be
fix: add verbosity in is_downgrade
2020-06-29 13:20:00 +05:30
Türker Tunalı
1ad23c962c
Turkish translations need this fix ( #10555 )
...
num2words library has Turkish translation since version 0.5.6. And their last version 0.5.10 seems ok. We need this fix to better support Turkish users.
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2020-06-29 06:25:39 +00:00
mergify[bot]
6fa6d2edf8
Merge pull request #10829 from AfshanKhan/FR_ISS_204690
...
fix: handle condition that "Setters" could be "Array" or "Object"
2020-06-29 04:23:12 +00:00
mergify[bot]
af467d2cc9
Merge pull request #10833 from Codebrahma/fix_infinite_recursion
...
fix(linked_docs): infinite recursion due to loops in linked docs graph
2020-06-29 04:19:34 +00:00
mergify[bot]
fcb41b2812
Merge pull request #10839 from frappe/assignment_rule
...
fix: Rename error in assignment rule
2020-06-29 04:04:42 +00:00
Suraj Shetty
4ca09d4a34
Merge branch 'develop' into assignment_rule
2020-06-29 09:21:57 +05:30
Rushabh Mehta
62a8774bb1
feat(role permission): if desk access is removed from a role, attempt to remove it from users too ( #10838 )
...
* feat(minor): if desk access is removed from a role, attempt to remove it from users too
* fix(minor): exception for install;
* fix(minor): exception for install
2020-06-29 02:43:23 +00:00
michellealva
500191f7fb
fix: merge error in assigment rule
2020-06-28 11:09:13 +05:30
Anand Narayan
fc69f77f73
fix(linked_docs): infinite recursion due to loops
2020-06-27 22:05:24 -07:00
mergify[bot]
c96e238c04
Merge pull request #10836 from revant/feat-postgres-backup-restore
...
feat: backup and restore postgres site
2020-06-27 17:30:57 +00:00
Afshan
620fafeb96
fix: divide filter fields into 3 columns using index.
2020-06-27 22:19:27 +05:30
Revant Nandgaonkar
ec881a4977
fix: remove unused variable
2020-06-27 20:47: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
64c2fa3744
fix: update google api client
2020-06-27 19:54:41 +05:30
Mangesh-Khairnar
e0ad885944
fix: allow users to disable google drive sync
2020-06-27 19:20:38 +05:30
Afshan
f146d1ffb2
style: format according to sider
2020-06-27 18:01:26 +05:30
Revant Nandgaonkar
1bfa56cd0c
feat: backup and restore postgres site
2020-06-27 16:01:30 +05:30
Deepesh Garg
4ce29c3120
fix: Notificaions on data import
2020-06-26 22:41:29 +05:30
Afshan
346937aed7
fix: handle condition that "Setters" could be "Array" or "Object"
2020-06-26 19:28:48 +05:30
prssanna
b482b2ce5c
fix: test for daily charts
2020-06-26 17:47:59 +05:30
sahil28297
d39da928d7
Merge pull request #10825 from saurabh6790/email_notifications
...
feat: do not send notifications for existing emails
2020-06-26 16:47:13 +05:30
Saurabh
ad206edb20
feat: do not send notification for existing emails
2020-06-26 16:33:55 +05:30
Suraj Shetty
70871a344a
fix: Escape user input before regex search ( #10812 )
2020-06-26 10:33:45 +05:30
prssanna
1379a722f5
fix: append start date only if timegrain is daily
2020-06-26 00:03:35 +05:30
prssanna
04d0ce54af
fix: include start date in chart result
2020-06-25 23:13:57 +05:30
sahil28297
c63a3e4993
Merge pull request #10808 from surajshetty3416/fix-pretty-date
...
fix(prettyDate): Convert datetime to user's timezone first
2020-06-25 12:45:15 +05:30
