Commit graph

20729 commits

Author SHA1 Message Date
Shivam Mishra
f37fbbba88 fix: translations for fields in webform list (#8027)
* fix: translation for webform list

* chore: added Sr to translated items
2019-07-29 15:15:55 +05:30
Faris Ansari
dfa16a77f4
Merge pull request #7662 from deepeshgarg007/remove_user_limit
BREAKING CHANGE: Remove limits from frappe
2019-07-29 12:09:04 +05:30
mergify[bot]
b37d3ae2db
Merge pull request #7987 from scmmishra/oauth-fix
fix: oauth redirect issue
2019-07-29 06:23:14 +00:00
mergify[bot]
71dfa669b2
Merge pull request #8019 from hrwX/events_ref_v13
feat(Event): Refactor Repeats On for Events
2019-07-29 05:00:07 +00:00
mergify[bot]
6b292d2564
Merge pull request #8013 from ruchamahabal/auto-repeat-fixes
fix: Auto Repeat date fix
2019-07-29 04:46:51 +00:00
Faris Ansari
98819bbf42
fix: Dont update modified 2019-07-29 10:13:53 +05:30
Faris Ansari
bbe425da10
fix: Convert to SQL to set_value 2019-07-29 10:13:15 +05:30
deepeshgarg007
87e3531281 Merge branch develop into remove_user_limit 2019-07-28 19:55:28 +05:30
Himanshu
3cc39bc643
Update rename_events_repeat_on.py 2019-07-27 16:10:15 +05:30
Himanshu
b3d2d10c22
Update event.py 2019-07-27 15:45:55 +05:30
Himanshu Warekar
ac87ebc3ae fix: rename repeat on 2019-07-27 12:29:32 +05:30
Himanshu Warekar
78db72f9c2 fix: codacy 2019-07-27 11:49:34 +05:30
Himanshu Warekar
50c10a2fcf fix: test case for customize form 2019-07-27 11:24:15 +05:30
Himanshu Warekar
681720ec05 fix: codacy 2019-07-27 11:17:26 +05:30
Himanshu Warekar
c873ab87f0 Merge branch 'develop' of https://github.com/frappe/frappe into events_ref_v13 2019-07-27 11:14:22 +05:30
Himanshu Warekar
44806a83b9 feat: add status to event 2019-07-27 11:14:01 +05:30
Himanshu Warekar
1198075fec patch: migrate to newer repeat on 2019-07-26 22:47:00 +05:30
mergify[bot]
bdc0b7948d
Merge pull request #8015 from adityahase/revert-develop
fix: Revert recent security fixes
2019-07-26 15:42:46 +00:00
Himanshu Warekar
ad20d66896 refactor: Events Repeats On 2019-07-26 21:10:06 +05:30
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
Rucha Mahabal
47ed1f88ad fix: date fix 2019-07-26 18:00:05 +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
Shivam Mishra
1d5151ae89 chore: added #desktop route to redirect 2019-07-25 16:31:38 +05:30
Shivam Mishra
524a7b2bee chore: added #desktop route 2019-07-25 16:31:08 +05:30
Shivam Mishra
d8a24871f8 fix: redirect URL for oauth 2019-07-25 16:24:41 +05:30
Shivam Mishra
f638173774 fix: redirect for OAuth 2019-07-25 16:16:05 +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