Commit graph

26425 commits

Author SHA1 Message Date
Suraj Shetty
eb833ed206
revert: "fix: show label for table fields" (#10897) 2020-07-03 11:32:12 +05:30
mergify[bot]
b08d72be15
Merge pull request #10803 from rmehta/email-reply-threading
fix: threading of email replies where message-id is not returned
2020-07-03 05:59:22 +00:00
Helkyd
09112389c2
fix(patch): reload_and_rename_view_log.py (#10890)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-07-03 11:12:44 +05:30
mergify[bot]
203a70ff76
Merge pull request #10814 from scmmishra/refactor-portal
refactor: help article layout
2020-07-03 05:34:10 +00:00
mergify[bot]
7927ac803f
Merge pull request #10870 from Alchez/dev-patch-lock-table
fix: Adds LOCK TABLES grant for RDS version of grant_all_privileges (develop)
2020-07-03 05:29:15 +00:00
mergify[bot]
0c128c360b
Merge pull request #10827 from prssanna/chart-source-permission
fix: only give administrator permission to create Dashboard Chart Source
2020-07-03 04:57:34 +00:00
Suraj Shetty
f4b9f9d8ec
Merge branch 'develop' into dev-patch-lock-table 2020-07-03 10:19:15 +05:30
Suraj Shetty
3423ead5d7
Merge branch 'develop' into email-reply-threading 2020-07-03 10:08:13 +05:30
Suraj Shetty
2185d81792
Merge branch 'develop' into chart-source-permission 2020-07-03 10:07:53 +05:30
Chinmay Pai
5becb746a9
Merge pull request #10901 from ruchamahabal/whitelist-auto-repeat-func 2020-07-02 20:18:22 +05:30
Rucha Mahabal
c1615446bd fix: whitelist auto repeat query function 2020-07-02 11:54:14 +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
741367eee5
Merge branch 'develop' into email-reply-threading 2020-07-01 13:06:17 +05:30
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
a323506424
Merge branch 'develop' into email-reply-threading 2020-07-01 10:45:27 +05:30
Suraj Shetty
2b0e03c51c
Merge branch 'develop' into search_whitelist-fix 2020-07-01 10:45:19 +05:30
Suraj Shetty
77976b7bc3
Merge branch 'develop' into chart-source-permission 2020-07-01 10:45:13 +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
Felipe Orellana
57a1bb5904 fix: Adds LOCK TABLES grant for RDS version of grant_all_privileges 2020-06-30 13:59:33 +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
ae76563233
Merge branch 'develop' into chart-source-permission 2020-06-30 10:43:48 +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
Suraj Shetty
4766b52b25
Merge branch 'develop' into email-reply-threading 2020-06-30 10:28:55 +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