Gavin D'souza
74222a0e4b
fix(install-app): Handle all exceptions thrown
2020-07-08 11:26:01 +05:30
mergify[bot]
d1fe0a1acf
Merge pull request #10893 from Thunderbottom/search_whitelist-fix-fix
...
fix: get_attr before checking for whitelist
2020-07-01 15:57:44 +00:00
Chinmay D. Pai
d2c4b170a8
fix: get_attr before checking for whitelist
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-01 21:07:41 +05:30
mergify[bot]
63232f4867
Merge pull request #10764 from Mangesh-Khairnar/fix-sync-password
...
fix(google-calendar): reset sync token incase of invalid next sync token
2020-07-01 07:43:22 +00:00
Suraj Shetty
b4fc08883a
Merge branch 'develop' into fix-sync-password
2020-07-01 13:01:02 +05:30
Suraj Shetty
8096c9e371
fix(permission): Show allowed rights on document for passed user ( #10864 )
2020-07-01 12:08:15 +05:30
mergify[bot]
f12a26766d
Merge pull request #10492 from Thunderbottom/search_whitelist-fix
...
fix: check for whitelist before calling from search
2020-07-01 05:29:53 +00:00
Suraj Shetty
2b0e03c51c
Merge branch 'develop' into search_whitelist-fix
2020-07-01 10:45:19 +05:30
Suraj Shetty
dc3402c546
feat: Option to add custom timeline contents ( #10677 )
2020-07-01 10:31:17 +05:30
mergify[bot]
bce6b43abf
Merge pull request #10830 from deepeshgarg007/notification_while_import
...
fix: Notifications on data import
2020-07-01 04:58:20 +00:00
mergify[bot]
3be6e7b658
Merge pull request #10846 from prssanna/filter-condition-help-fix
...
fix: filter condition description doesn't get cleared
2020-06-30 12:54:59 +00:00
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
Suraj Shetty
06c948e08c
Merge branch 'develop' into filter-condition-help-fix
2020-06-30 18:02:39 +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
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
Suraj Shetty
3b1cc0499a
Merge branch 'develop' into search_whitelist-fix
2020-06-30 10:43:38 +05:30
Suraj Shetty
9b9a3d01a2
Merge branch 'develop' into filter-condition-help-fix
2020-06-30 10:43:04 +05:30
Faris Ansari
c2135f2471
fix: Missing semicolon
2020-06-30 10:21:23 +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
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
d559bf0ce5
Merge branch 'develop' into filter-condition-help-fix
2020-06-30 09:23:27 +05:30
Suraj Shetty
16d8376b58
Merge branch 'develop' into notification_while_import
2020-06-30 09:08:09 +05:30
Suraj Shetty
0ff59b88d8
Merge branch 'develop' into search_whitelist-fix
2020-06-30 08:17:17 +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
prssanna
239f35298d
style: fix formatting
2020-06-29 11:45:16 +05:30
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
prssanna
bc9af72562
fix: filter condition description doesn't get cleared
2020-06-28 16:25:01 +05:30
