Commit graph

36194 commits

Author SHA1 Message Date
Shariq Ansari
4c994aeca2 fix: updated code to make workspace responsive 2022-01-24 10:50:37 +05:30
Shariq Ansari
178ec8e687
Merge branch 'develop' into wspace-new-design 2022-01-17 16:04:15 +05:30
mergify[bot]
9c9c62d71c
Merge pull request #15632 from alyf-de/is_none
refactor: use `is None` instead of `== None`
2022-01-17 10:04:10 +00:00
barredterra
b1383df15a refactor: use is None instead of == None 2022-01-17 10:37:51 +01:00
Suraj Shetty
eab99f4596
Merge pull request #15627 from surajshetty3416/fix-session-expiry 2022-01-17 14:07:16 +05:30
Shariq Ansari
86e9050ae6
Merge branch 'develop' into wspace-new-design 2022-01-17 12:41:49 +05:30
Suraj Shetty
b6cb0fc1e7 fix: Pass SQL string of lastupdate instead of normal string
- Normal string of pypika field has additional quotes
which creates a invalid query
- `get_sql` returns column name without additional quotes
2022-01-17 10:01:29 +05:30
Shadrak Gurupnor
c3409c818e
fix: patch for validating options field (#15565)
* fix: patch for validating options field

* fix: reorder patch execution

* refactor: reduce queries for patching

* refactor: change patch name and license

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-15 14:45:01 +00:00
mergify[bot]
2ea25f0baa
Merge pull request #15615 from ankush/perm_import
fix: AttributeError when calling frappe.permissions.$function
2022-01-14 12:52:56 +00:00
Shariq Ansari
2efc917087
Merge branch 'develop' into wspace-new-design 2022-01-14 18:17:45 +05:30
Ankush Menat
d09fd25ad7 fix: import permissions
For some reason not importing this is causing issue with running the
functionality directly; specifically when running from background job.
2022-01-14 18:03:41 +05:30
Shariq Ansari
cd670d1648 fix: sider fix 2022-01-14 13:57:26 +05:30
mergify[bot]
1313d66fae
Merge pull request #15561 from ruthra-kumar/data_exporter_bug
fix: data exporter throwing exception
2022-01-14 07:15:40 +00:00
Shariq Ansari
ca955d2054 fix: unescape html while making blocks 2022-01-14 12:23:35 +05:30
ruthra
93ae700612 test: add test cases for Data Export tool 2022-01-14 11:54:42 +05:30
Rushabh Mehta
0486cde0a5
Merge pull request #15606 from rmehta/fix-user-info
fix: load user_info on-demand
2022-01-14 09:58:28 +05:30
Suraj Shetty
db5fab52ed
Merge pull request #15610 from surajshetty3416/toggle-theme-option 2022-01-14 09:16:24 +05:30
Suraj Shetty
645f23a9a7 fix: Add toggle theme as standard dropdown option
- For new sites toggle theme was not available. It was added via patch for old sites.
2022-01-13 19:45:48 +05:30
Rushabh Mehta
545a3a3ac4 fix(minor): handle for illegal user 2022-01-13 18:49:18 +05:30
Shariq Ansari
75bd15ab56
Merge branch 'develop' into wspace-new-design 2022-01-13 18:42:51 +05:30
Shariq Ansari
94869e8e69 fix: updated standard workspace json files 2022-01-13 18:40:36 +05:30
gavin
dcbb9bb60f
Merge pull request #15597 from gavindsouza/refactor-backup-tests
refactor: Test Commands
2022-01-13 18:16:09 +05:30
Rushabh Mehta
b08f9f3649 fix(minor): linting errors 2022-01-13 17:13:34 +05:30
Shariq Ansari
e0119cfb2a fix: added notification for workspace creation, editing, duplicating and rearranging sidebar pages 2022-01-13 17:10:06 +05:30
Rushabh Mehta
d2b9fc89ed fix(minor): incorrect condition 2022-01-13 16:55:28 +05:30
Rushabh Mehta
5b5662ed9a fix(minor): remove print 2022-01-13 16:41:47 +05:30
Rushabh Mehta
853287f49d fix: load user_info on-demand 2022-01-13 16:39:24 +05:30
Gavin D'souza
023269d927 test(fix): Remove options passed in archive backup tests
* Run archive tests only for MariaDB
* Removed and added the options for root and admin passwd because they
  were in the site_config and not in common_ :')
2022-01-13 15:42:02 +05:30
Shariq Ansari
3b188e92e6
Merge branch 'develop' into wspace-new-design 2022-01-13 13:31:19 +05:30
Gavin D'souza
d5b3fc04e0 fix: Breaking backup tests due to site settings 2022-01-13 13:25:32 +05:30
Shariq Ansari
759949aef4 test: Updated workspace test based on new design 2022-01-13 12:57:02 +05:30
Shariq Ansari
8072eee5ae fix: while deleting page save customization button should not be visible 2022-01-13 12:56:26 +05:30
mergify[bot]
daab7b580f
Merge pull request #15601 from ruchamahabal/fix-field-placement
fix(minor): Is Custom field placement in Role form
2022-01-13 06:15:37 +00:00
Rucha Mahabal
b878b71e37 fix(minor): Is Custom field placement in Role form 2022-01-12 20:19:05 +05:30
mergify[bot]
fa2cbe6a45
Merge pull request #15483 from Aradhya-Tripathi/at-fix
fix: fixed `frappe.db.escape` in query generated by query builder
2022-01-12 11:29:36 +00:00
Shariq Ansari
b85d5bd483 chore: renamed wspace to workspace 2022-01-12 16:21:14 +05:30
Gavin D'souza
7136106e3d test: Clear cache on updating system settings 2022-01-12 16:14:24 +05:30
Gavin D'souza
9e281e7b19 refactor: Test Commands
* Separate out test case for backup cases
  * Split each case into separate tests
  * Add teardown to remove files geenrated in custom paths
* Rename test that wasn't running
* Rename test cases for consistency
2022-01-12 16:01:03 +05:30
mergify[bot]
a54bf39ec3
Merge pull request #15591 from sumaiya2908/html-editor-fixes
fix: html mode for ace editor
2022-01-12 07:14:33 +00:00
Rushabh Mehta
712cf9563e
Merge pull request #15563 from Alchez/dev-connected-app-auth-url
fix: allow longer authorization URIs
2022-01-12 12:19:16 +05:30
Rushabh Mehta
beada02a7e
Merge pull request #15436 from sumaiya2908/cleanup-portal
refactor(UI): cleanup portal pages
2022-01-12 10:36:03 +05:30
Summayya
75c0e76030 fix: html mode for ace editor 2022-01-11 19:33:30 +05:30
mergify[bot]
85fc42a1ea
Merge pull request #15549 from nextchamp-saqib/handle-504-errors
fix: catch exceptions while parsing json on request failure
2022-01-11 13:28:38 +00:00
Summayya
9ce0031d7c refactor: code indentation 2022-01-11 18:18:50 +05:30
Summayya
425f6eca43 refactor: code indentation 2022-01-11 18:17:09 +05:30
Ankush Menat
eeff2a22f8
fix: enable languages inserted during setup (#15588) 2022-01-11 18:13:11 +05:30
Suraj Shetty
0c23852287
Merge branch 'develop' into cleanup-portal 2022-01-11 17:44:01 +05:30
Shariq Ansari
8dcf416eb6
Merge branch 'develop' into wspace-new-design 2022-01-11 17:31:27 +05:30
Shariq Ansari
1d3c113396 fix: don't show current page in parent's field while editing page details 2022-01-11 17:26:35 +05:30
Shariq Ansari
01b6107148 fix: set correct seq_id while duplicating page 2022-01-11 17:24:34 +05:30