vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
34362 commits 1 branch 0 tags 587 MiB
Commit graph

2611 commits

Author SHA1 Message Date
Rushabh Mehta
22f143898b fix(minor): frappe.toast alist from frappe.show_alert, and added toasts to website.js, plus show full processlist 2021-09-10 11:27:36 +05:30
Rushabh Mehta
0e2d98a473 feat(minor): Show Processlist in System Console 2021-09-09 13:33:28 +05:30
Suraj Shetty
92fceb88d5
Merge branch 'develop' into timeline-missing-comments 2021-09-06 22:57:59 +05:30
Gavin D'souza
a233bf1061 fix: Add workflow comments in form timeline 
* Add Edit, Label along with Info timeline logs
* Added title field for timeline icon
 2021-09-06 19:39:08 +05:30
Gavin D'souza
6f0a02aaa5 fix: Handle multiple comment types in get_comments 2021-09-06 19:37:39 +05:30
leela
768e4052f9 fix: node creation from tree view 
(cherry picked from commit f8cd2ad388c96eefff4730ce130806231bc0d87e)
 2021-09-06 07:04:05 +00:00
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE 
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
 2021-09-03 12:02:59 +05:30
Gavin D'souza
65864c027f chore: Update module license header 
These modules were imported from the ERPNext codebase into Frappe.
License header was overlooked at that point. These were contributed
initially by Frappe Technologies Pvt Ltd under GPLv3 (ERPNext's license) and now
we, as Frappe Technologies Pvt Ltd converting them to MIT to comply with
Frappe's license.
 2021-09-03 11:51:01 +05:30
Shariq Ansari
95ba4a53c1 fix: error while deleting links in cards 2021-09-01 12:41:53 +05:30
Shariq Ansari
025be09772 fix: Home redirect issue and made default content as [] 2021-08-30 18:49:34 +05:30
Suraj Shetty
8948eadaf5
Merge branch 'develop' into auto_email_report_null_values 2021-08-30 11:21:53 +05:30
Mohammad Hasnain Mohsin Rajan
7ab7da5c65
fix: only enabled users in mentions (#14017) 
* fix: only enabled users in mentions

* Update frappe/desk/search.py

Co-authored-by: gavin <gavin18d@gmail.com>

* test: add test cases to disallow disabled in mention

* test: pass roles as single values

* style: Remove extra space and line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: gavin <gavin18d@gmail.com>
 2021-08-27 05:09:40 +00:00
Gavin D'souza
3e1d9dcbe3 chore(workspace): Comment out flaky test 2021-08-25 15:40:30 +05:30
Suraj Shetty
b38436243b
Merge pull request #13635 from GangaManoj/fix-workspace-boot-error 2021-08-25 13:31:22 +05:30
Suraj Shetty
7988ea37f6
Merge branch 'develop' into fix-system-console-ux 2021-08-24 21:32:32 +05:30
Suraj Shetty
9797c1ad18
Merge branch 'develop' into core-test-coverage-1 2021-08-24 10:23:24 +05:30
Suraj Shetty
3819e4caf3
Merge branch 'develop' into workspace-2-fixes 2021-08-23 15:00:13 +05:30
mergify[bot]
7c178ae18c
fix(ux): better message for removal of assignment (#14008) 
(cherry picked from commit 40352d9df6418e0c435e0ae9f9dd8f96095c70db)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-23 11:28:33 +05:30
Suraj Shetty
743e361449
Merge branch 'develop' into core-test-coverage-1 2021-08-23 11:02:50 +05:30
Faris Ansari
399629da45 fix(ux): Disable button while executing script 
- page.set_action will now pass the btn in the handler callback
 2021-08-21 13:47:42 +05:30
Suraj Shetty
6f72e79f1a test: Add more assertions for reset password 2021-08-20 22:35:01 +05:30
Gavin D'souza
b8f28fd28b test(todo): Use doc.meta instead of doctype form 2021-08-19 20:47:27 +05:30
Gavin D'souza
4df118906f fix: Run test skipped earlier due to missing indent 2021-08-19 20:10:11 +05:30
Gavin D'souza
ebc220db39 refactor(tests): frappe.db.delete > frappe.db.sql 
Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql ;)
This commit focuses on the tests written under the doctype specific
tests
 2021-08-19 19:50:48 +05:30
Suraj Shetty
07906594e3 test: Fix failing test 2021-08-19 19:33:37 +05:30
Suraj Shetty
a7fb1816aa refactor: Remove unused and redundant code 2021-08-19 15:27:25 +05:30
shariquerik
ca4d220f14 fix: sider fix 2021-08-19 14:20:18 +05:30
shariquerik
6a599f77eb fix: Content validation 2021-08-19 14:07:52 +05:30
shariquerik
bb55ca4c29 fix: Make title and label field mandatory 2021-08-19 12:51:40 +05:30
shariquerik
461dfd6c6e fix: Make Content hidden and added validation 2021-08-19 12:42:43 +05:30
Deepesh Garg
2fcd3b556d fix: Use query report build_xlsx_data function for XLSX and CSV format 2021-08-18 22:53:35 +05:30
Gavin D'souza
f319cb9380 Merge branch 'develop' into fix-workspace-boot-error 2021-08-17 17:47:33 +05:30
Suraj Shetty
54a331a05e
Merge pull request #13952 from shariquerik/workspace2-fixes 2021-08-17 15:04:28 +05:30
shariquerik
013f1f471d fix: Switch Public-Private, Change Customize to Edit, Add Settings button to redirect to workspace document 2021-08-17 11:11:15 +05:30
mergify[bot]
bd6ed2033f
Merge pull request #13152 from shariquerik/wiki-based-desk 
feat: Workspace 2.0
 2021-08-13 06:44:32 +00:00
mergify[bot]
c2524c797f
Merge pull request #13395 from nextchamp-saqib/chart-in-custom-script-reports-dev 
feat: allow duration fields in aggregate function fields
 2021-08-12 03:51:21 +00:00
Gavin D'souza
1c5608f8db Merge branch 'develop' into fix-workspace-boot-error 2021-08-10 14:43:47 +05:30
shariquerik
744b4ec8a2 fix: Added Icon Picker Field 2021-08-05 12:15:12 +05:30
Ankush Menat
a6d3962b80 fix(DX): sourceURL to debug report and page JS 2021-08-04 20:40:31 +05:30
shariquerik
84f195ca19 fix: Resolved Conflicts 2021-08-03 17:53:14 +05:30
Saqib Ansari
ea72dc2aae Merge branch 'develop' of https://github.com/frappe/frappe into chart-in-custom-script-reports-dev 2021-07-31 11:59:31 +05:30
Leela vadlamudi
d4be603cfa
Merge pull request #13816 from leela/fix-incoming-email-receivers 
fix: incoming emails are not sending to the task owners
 2021-07-30 13:37:37 +05:30
leela
07d192f95a fix: incoming emails are not sending to the task owners 2021-07-30 13:02:45 +05:30
Gavin D'souza
d63affc732 refactor(minor): Use ORM instead of raw delete queries 
Modified query building for "IN" statements, as well as older condition
builders to use frappe.db.delete
 2021-07-28 19:04:18 +05:30
Gavin D'souza
7dac03cea0 fix: Re-introduce code erreneously taken out in previous commits 
Due to bulk updations, some statements were missed out/got deleted. This
commit re-introduces them.
 2021-07-28 18:59:18 +05:30
Gavin D'souza
01d275f667 style: Format code for better readability 
* Remove trailing whitespaces
* Format code to fit module conventions
* Add appropriate new lines between imports, classes, fn defs, etc
* Added comments, docstrings & module headers
 2021-07-28 18:55:27 +05:30
Gavin D'souza
a02848849d Merge branch 'develop' of github.com:frappe/frappe into at-queries 2021-07-28 16:00:46 +05:30
Aradhya-Tripathi
84ff1d0af9 style: removed frappe.db.sql comments 2021-07-28 13:48:01 +05:30
Aradhya-Tripathi
2f3371d873 refactor: Moved raw queries to frappe orm 2021-07-23 23:14:24 +05:30
Aradhya-Tripathi
1204ae8ce4 fix: fixed spacing and ui tests 2021-07-23 10:45:54 +05:30