Skip to content

Commit c121959

Browse files
committed
Merge dev to master
1 parent 2aa1737 commit c121959

File tree

4 files changed

+13
-24
lines changed

4 files changed

+13
-24
lines changed

Dockerfile

Lines changed: 0 additions & 19 deletions
This file was deleted.

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2019 Flatlogic LLC.
3+
Copyright (c) 2022 Flatlogic LLC.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
# [2.3.0] - 01/06/2022
4+
5+
- Updated from MUI4 to MUI5, fixed Dark Theme
6+
- Fixed Grid actions
7+
- Fixed various bugs related to DataGrid
8+
- Updated packages
9+
310
# [2.2.5] - 05/03/2021
411

512
- Fixed errors

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
2-
"name": "reactmaterialadminfull",
3-
"description": "React Material Admin Full - template backend",
4-
"version": "0.1.1",
2+
"name": "react-material-full",
3+
"description": "React Material Admin Full",
4+
"version": "2.3.0",
55
"private": true,
66
"homepage": "./",
77
"scripts": {
88
"build": "cross-env REACT_APP_BACKEND=true NODE_ENV=production PUBLIC_URL='./' react-scripts build",
9-
"start": "cross-env REACT_APP_BACKEND=true react-scripts start",
9+
"start": "cross-env REACT_APP_BACKEND=false react-scripts start",
10+
"dev": "cross-env react-scripts start",
1011
"test": "react-scripts test",
1112
"format": "prettier --write src/"
1213
},

0 commit comments

Comments
 (0)