Commit graph

20693 commits

Author SHA1 Message Date
mergify[bot]
bdc0b7948d
Merge pull request #8015 from adityahase/revert-develop
fix: Revert recent security fixes
2019-07-26 15:42:46 +00:00
Aditya Hase
30845b26fa Revert "fix(security): Disallow unnecessary characters in group_by and fields"
This reverts commit 7aa34665c1.
2019-07-26 20:47:47 +05:30
Aditya Hase
bc7b0319ea Revert "fix(security): Make jinja rendering tighter"
This reverts commit d70d2c5a29.
2019-07-26 20:47:35 +05:30
mergify[bot]
ae76b7cec1
Merge pull request #8004 from ruchamahabal/auto-repeat-fixes
fix: Auto repeat fixes
2019-07-26 09:38:00 +00:00
Anurag Mishra
504388838d
fix(dashboards): Map Chart Type Average to aggregate function AVG (#8007) 2019-07-26 14:57:27 +05:30
mergify[bot]
82989049a1
Merge pull request #7965 from ruchamahabal/session-defaults
feat: Session defaults
2019-07-26 07:17:37 +00:00
Rucha Mahabal
f03bfb0fc5 fix: end date for auto repeat 2019-07-26 12:44:32 +05:30
Rucha Mahabal
41322e871d fix: added default parameters in make_auto_repeat 2019-07-26 12:01:10 +05:30
mergify[bot]
8183bbb60a
Merge pull request #7888 from scmmishra/filter-dropdown-fixes
refactor: minor ux improvements to dropdown filters
2019-07-26 06:28:32 +00:00
mergify[bot]
a2fc720ccf
Merge pull request #7988 from scmmishra/web-form-grid-translation
refactor: translated table headings
2019-07-26 05:54:03 +00:00
Rucha Mahabal
c896a8730e fix: list view filter not showing defaults 2019-07-26 01:34:37 +05:30
Rucha Mahabal
69dfb8728a fix: tests 2019-07-25 23:29:49 +05:30
mergify[bot]
4b8367c0e2
Merge pull request #7993 from adityahase/fix-sqli-new-develop
fix(security): Disallow unnecessary characters in group_by and fields
2019-07-25 16:35:32 +00:00
Aditya Hase
7aa34665c1 fix(security): Disallow unnecessary characters in group_by and fields 2019-07-25 20:55:08 +05:30
mergify[bot]
d052c641da
Merge pull request #7940 from lapphan/develop
fix: Check wrong OpenID's spec email claims
2019-07-25 13:28:53 +00:00
Shivam Mishra
fabe6f6575 refactor: translated table headings 2019-07-25 17:01:57 +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
Shivam Mishra
dad44b61e0 Merge branch 'develop' of https://github.com/frappe/frappe into filter-dropdown-fixes 2019-07-25 12:01:12 +05:30
Rucha Mahabal
ae47281925 fix: added filter for doctype in Session Default Settings 2019-07-25 11:52:32 +05:30
sahil28297
eb03d9bbb2
Merge pull request #7971 from adityahase/fix-jinja-2-develop
fix(security): Make jinja rendering tighter
2019-07-24 18:46:58 +05:30
Aditya Hase
d70d2c5a29 fix(security): Make jinja rendering tighter 2019-07-24 16:36:07 +05:30
Shivam Mishra
bf35ffbbe6
Update list_sidebar_group_by.js 2019-07-24 15:53:57 +05:30
Aditya Hase
87f41b8b0e fix(travis): Use frappe/bench 2019-07-24 15:11:53 +05:30
Aditya Hase
cc2a0bd8f6 fix(commnds): Raise CalledProcessError if process returns non-zero exit code 2019-07-24 15:11:53 +05:30
Aditya Hase
ebf6cf17db fix(travis): Run setup requirements before running node socketio.js 2019-07-24 15:11:53 +05:30
Aditya Hase
02547d3b4f fix(travis): Build app before cypress tests 2019-07-24 15:11:53 +05:30
Aditya Hase
dc930432d6 fix(travis): No need to disable scheduler with cli 2019-07-24 15:11:53 +05:30
Aditya Hase
78d13c43fc fix(travis): Activate socketio 2019-07-24 15:11:53 +05:30
Aditya Hase
0232b5e812 perf(travis): Faster cypress tests 2019-07-24 15:11:53 +05:30
Aditya Hase
84d38653b5 fix(travis): Remove unused files 2019-07-24 15:11:53 +05:30
Aditya Hase
582b871c0c fix(tests): Raise CalledProcessError if run-ui-test errors 2019-07-24 15:11:53 +05:30
Aditya Hase
ae60a97067 fix(travis): execute bench build before cypress tests 2019-07-24 15:11:53 +05:30
Aditya Hase
24b4925905 fix(travis): Run cypress tests headlessly 2019-07-24 15:11:53 +05:30
Aditya Hase
77b691a1da perf(travis): Use npm cacher 2019-07-24 15:11:53 +05:30
Aditya Hase
81fb8dc246 fix(travis): No stage named after_install 2019-07-24 15:11:53 +05:30
Aditya Hase
35deefd358 fix(travis): Remove TYPE environment vairable 2019-07-24 15:11:53 +05:30
Aditya Hase
01082b939d fix(travis): Reach bench directory before executing bench commands 2019-07-24 15:11:53 +05:30
Aditya Hase
066db0414a fix(travis): Remove shell scripted if condition 2019-07-24 15:11:53 +05:30
Aditya Hase
bd74e316a3 perf(travis): Use yarn cacher 2019-07-24 15:11:53 +05:30
Aditya Hase
c9b257b6d6 fix(travis): Include UI tests 2019-07-24 15:11:53 +05:30
Aditya Hase
26b4e4b1c7 fix(travis): Use database specific site_config.json files 2019-07-24 15:11:53 +05:30
Aditya Hase
3edbf3ad34 fix(travis): Handle postgres builds as well 2019-07-24 15:11:53 +05:30
Aditya Hase
002417fed9 fix(travis): Create Build Matrix 2019-07-24 15:11:53 +05:30
Aditya Hase
639ac27565 fix(travis): Use MariaDB 10.3 instead of MySQL 2019-07-24 15:11:53 +05:30
Aditya Hase
3e9762fa09 fix(travis): Run Python 2.7 and Python 3.6 builds 2019-07-24 15:11:53 +05:30
Aditya Hase
df6f121ea2 perf(travis): Use --depth 1 while performing git clone 2019-07-24 15:11:53 +05:30