Commit graph

27452 commits

Author SHA1 Message Date
Aditya Hase
dce13faa52
Merge branch 'develop' of https://github.com/frappe/frappe into fix-blog-post-pagination 2020-09-10 13:42:54 +05:30
Aditya Hase
3c65a9ef04
Merge pull request #11189 from scmmishra/blog-route-fix 2020-09-10 13:39:06 +05:30
Prssanna Desai
4fdbe6c792
Merge pull request #11442 from anupamvs/report-include-indentation 2020-09-10 13:30:22 +05:30
Aditya Hase
40c29158e5
fix(blog): Use LIMIT row_count OFFSET offset syntax instead of LIMIT offset, row_count
Reference: https://www.postgresql.org/docs/9.5/queries-limit.html
2020-09-10 13:12:22 +05:30
Prssanna Desai
788fbed542
Merge pull request #11474 from prssanna/chart-permission 2020-09-10 13:11:37 +05:30
Aditya Hase
f4a22683d5
test(blog): Add tests for blog post pagination 2020-09-10 13:10:34 +05:30
prssanna
2b413319c1 fix(Dashboard Chart): only encode key if type is not string 2020-09-10 12:36:59 +05:30
Aditya Hase
d8377dccc2
chore(tests): Cleanup property setter added for Blog Post 2020-09-10 11:23:13 +05:30
Shivam Mishra
56b9581d75
Merge pull request #11470 from scmmishra/desk-fix
fix: boot if module is not present in desk
2020-09-09 23:49:50 +05:30
Shivam Mishra
40748d7fa8 fix: boot if module is not present in desk 2020-09-09 23:42:46 +05:30
mergify[bot]
e75df971fc
Merge pull request #11305 from gavindsouza/allow-me-to-execute-anything
feat: Allow me to execute anything console would allow
2020-09-09 13:22:51 +00:00
Prssanna Desai
81839c445b
Merge pull request #11467 from frappe/mergify/bp/develop/pr-11466 2020-09-09 18:08:48 +05:30
prssanna
3f42f4b525 fix: set overflow auto for report builder wrapper
(cherry picked from commit 2ec014228637d40a23b794d108a282b8529e94b3)
2020-09-09 12:15:46 +00:00
Aditya Hase
659b3bb9f1
Merge pull request #11462 from adityahase/fix-recorder-tests
fix(recorder): Fix Cypress Tests
2020-09-09 17:38:13 +05:30
Faris Ansari
b1b1149f91
Merge pull request #11465 from netchampfaris/invalid-email-escape
fix: Escape invalid email in throw
2020-09-09 14:07:18 +05:30
Faris Ansari
ee7d119546 fix: Escape invalid email in throw 2020-09-09 14:03:56 +05:30
Faris Ansari
089ba36bab
Merge pull request #11457 from netchampfaris/fix-attach-files-to-doc
fix: Handle None value
2020-09-09 13:04:01 +05:30
Suraj Shetty
2b12a34d7e
refactor(translation linter): Handle multiline translation syntax (#11461) 2020-09-09 12:45:17 +05:30
Aditya Hase
a706971b9b
fix(recorder): Fix Cypress Tests 2020-09-09 12:28:07 +05:30
mergify[bot]
aeac33e804
Merge pull request #11458 from ruchamahabal/event-streaming-fixes
fix: Event Streaming fixes
2020-09-09 06:50:08 +00:00
Rucha Mahabal
f24d87726a fix: added patch for deleting old keys 2020-09-09 11:10:47 +05:30
Aditya Hase
386b4847b4
chore: Attempt at fixing event-streaming tests 2020-09-09 09:38:20 +05:30
Rucha Mahabal
8cffea5c8e fix: test 2020-09-09 01:13:06 +05:30
Rucha Mahabal
efdeab6dad fix: test 2020-09-09 00:43:50 +05:30
Rucha Mahabal
21a299752b fix: test 2020-09-09 00:02:25 +05:30
Rucha Mahabal
220c4b734e fix: event subscriber validation 2020-09-08 22:56:18 +05:30
Prssanna Desai
234d4adad6
Merge branch 'develop' into report-include-indentation 2020-09-08 21:13:52 +05:30
Rucha Mahabal
3b5c404378 fix: tests 2020-09-08 20:55:53 +05:30
Rucha Mahabal
ed5f332bb9 fix: sider issue 2020-09-08 19:29:46 +05:30
Rucha Mahabal
d7ea913605 fix: event streaming fixes 2020-09-08 19:01:08 +05:30
Faris Ansari
7707304890 fix: Handle None value 2020-09-08 17:08:57 +05:30
mergify[bot]
ad180c0b30
Merge pull request #11389 from netchampfaris/blog-meta-title
fix(Blog): Ability to set meta_title separately
2020-09-08 07:47:57 +00:00
mergify[bot]
35294821ef
Merge pull request #11447 from adityahase/fix-package-tool
fix(package): Only allow System Managers to import a package
2020-09-08 07:29:42 +00:00
mergify[bot]
f6920c47a9
Merge pull request #11123 from netchampfaris/unzip-handle-folders
fix: Handle directories in unzip
2020-09-08 07:24:27 +00:00
gavin
936af9916a
fix(Activity Log): Update modified details
ref: https://github.com/frappe/frappe/pull/11373
2020-09-08 12:28:20 +05:30
mergify[bot]
5199704157
Merge pull request #11373 from gavindsouza/activity-log-update
fix(Activity Log): Handle delete and new actions via Permissions
2020-09-08 06:55:10 +00:00
mergify[bot]
e2cf2fabd9
Merge pull request #11452 from surajshetty3416/fix-rename-doc
fix(security): Remove ignore_permissions flag from API request
2020-09-08 06:37:07 +00:00
Shivam Mishra
0bddb0565f Merge branch 'develop' of https://github.com/frappe/frappe into blog-route-fix 2020-09-08 12:01:58 +05:30
Faris Ansari
864e8441eb
fix: condition
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-09-08 11:53:58 +05:30
Suraj Shetty
0449ba0b6d
refactor: Use .pop instead of del 2020-09-08 10:58:03 +05:30
Suraj Shetty
9e43e88755 fix: Remove unnecessary whitelisting of rename_doc method 2020-09-08 10:38:26 +05:30
Suraj Shetty
dba454f941 fix(security): Remove ignore_permissions flag from API request 2020-09-08 10:37:25 +05:30
Anupam K
8261eded19 fix: Report Include Indentation UI 2020-09-08 09:49:49 +05:30
mergify[bot]
308302697d
Merge pull request #11448 from adityahase/fix-auto-repeat-message
fix(auto-repeat): Add permission check for rendering message preview
2020-09-07 14:38:47 +00:00
Aditya Hase
2050c2b9b3
fix(auto-repeat): Add permission check for rendering message preview 2020-09-07 19:55:13 +05:30
Aditya Hase
6ad3156233
fix(package): Only allow System Managers to import a package 2020-09-07 19:47:36 +05:30
mergify[bot]
ffdecc7623
Merge pull request #11444 from adityahase/fix-get-list
fix(db_query): Reject `user` argument in whitelisted methods
2020-09-07 13:53:22 +00:00
Aditya Hase
555c52fc70
fix(db_query): Reject user argument in whitelisted methods 2020-09-07 18:56:24 +05:30
mergify[bot]
898098d38e
Merge pull request #11440 from adityahase/fix-remove-query-builder
chore(query-builder): Remove unused code
2020-09-07 13:19:00 +00:00
Aditya Hase
cb23da1ed9
chore(query-builder): Remove unused code 2020-09-07 18:34:42 +05:30