Commit graph

31216 commits

Author SHA1 Message Date
Suraj Shetty
b22e5ddcb2 fix: Set color control as Data while adding filter 2021-03-24 17:37:44 +05:30
Suraj Shetty
0d20d1a5d5 fix: Read only mode for color input
- fix style color readonly field
- fix case where color control is hidden
2021-03-24 17:36:23 +05:30
mergify[bot]
4834985417
Merge pull request #12637 from leela/auth-failing
fix: Auth failing
2021-03-22 14:35:34 +00:00
leela
b22f53e74b test: basic authentication test is added 2021-03-22 19:17:57 +05:30
leela
d319beb0b6 fix: Login is failing when allow_login_using_mobile_number is set
When allow_login_using_mobile_number is set, we are doing auth
validation With respect to mobile_no with the assumption that
all logins use mobile number for validation and that is not really the case.

Fix is, if auth username does not match with any mobile number,
then go for username validation to find the user.
2021-03-22 18:34:26 +05:30
mergify[bot]
eab29687d9
Merge pull request #12632 from prssanna/space-in-route
fix: include space and tab in special characters to match to encode url
2021-03-22 08:14:37 +00:00
prssanna
6827b6b3a0 fix: include space and tab in special characters to match to encode url 2021-03-22 11:58:41 +05:30
Fisher Yu
e6b9f27768
fix: copy paste rows more than 50 (one page) (#12548)
* fix: copy paste rows more than one page

fix the copy paste more than one page rows(50)

* fix: ESLint Space before blocks

* fix: bypass non value field type

* fix: ESLint

* fix: ESLint

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-22 06:25:54 +00:00
Suraj Shetty
0827fba2d8
chore: Update stale.yml config 2021-03-22 10:56:18 +05:30
mergify[bot]
60896845fd
Merge pull request #12480 from marination/perms-in-unrelated-doc
fix: frappe.new_doc won't set default in presence of User Permissions
2021-03-20 05:19:28 +00:00
Suraj Shetty
207d254462
Merge branch 'develop' into perms-in-unrelated-doc 2021-03-20 09:38:13 +05:30
mergify[bot]
aee03ed617
Merge pull request #12613 from netchampfaris/format-currency-in-dashboard-chart
fix: Format currency values in dashboard chart
2021-03-20 02:37:14 +00:00
Suraj Shetty
563c726437
Merge branch 'develop' into format-currency-in-dashboard-chart 2021-03-20 07:52:02 +05:30
Suraj Shetty
572b5d670c
revert: "test: encoding @ since we encode each url" (#12625) 2021-03-20 07:51:28 +05:30
mergify[bot]
fda2c3a735
Merge pull request #12612 from prssanna/chart-group-by
fix(Dashboard Chart): add owner to group by field options
2021-03-19 19:34:44 +00:00
Suraj Shetty
6b97105bcb
Merge branch 'develop' into format-currency-in-dashboard-chart 2021-03-20 01:01:37 +05:30
mergify[bot]
56a184847a
Merge pull request #12520 from pateljannat/double-signature-in-email
fix: Double signature in emails
2021-03-19 19:31:08 +00:00
mergify[bot]
30b1672a14
Merge pull request #12609 from netchampfaris/get-context-without-param
fix: Support calling get_context without a param
2021-03-19 19:30:46 +00:00
mergify[bot]
f20f639f6f
Merge pull request #12603 from ankush/escape_text_list_view
fix: improve html escaping and list view
2021-03-19 19:30:38 +00:00
Prssanna Desai
67f34644f7
revert: "fix: include space and tab in special characters to match to encode url" (#12619)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-20 00:58:48 +05:30
Sagar Vora
962f9b94b1
test: allow adding multiple roles while creating user (#12616) 2021-03-20 00:54:27 +05:30
Suraj Shetty
b2cde3e038
Merge branch 'develop' into chart-group-by 2021-03-20 00:50:03 +05:30
Suraj Shetty
1115c4dc7d
Merge branch 'develop' into format-currency-in-dashboard-chart 2021-03-20 00:48:49 +05:30
Suraj Shetty
1ab88edba7
Merge branch 'develop' into escape_text_list_view 2021-03-20 00:45:37 +05:30
Suraj Shetty
0002ba6353
Merge branch 'develop' into get-context-without-param 2021-03-20 00:45:27 +05:30
Suraj Shetty
4a5e808362
Merge branch 'develop' into double-signature-in-email 2021-03-20 00:45:19 +05:30
Suraj Shetty
c9460537ff
Merge pull request #12614 from surajshetty3416/fix-tests-19-mar-2021 2021-03-20 00:44:51 +05:30
Suraj Shetty
55daa0b424 fix: Reset Blog Post customization 2021-03-20 00:29:27 +05:30
Suraj Shetty
e43a0d141d chore: Ignore cypress setup for server tests 2021-03-19 19:19:56 +05:30
Suraj Shetty
ac7b40a7e3 fix: Do not show progress bar in CI environ 2021-03-19 18:57:31 +05:30
Suraj Shetty
f3a60c44b3 test: Set user as admin before test begins 2021-03-19 18:56:21 +05:30
Prssanna Desai
6a1959c360
Merge pull request #12615 from prssanna/user-query
fix: add filters to user query
2021-03-19 15:07:07 +05:30
Suraj Shetty
19a092feec
chore: Update frappe-charts (#12617) 2021-03-19 14:24:57 +05:30
prssanna
e165af787c fix: add filters to user query 2021-03-19 12:38:57 +05:30
pateljannat
a77aa268aa Merge branch 'develop' of https://github.com/frappe/frappe into double-signature-in-email 2021-03-19 11:10:41 +05:30
pateljannat
20fb404574 fix: added signature in html back 2021-03-19 11:06:53 +05:30
pateljannat
43c3f76ff6 fix: added backend signature again 2021-03-19 10:57:43 +05:30
Faris Ansari
8fcee4e5f8 fix: Format currency values in dashboard chart 2021-03-18 20:24:00 +05:30
prssanna
b373c3c40a fix: add owner to group by field options 2021-03-18 18:11:50 +05:30
Suraj Shetty
16c8de5a03
Merge branch 'develop' into get-context-without-param 2021-03-18 17:02:01 +05:30
Prssanna Desai
872cfee2a6
Merge branch 'develop' into escape_text_list_view 2021-03-18 16:42:17 +05:30
Prssanna Desai
20eed12a9e
Merge pull request #12591 from prssanna/redesign-fixes
fix: Redesign Fixes
2021-03-18 16:42:02 +05:30
prssanna
2b2f7a7d93 test: fix relative_time_filters ui test 2021-03-18 16:09:17 +05:30
Faris Ansari
901cbc98f0 fix: Support calling get_context without a param 2021-03-18 14:14:34 +05:30
prssanna
aecc43fcd5 fix: user profile link in leaderboard 2021-03-18 12:43:06 +05:30
Suraj Shetty
cf2eacbb3a
fix: Remove list.min.css from hook (#12606) 2021-03-18 12:24:29 +05:30
Ankush Menat
97e4494a87
fix: escape title and filter values in list view
- Markdown editor should not be filterable
- escape HTML in data-filter attribute
2021-03-18 11:53:53 +05:30
prssanna
45c6e476d3 Merge branch 'develop' of https://github.com/frappe/frappe into redesign-fixes 2021-03-17 19:22:55 +05:30
prssanna
8314701887 feat: print method in utils 2021-03-17 19:22:22 +05:30
Ankush Menat
bf6d336e95
fix: update escape_html to escape quotes
previous jquery hack didn't escape double quotes.
2021-03-17 19:10:18 +05:30