mergify[bot]
|
1fd2dcdf52
|
Merge pull request #11246 from prssanna/child-table-row-index
feat(Report Builder): Ability to show child table row index number
|
2020-08-13 12:25:45 +00:00 |
|
Mangesh-Khairnar
|
b49571f9b3
|
feat(notification): Add WhatsApp/SMS channels (#9623)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
2020-08-13 17:53:09 +05:30 |
|
mergify[bot]
|
ab97621446
|
Merge pull request #11259 from scmmishra/add-total
feat: ignore add total when syncing fixtures
|
2020-08-13 10:46:09 +00:00 |
|
mergify[bot]
|
08629aa0a1
|
Merge pull request #11255 from abhishekbalam/python_in_code_fieldtype
fix(Controls): Added Option For Python in Code Fieldtype
|
2020-08-13 10:33:23 +00:00 |
|
Suraj Shetty
|
6f325cc67d
|
Merge branch 'develop' into add-total
|
2020-08-13 15:59:13 +05:30 |
|
Abhishek Balam
|
08d0552ef7
|
fix: show language error only when language is set in options
|
2020-08-13 14:38:57 +05:30 |
|
Shivam Mishra
|
0e380510c5
|
feat: ignore add total when syncing fixtures
|
2020-08-13 13:57:07 +05:30 |
|
Abhishek Balam
|
89492d26ab
|
fix: add option for python in code fieldtype
|
2020-08-12 21:37:49 +05:30 |
|
mergify[bot]
|
f688bb3ac6
|
Merge pull request #11116 from nextchamp-saqib/invalid-date-filter
fix: throw message for invalid date filter
|
2020-08-12 12:20:17 +00:00 |
|
mergify[bot]
|
1ab68dd917
|
Merge pull request #11213 from deepeshgarg007/configurable_navbar
feat: Configurable navbar logo and dropdowns
|
2020-08-12 11:57:09 +00:00 |
|
mergify[bot]
|
1beaaa5875
|
Merge pull request #11230 from scmmishra/fix-quill-formatter
refactor: catch exceptions in formatters for text editor
|
2020-08-12 11:33:24 +00:00 |
|
Prssanna Desai
|
8abfae2586
|
Merge branch 'develop' into child-table-row-index
|
2020-08-12 17:01:13 +05:30 |
|
Suraj Shetty
|
1ff9bdca9a
|
Merge branch 'develop' into invalid-date-filter
|
2020-08-12 16:47:59 +05:30 |
|
Suraj Shetty
|
959a79e706
|
Merge branch 'develop' into fix-quill-formatter
|
2020-08-12 16:46:46 +05:30 |
|
prssanna
|
9717ba3907
|
style: missing semicolon
|
2020-08-12 16:45:28 +05:30 |
|
prssanna
|
8f558b56db
|
fix: check field only if doctype is same
|
2020-08-12 16:36:45 +05:30 |
|
prssanna
|
5c5253e00d
|
feat(Report Builder): Ability to show child table row index number
|
2020-08-12 16:35:44 +05:30 |
|
Raffael Meyer
|
0bfba240cf
|
feat: allow long passwords (#11065)
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
|
2020-08-12 16:09:59 +05:30 |
|
Suraj Shetty
|
d80cdb1214
|
Merge branch 'develop' into configurable_navbar
|
2020-08-12 15:16:31 +05:30 |
|
mergify[bot]
|
8c56fac677
|
Merge pull request #11126 from Mangesh-Khairnar/fix-mandatory-check
fix(field-group): strip html to check for null values
|
2020-08-12 07:44:16 +00:00 |
|
Rushabh Mehta
|
5549efa87a
|
Merge pull request #11236 from surajshetty3416/fix-failing-ui-test
fix: Failing UI test
|
2020-08-12 10:45:24 +05:30 |
|
Suraj Shetty
|
e27c910f66
|
fix: Make users while setting up class
|
2020-08-12 00:02:39 +05:30 |
|
Suraj Shetty
|
b03513613f
|
fix: Init site
|
2020-08-11 23:39:55 +05:30 |
|
Suraj Shetty
|
2bd9ab4d98
|
style: Add spaces
JS change to trigger Cypress test
|
2020-08-11 23:29:14 +05:30 |
|
Suraj Shetty
|
a7b3afdff5
|
fix: Add enable in_test flag for ui_tests
|
2020-08-11 23:28:34 +05:30 |
|
Deepesh Garg
|
a7f3956740
|
fix: Pass entire navbar settings
|
2020-08-11 23:04:05 +05:30 |
|
Suraj Shetty
|
8e845b24a6
|
Merge branch 'develop' into fix-quill-formatter
|
2020-08-11 22:51:49 +05:30 |
|
Suraj Shetty
|
b7a5bcadfd
|
chore: Update redis to avoid unexpected exception (#11235)
|
2020-08-11 22:41:45 +05:30 |
|
Deepesh Garg
|
445161fcf6
|
Merge branch 'develop' of https://github.com/frappe/frappe into configurable_navbar
|
2020-08-11 22:40:12 +05:30 |
|
Shivam Mishra
|
23975d5a70
|
feat: catch exceptions on tokenizing values in get_value
|
2020-08-11 20:13:56 +05:30 |
|
mergify[bot]
|
dcddf20369
|
Merge pull request #11221 from scmmishra/feat-events-api
feat: add controller methods to add participants to event
|
2020-08-11 05:04:43 +00:00 |
|
Suraj Shetty
|
59da141e1a
|
Merge branch 'develop' into feat-events-api
|
2020-08-11 10:22:00 +05:30 |
|
Saqib Ansari
|
2076a81d29
|
fix: catch only expected error
|
2020-08-10 17:52:26 +05:30 |
|
Shivam Mishra
|
64f913fa36
|
refactor: catch exceptions
|
2020-08-10 16:51:37 +05:30 |
|
Prssanna Desai
|
2317ffb217
|
Merge pull request #11083 from netchampfaris/dib-fixes-2020-07-22
|
2020-08-10 16:02:01 +05:30 |
|
Prssanna Desai
|
3b618c411c
|
Merge pull request #11224 from frappe/barredterra-patch-2
|
2020-08-10 15:46:08 +05:30 |
|
mergify[bot]
|
1135a92629
|
Merge pull request #11226 from saurabh6790/fix-frappe-logger
fix: cache all apps in local and switch to enable/disable frappe logger
|
2020-08-10 08:17:09 +00:00 |
|
Suraj Shetty
|
7e37591c79
|
Merge branch 'develop' into fix-frappe-logger
|
2020-08-10 13:25:27 +05:30 |
|
mergify[bot]
|
e7aa84f26c
|
Merge pull request #11190 from scmmishra/feat-allow-wide
feat: allow wide attribute in msgprint and throw
|
2020-08-10 07:04:22 +00:00 |
|
Saurabh
|
435b522dbf
|
fix: cache all apps in local and switch to enable/disable frappe logger
|
2020-08-10 12:31:08 +05:30 |
|
Shivam Mishra
|
be4d3ae434
|
feat: allow wide attribute in msgprint and throw
|
2020-08-10 12:16:16 +05:30 |
|
Suraj Shetty
|
48634e131a
|
Merge branch 'develop' into dib-fixes-2020-07-22
|
2020-08-10 12:14:58 +05:30 |
|
Suraj Shetty
|
3f50d8d715
|
Merge branch 'develop' into barredterra-patch-2
|
2020-08-10 12:04:36 +05:30 |
|
Rushabh Mehta
|
10b3641cee
|
Merge pull request #11172 from surajshetty3416/fix-test
chore: Fix and cleanup travis builds
|
2020-08-10 11:35:51 +05:30 |
|
Raffael Meyer
|
be8566e1ac
|
feat: add currency Congolese franc
|
2020-08-09 14:23:25 +02:00 |
|
Suraj Shetty
|
0919dbeccd
|
test: Manually delete jobs instead of deleting job type
- This removes unwanted traceback of "Scheduled Job Type" not found
while running tests
|
2020-08-09 00:06:25 +05:30 |
|
Suraj Shetty
|
7d8695c7d3
|
fix: Provide fallback array for test_mails to avoid unexpected trace in travis
|
2020-08-08 23:46:45 +05:30 |
|
Suraj Shetty
|
52d6925c49
|
test: Fallback to site URL if host_name is none
|
2020-08-08 19:47:54 +05:30 |
|
Suraj Shetty
|
4a33101631
|
fix: Check if frappe.local has "request" to avoid attribute error
|
2020-08-08 19:47:39 +05:30 |
|
Suraj Shetty
|
130cce8840
|
Merge branch 'develop' into fix-test
|
2020-08-08 17:04:37 +05:30 |
|