Commit graph

20714 commits

Author SHA1 Message Date
Himanshu Warekar
2dc1ffabff Merge branch 'version-12-hotfix' of https://github.com/frappe/frappe into events_ref 2019-07-27 10:29:49 +05:30
mergify[bot]
c3a47a730f
Merge pull request #8012 from ruchamahabal/auto-repeat-fix-v12
fix: Auto repeat fixes
2019-07-26 18:01:07 +00:00
Himanshu Warekar
0fd333aaf1 fix: typo 2019-07-26 22:43:12 +05:30
Himanshu Warekar
067c6f8a35 patch: migrate to newer repeat_on 2019-07-26 22:40:35 +05:30
Aditya Hase
2d1fa6138b
fix: Revert recent security fixes (#8016)
fix: Revert recent security fixes
2019-07-26 21:16:33 +05:30
Aditya Hase
fb896a460e Revert "fix(security): Make jinja rendering tighter"
This reverts commit b30199b7f5.
2019-07-26 20:49:56 +05:30
Aditya Hase
ce60f98ab6 Revert "fix(security): Disallow unnecessary characters in group_by and fields"
This reverts commit fb8993663c.
2019-07-26 20:49:46 +05:30
Himanshu Warekar
cabb3f314b fix: validate dates only if starts_on and ends_on 2019-07-26 20:48:45 +05:30
Himanshu Warekar
421e4eebeb fix: show events on the correct day 2019-07-26 20:16:42 +05:30
Rucha Mahabal
4c14574270 fix: date comparison fix 2019-07-26 18:04:53 +05:30
rohitwaghchaure
eec9ee86e3
Merge pull request #8003 from rohitwaghchaure/total_throwing_an_error_v12
fix: Unknown string format:', u'Total'
2019-07-26 16:10:22 +05:30
Rucha Mahabal
8dd180ae82 fix: removed dynamic value in default parameter 2019-07-26 16:03:33 +05:30
Rucha Mahabal
2f76e70f40 fix: end date for auto repeat 2019-07-26 15:20:32 +05:30
Rucha Mahabal
03e300289a fix: added default parameters in make_auto_repeat 2019-07-26 15:20:32 +05:30
Rohit Waghchaure
72427d0b25 fix: Unknown string format:', u'Total' 2019-07-26 15:13:52 +05:30
mergify[bot]
add2f1b7e7
Merge pull request #8008 from ruchamahabal/session-default-fixes
fix: Session Defaults
2019-07-26 09:38:54 +00:00
Anurag Mishra
02e2d17d71
fix(dashboards): Map Chart Type Average to aggregate function AVG (#8006)
Co-authored-by: adityahase <aditya@adityahase.com>
2019-07-26 14:57:46 +05:30
mergify[bot]
d9038e3b83
Merge pull request #7990 from scmmishra/web-form-grid-translation-develop
refactor: translated table headings
2019-07-26 09:03:13 +00:00
Shivam Mishra
3ba7e5977b Merge branch 'version-12-hotfix' of https://github.com/frappe/frappe into web-form-grid-translation-develop 2019-07-26 14:22:07 +05:30
Sahil Khan
7c6784ed2c Merge branch 'version-12-hotfix' into version-12 2019-07-26 12:49:25 +05:30
Sahil Khan
65884a0a3e bumped to version 12.0.1 2019-07-26 13:06:32 +05:50
mergify[bot]
b4e57dba40
Merge pull request #8000 from hrwX/mul_sel
fix(MultiSelect): Do not auto check oldest value in MultiSelect Dialog results
2019-07-26 07:10:02 +00:00
mergify[bot]
e7f4e654e1
Merge pull request #8001 from surajshetty3416/patch-files-public-private-fix
fix: Patch to create file in right location
2019-07-26 06:42:30 +00:00
Suraj Shetty
2020f79771 fix: Typo 2019-07-26 11:11:23 +05:30
Suraj Shetty
570239cd48 fix: Patch to create file in right location 2019-07-26 10:51:06 +05:30
Himanshu Warekar
4f6f62972f fix: remove google calendar fields 2019-07-26 10:00:28 +05:30
Himanshu Warekar
178bd25c98 Merge branch 'version-12-hotfix' of https://github.com/frappe/frappe into events_ref 2019-07-26 09:59:43 +05:30
Himanshu Warekar
58fda07a48 Merge version-12-hotfix into mul_sel 2019-07-26 09:51:12 +05:30
Himanshu Warekar
7ccff35465 tests: fix repeat_on frequency 2019-07-26 09:25:48 +05:30
Himanshu Warekar
4bcbc03500 chore: align sql query 2019-07-26 09:11:28 +05:30
Rucha Mahabal
d2e6d12632 fix: list view filter not showing defaults 2019-07-26 01:38:29 +05:30
Himanshu Warekar
be13e1b669 feat: make events great again 2019-07-26 00:21:05 +05:30
Rucha Mahabal
8d1350135e fix: tests 2019-07-25 23:10:43 +05:30
Shivam Mishra
1bfd508979
Merge pull request #7978 from scmmishra/multi-select-patch
fix: more button bug in multi-select
2019-07-25 22:01:19 +05:30
mergify[bot]
230eceb66b
Merge pull request #7992 from adityahase/version-12-hotfix
fix(security): Disallow unnecessary characters in group_by and fields
2019-07-25 16:22:55 +00:00
Aditya Hase
fb8993663c fix(security): Disallow unnecessary characters in group_by and fields 2019-07-25 20:54:08 +05:30
Shivam Mishra
0d2043d76b refactor: translated table headings 2019-07-25 17:03:35 +05:30
Rucha Mahabal
5a98598850 fix: codacy fixes 2019-07-25 14:58:12 +05:30
Rucha Mahabal
8e0c9d474c fix: codacy fixes 2019-07-25 14:51:47 +05:30
Rucha Mahabal
5797f54e4c fix: reload to reflect the session defaults 2019-07-25 14:37:37 +05:30
Rucha Mahabal
af3341ab1b fix: clear session defaults if prompt field is cleared 2019-07-25 14:01:57 +05:30
Rucha Mahabal
b5546e2cb7 fix: session default not set in listview filter 2019-07-25 13:14:06 +05:30
Rucha Mahabal
ae47281925 fix: added filter for doctype in Session Default Settings 2019-07-25 11:52:32 +05:30
Shivam Mishra
103e894064 fix: more button visibility bug 2019-07-25 11:37:31 +05:30
sahil28297
2be45d71ea
Merge pull request #7970 from adityahase/fix-jinja-2-12
fix(security): Make jinja rendering tighter
2019-07-24 18:46:34 +05:30
Aditya Hase
b30199b7f5 fix(security): Make jinja rendering tighter 2019-07-24 16:32:35 +05:30
sahil28297
327ee6158b
Merge pull request #7969 from scmmishra/changelog-url-fixes
fix: url fixes for changelog
2019-07-24 16:28:35 +05:30
Shivam Mishra
0405c1a23b fix: url fixes for changelog 2019-07-24 16:23:28 +05:30
sahil28297
138a683e5d
Merge pull request #7968 from scmmishra/release-notes-fixes
fix: urls for changelog
2019-07-24 16:13:35 +05:30
Shivam Mishra
5dc72f00f5 fix: more url fixes 2019-07-24 16:09:56 +05:30