Suraj Shetty
a1664330a7
Merge pull request #16344 from frappe/mergify/bp/develop/pr-16239
3 年之前
Shariq Ansari
5c6c9bb5c4
fix: resolved conflicts in database.py
3 年之前
Shariq Ansari
d97c7e7caf
fix: resolved conflicts in permissions.py
3 年之前
mergify[bot]
367e3fdb4e
Merge pull request #16357 from tirkarthi/fix-assert-1
test: Use assertEqual instead of assertEquals for Python 3.11 compatibility.
3 年之前
Karthikeyan Singaravelan
880832671a
fix: use assertEqual instead of assertEquals for Python 3.11 compatibility
3 年之前
Suraj Shetty
47d9f0573d
Merge pull request #16353 from frappe/mergify/bp/develop/pr-16018
3 年之前
Sagar Vora
810867a0d5
fix: merge conflict
3 年之前
Isaiah Galorport
dbb622fce1
fix: Other user must not able to delete other user's comment except System Manager ( #16018 )
* fix: Other user must not able to delete other user's comment except Admin
* Update frappe/public/js/frappe/form/footer/form_timeline.js
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* fix: Close condition scope
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit e4137ca8a1
)
# Conflicts:
# frappe/public/js/frappe/form/footer/form_timeline.js
3 年之前
mergify[bot]
3c37944f44
Merge pull request #16334 from ankush/exists_go_brrr
perf: limit rows to 1 for `get_value` and `exists`
3 年之前
Ankush Menat
1054a1203e
fix: assinging thread locals to global variables
3 年之前
Ankush Menat
a832aa27af
chore: whitespace
3 年之前
Shariq Ansari
fbac6fbfb4
fix: only remove \n\t from start and end
(cherry picked from commit 7bb172365f
)
# Conflicts:
# frappe/database/database.py
3 年之前
Shariq Ansari
b2c0bf7a4e
fix: remove tab \t and newlines \n from start of query and remove from middle
(cherry picked from commit ac5effc7dd
)
# Conflicts:
# frappe/database/database.py
3 年之前
Shariq Ansari
10fbb4330a
fix: setting permissions to any role of some doctypes is not working
(cherry picked from commit 6612232bab
)
# Conflicts:
# frappe/permissions.py
3 年之前
Ankush Menat
85428e817d
test: get_value(s) with limits
3 年之前
Ankush Menat
b97cfed6d7
perf: limit rows to 1 for get_value and exists
3 年之前
mergify[bot]
f47331cd1d
Merge pull request #16200 from alyf-de/refactor-db-exists
refactor: `frappe.db.exists`
3 年之前
mergify[bot]
9032cb25fe
Merge pull request #16220 from pateljannat/web-form-list-empty-state
fix: web form list empty state
3 年之前
mergify[bot]
49621746b7
Merge pull request #16213 from pateljannat/web-form-list-button
fix: web form list button
3 年之前
Suraj Shetty
afd5956e31
style: Fix formatting
3 年之前
Jannat Patel
039566a81b
Merge branch 'develop' into web-form-list-button
3 年之前
Jannat Patel
d5b62d4d2d
Merge branch 'develop' into web-form-list-empty-state
3 年之前
mergify[bot]
2c5a0b084e
Merge pull request #16338 from alyf-de/remove-useless-fallback
refactor: remove unused fallback value
3 年之前
mergify[bot]
cf0765916e
Merge pull request #16340 from alyf-de/refactor-backup-utils
fix: backup utils
3 年之前
mergify[bot]
5c709b3750
Merge pull request #16341 from alyf-de/remove-useless-pass
refactor: remove useless pass, log error
3 年之前
Himanshu
3bab770bec
Merge pull request #16342 from alyf-de/fix-concat
fix: use result of `Array.concat()`
3 年之前
barredterra
9a2a2e7abe
fix: assign result of concat
3 年之前
barredterra
8a4f316ec5
refactor: remove useless pass, log error
3 年之前
barredterra
1d3ec42974
fix: send_email doesn't take arguments
3 年之前
barredterra
4b8efc5ebd
fix: typo in parameter name
3 年之前
barredterra
0d8733c462
refactor: remove unused import
3 年之前
barredterra
687ca6972d
refactor: remove unused fallback
3 年之前
Jannat Patel
def2b6fbd1
Merge branch 'develop' into web-form-list-button
3 年之前
Suraj Shetty
abd421fa02
Merge pull request #12466 from shariquerik/user-permission-not-saved-fix
3 年之前
Suraj Shetty
fedcf48ada
fix: Customize form issue where it remains "Not Saved" even after update
fixes: https://github.com/frappe/frappe/issues/16068
3 年之前
Suraj Shetty
adb989fff2
feat: Option to set form dirty even if form save is disabled
3 年之前
Suraj Shetty
c4be72c2d4
fix: Pass skip_dirty_trigger flag to the set_value and model trigger
Also, renamed avoid_dirty to skip_dirty_trigger to be more explicit
3 年之前
Jannat Patel
69eb45d1ff
Merge branch 'web-form-list-empty-state' of https://github.com/pateljannat/frappe into web-form-list-empty-state
3 年之前
Jannat Patel
bbcb99d65d
fix: removed console
3 年之前
Jannat Patel
16216ce773
Merge branch 'develop' into web-form-list-empty-state
3 年之前
Jannat Patel
d5a7cd88e4
Merge branch 'web-form-list-empty-state' of https://github.com/pateljannat/frappe into web-form-list-empty-state
3 年之前
Jannat Patel
d68187ab96
fix: empty state height
3 年之前
Suraj Shetty
fc268db633
Merge branch 'develop' into user-permission-not-saved-fix
3 年之前
gavin
e696a8d73a
Merge pull request #16305 from gavindsouza/drop-site-pg
feat: Drop site support for postgres
3 年之前
Suraj Shetty
1d03424e26
Merge branch 'develop' into user-permission-not-saved-fix
3 年之前
mergify[bot]
5d0ff49296
Merge pull request #16321 from rmehta/website-fixes
fix(build): separate assets.json and assets-rtl.json to fix concurrency issue
3 年之前
Rushabh Mehta
0b8a2edee7
fix(build): separate assets.json and assets-rtl.json to fix concurrency issue
3 年之前
mergify[bot]
b176443792
Merge pull request #16070 from shariquerik/grid-search-feat
feat: Grid Search
3 年之前
mergify[bot]
0374e1511f
Merge pull request #16317 from shariquerik/list-paging-test-fix
test: failing list_paging UI test
3 年之前
Suraj Shetty
d214f25328
Merge pull request #16291 from shadrak98/support-portal
3 年之前