Compare commits

..

10 Commits

Author SHA1 Message Date
Michael Albert c6b0cabcce Merge pull request #27 from dklimpel/increase_export
Increase export of users up to 10000
2020-07-10 15:31:25 +02:00
Michael Albert 1764554ce9 Update users.js 2020-07-10 15:29:58 +02:00
Michael Albert 5dfeb0abe2 Merge branch 'master' into increase_export 2020-07-10 15:26:14 +02:00
Michael Albert 5f580fabce Merge branch 'master' into increase_export 2020-05-25 08:19:42 +02:00
Dirk Klimpel 5f8b5db415 Update user.js to fix error in resolve conflict 2020-04-06 12:56:34 +02:00
Dirk Klimpel f51c904aa1 Merge branch 'master' into increase_export 2020-04-06 12:44:54 +02:00
Dirk Klimpel 5792d55a97 Merge branch 'master' into increase_export 2020-03-30 11:42:34 +02:00
dklimpel 067dbd3b82 Fix coding style 2020-03-29 21:13:23 +02:00
dklimpel d805dcd2c6 Fix coding style 2020-03-29 20:59:54 +02:00
dklimpel 68e5a72618 Increase export of users up to 5000 2020-03-28 22:31:59 +01:00
3 changed files with 1197 additions and 1356 deletions
+2 -2
View File
@@ -12,7 +12,7 @@
"devDependencies": { "devDependencies": {
"@testing-library/jest-dom": "^5.1.1", "@testing-library/jest-dom": "^5.1.1",
"@testing-library/react": "^10.0.2", "@testing-library/react": "^10.0.2",
"@testing-library/user-event": "^12.0.11", "@testing-library/user-event": "^10.0.1",
"enzyme": "^3.11.0", "enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2", "enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0", "eslint": "^6.8.0",
@@ -24,7 +24,7 @@
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"ra-language-german": "^2.1.2", "ra-language-german": "^2.1.2",
"react": "^16.13.1", "react": "^16.13.1",
"react-admin": "^3.7.0", "react-admin": "^3.4.0",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-scripts": "^3.4.1" "react-scripts": "^3.4.1"
}, },
+2 -2
View File
@@ -50,7 +50,7 @@ const useStyles = makeStyles({
}, },
}); });
const UserListActions = ({ const ListActions = ({
currentSort, currentSort,
className, className,
resource, resource,
@@ -129,7 +129,7 @@ export const UserList = props => {
{...props} {...props}
filters={<UserFilter />} filters={<UserFilter />}
filterDefaultValues={{ guests: true, deactivated: false }} filterDefaultValues={{ guests: true, deactivated: false }}
actions={<UserListActions maxResults={10000} />} actions={<ListActions maxResults={10000} />}
bulkActionButtons={<UserBulkActionButtons />} bulkActionButtons={<UserBulkActionButtons />}
pagination={<UserPagination />} pagination={<UserPagination />}
> >
+1193 -1352
View File
File diff suppressed because it is too large Load Diff