Shariq Ansari
1b00f56e69
test: Updated navigation.js
2021-11-08 19:26:21 +05:30
Shariq Ansari
25ffd6ddec
test: Updated report_view.js
2021-11-08 18:52:52 +05:30
mergify[bot]
04ac92634b
Merge pull request #14879 from alyf-de/add-date-format
...
feat: add format dd.mm.yy to dateutils
2021-11-08 12:11:47 +00:00
Aradhya-Tripathi
34a5e447e6
refactor: converted queries in property setter
2021-11-08 17:12:00 +05:30
Aradhya-Tripathi
dbe6e81d67
refactor: converted queries in tags
2021-11-08 17:11:46 +05:30
Jannat Patel
b52f8ee099
style: empty state logo
2021-11-08 16:50:27 +05:30
Aradhya-Tripathi
18fd175c7c
fix: fixed erroneous query
2021-11-08 16:04:37 +05:30
Aradhya-Tripathi
241104bf6e
refactor: Converted query in user.py
2021-11-08 15:57:39 +05:30
Aradhya-Tripathi
97f85c88e2
feat: Added tests for Criterion objects in get_value
2021-11-08 15:57:06 +05:30
Aradhya-Tripathi
b8340fff58
feat: Added support for Criterion objects as fieldnames
2021-11-08 15:56:20 +05:30
mergify[bot]
b3bc419a11
fix: for frappe._dict deepcopy; Opened issue 14833 ( #14889 ) ( #14914 )
...
* fix: DFP "__deepcopy__" exception" within _dict __getattr__
* fix: for frappe._dict deepcopy; Opened issue 14833 #14889 (accepted gavindsouza suggestion)
Co-authored-by: gavin <gavin18d@gmail.com>
* fix: for frappe._dict deepcopy; Opened issue 14833 #14889 (accepted gavindsouza suggestion)
Co-authored-by: gavin <gavin18d@gmail.com>
Co-authored-by: gavin <gavin18d@gmail.com>
(cherry picked from commit db6996a763ec2ffd85470d991f860192e87ca7e3)
Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
2021-11-08 11:18:55 +01:00
Aradhya-Tripathi
4eabb7129e
feat: Added concat_ws in frappe.qb
2021-11-08 13:55:17 +05:30
Shariq Ansari
417ef53dfa
test: Updated form.js
2021-11-08 13:04:56 +05:30
Aradhya-Tripathi
a29d7bbd82
fix: merge conflicts
2021-11-08 12:02:54 +05:30
Aradhya-Tripathi
0b5b234e93
Merge branch 'develop' of https://github.com/Aradhya-Tripathi/frappe into at/queries
2021-11-08 11:52:29 +05:30
Shariq Ansari
754caca3ca
test: Updated query_report UI test
2021-11-08 11:48:51 +05:30
Aradhya-Tripathi
a4a638de6a
refactor: converting select queries
2021-11-08 11:46:29 +05:30
Shariq Ansari
4aa59de85f
Merge branch 'frappe:develop' into check-ui-test
2021-11-08 11:28:20 +05:30
Shariq Ansari
04518f4a66
fix: Removed shadow from comment avatar
2021-11-08 11:12:36 +05:30
mergify[bot]
b0de865eb2
Merge pull request #14883 from lukptr/prepared-report-read-only-develop
...
feat: prepared report read from replica (backport to develop)
2021-11-08 05:37:30 +00:00
mergify[bot]
177f85b4cd
Merge pull request #14888 from abdgad/auto_email_report-cleanup
...
refactor: minor code cleanup in auto_email_report.py
2021-11-08 05:31:44 +00:00
Shariq Ansari
cf416aa779
test: minor fix
2021-11-08 11:00:45 +05:30
Sagar Vora
77e0b59525
fix: minor fixes to whitelisted methods ( #14569 )
2021-11-07 19:13:26 +05:30
abdgad
29785af915
refactor: minor code cleanup in auto_email_report.py
2021-11-06 11:41:46 +01:00
lukptr
e907f77ccd
feat: prepared report read from replica
2021-11-05 15:35:43 +07:00
mergify[bot]
2a8a979a09
Merge pull request #14594 from resilient-tech/fix-api
...
fix: minor fixes for API Access section in User
2021-11-05 04:35:05 +00:00
barredterra
a0d2e19b95
feat: add dateformat dd.mm.yy
2021-11-04 17:16:54 +01:00
Rohan Bansal
c5464e2c5a
fix: requested changes
2021-11-04 14:50:37 +05:30
Rohan Bansal
c4ed8cf0e7
Merge remote-tracking branch 'upstream/develop' into dev-granular-printing
2021-11-04 14:38:27 +05:30
mergify[bot]
b76f79c06c
Merge pull request #14547 from Aradhya-Tripathi/query-conversion
...
refactor: Converting raw SQL queries using frappe ORM and frappe.qb
2021-11-03 12:06:35 +00:00
Gavin D'souza
6d212c2d02
refactor(minor): Don't re-write var, use set_value
...
* doctype variable was being re-defined which broke functionality. Fixed
that, re-used getattr for consistency
* Use set_value instead of raw query
* Style fixes
2021-11-03 16:13:09 +05:30
Gavin D'souza
e989bfa41d
style: Indents & file headers
2021-11-03 16:12:27 +05:30
Jannat Patel
49e084868b
fix: indentation and filter condition
2021-11-03 15:24:23 +05:30
mergify[bot]
46dcf0eccd
Merge pull request #14868 from revant/build-on-rel
...
chore: migrate docker to github actions
2021-11-03 09:42:59 +00:00
Jannat Patel
f3f01d1978
fix: github api endpoint
2021-11-03 14:58:16 +05:30
mtraeber
151768d1d9
added method param again after merge
2021-11-03 09:36:00 +01:00
Revant Nandgaonkar
9b68a9e5b4
ci: change GITHUB_PAT to CI_PAT
2021-11-03 13:51:46 +05:30
mtraeber
8a7889b928
Merge branch 'develop' into multiple_imap_folder
2021-11-03 08:55:29 +01:00
Manuel
77ae41728f
Merge branch 'frappe:develop' into develop
2021-11-03 08:49:56 +01:00
Jannat Patel
cf059039eb
fix: empty state for discussions
2021-11-03 11:37:09 +05:30
mergify[bot]
91f446ef04
Merge pull request #14356 from shariquerik/primary-navbar-css-fix
...
fix: Fixed css for Primary Navbar template
2021-11-03 05:57:57 +00:00
Suraj Shetty
3b276df7c1
Merge branch 'develop' into refactor-linked-with
2021-11-03 11:13:53 +05:30
mergify[bot]
92ad320917
Merge pull request #14489 from shariquerik/custom-report-dependency-fix
...
fix: Multi level custom report fix
2021-11-02 14:15:51 +00:00
Shariq Ansari
ee07134db2
Merge branch 'frappe:develop' into check-ui-test
2021-11-02 19:05:37 +05:30
Shariq Ansari
d7b06299af
test: Minor fix
2021-11-02 18:43:58 +05:30
Shariq Ansari
06d8d8535f
test: Fixed form.js
2021-11-02 18:20:36 +05:30
Shariq Ansari
bf0fb0de5c
test: Added UI test for multi level query report
2021-11-02 17:39:14 +05:30
Faris Ansari
2f8a6491f7
Merge pull request #14854 from netchampfaris/bench-browse-login-as-user
...
fix: login as user with browse command
2021-11-02 17:12:18 +05:30
Shariq Ansari
7a6bee9dab
test: fixed failing test(timeline, recorder, navigation)
2021-11-02 15:37:57 +05:30
Faris Ansari
c75f15e25a
fix: print url only when user is Administrator
2021-11-02 13:52:09 +05:30
