Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: proceduretech/psono-admin-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: psono/psono-admin-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 51,743 additions and 27,817 deletions.
  1. +6 −6 .eslintrc
  2. +2 −1 .gitignore
  3. +136 −146 .gitlab-ci.yml
  4. +1 −0 .nvmrc
  5. +5 −3 README.md
  6. +35,432 −16,202 package-lock.json
  7. +34 −32 package.json
  8. BIN public/apple-icon.png
  9. BIN public/apple-touch-icon.png
  10. +3 −4 public/config.json
  11. BIN public/favicon-16x16.png
  12. BIN public/favicon-32x32.png
  13. BIN public/favicon.ico
  14. +3 −1 public/index.html
  15. 0 public/locales/{zh-cn → ca}/translation.json
  16. +0 −249 public/locales/de/translation.json
  17. +160 −21 public/locales/en/translation.json
  18. +2 −0 public/locales/zh-Hans/translation.json
  19. +2 −0 public/locales/zh-Hant/translation.json
  20. +67 −48 src/actions/actionCreators.js
  21. +13 −12 src/actions/actionTypes.js
  22. +5 −5 src/actions/boundActionCreators.js
  23. BIN src/assets/img/apple-icon.png
  24. BIN src/assets/img/apple-touch-icon.png
  25. BIN src/assets/img/cover.jpeg
  26. BIN src/assets/img/favicon-16x16.png
  27. BIN src/assets/img/favicon-32x32.png
  28. BIN src/assets/img/favicon.ico
  29. BIN src/assets/img/favicon.png
  30. BIN src/assets/img/logo.png
  31. BIN src/assets/img/mask.png
  32. BIN src/assets/img/new_logo.png
  33. BIN src/assets/img/sc-logo.png
  34. BIN src/assets/img/tim_80x80.png
  35. +68 −70 src/components/Card/ChartCard.jsx
  36. +42 −50 src/components/Card/FileserverCard.jsx
  37. +234 −107 src/components/Card/GroupCard.jsx
  38. +47 −55 src/components/Card/HealthcheckCard.jsx
  39. +66 −33 src/components/Card/LDAPCard.jsx
  40. +46 −50 src/components/Card/LicenseCard.jsx
  41. +86 −0 src/components/Card/OIDCCard.jsx
  42. +47 −58 src/components/Card/ProfileCard.jsx
  43. +118 −130 src/components/Card/ReleaseCard.jsx
  44. +70 −38 src/components/Card/SAMLCard.jsx
  45. +85 −0 src/components/Card/SCIMCard.jsx
  46. +44 −50 src/components/Card/Sessions.jsx
  47. +11 −10 src/components/Card/StatsCard.jsx
  48. +339 −232 src/components/Card/UserCard.jsx
  49. +0 −267 src/components/Card/UsersCard.jsx
  50. +50 −52 src/components/Card/VersionCard.jsx
  51. +23 −19 src/components/CustomButtons/IconButton.jsx
  52. +60 −69 src/components/CustomInput/CustomInput.jsx
  53. +39 −45 src/components/Dialog/DeleteConfirmDialog.js
  54. +40 −43 src/components/Footer/Footer.jsx
  55. +1,502 −764 src/components/Form/LoginForm.jsx
  56. +9 −12 src/components/Grid/GridItem.jsx
  57. +44 −49 src/components/Header/Header.jsx
  58. +105 −106 src/components/Header/HeaderLinks.jsx
  59. +36 −33 src/components/Notification/Notification.jsx
  60. +116 −116 src/components/Sidebar/Sidebar.jsx
  61. +58 −63 src/components/Snackbar/Snackbar.jsx
  62. +39 −41 src/components/Snackbar/SnackbarContent.jsx
  63. +226 −97 src/components/Table/CustomMaterialTable.jsx
  64. +42 −57 src/components/Table/Table.jsx
  65. +78 −89 src/components/Tasks/Tasks.jsx
  66. +12 −14 src/components/Typography/A.jsx
  67. +9 −13 src/components/Typography/Danger.jsx
  68. +9 −11 src/components/Typography/Info.jsx
  69. +9 −11 src/components/Typography/Muted.jsx
  70. +9 −11 src/components/Typography/P.jsx
  71. +9 −13 src/components/Typography/Primary.jsx
  72. +9 −14 src/components/Typography/Quote.jsx
  73. +9 −11 src/components/Typography/Small.jsx
  74. +9 −13 src/components/Typography/Success.jsx
  75. +9 −13 src/components/Typography/Warning.jsx
  76. +5 −3 src/components/index.js
  77. +84 −103 src/containers/App.js
  78. +0 −7 src/containers/App.test.js
  79. +106 −0 src/containers/ChartCard/browser.js
  80. +111 −0 src/containers/ChartCard/device.js
  81. +109 −0 src/containers/ChartCard/os.js
  82. +110 −0 src/containers/ChartCard/two_factor.js
  83. +137 −0 src/containers/Index/Index.js
  84. +0 −133 src/containers/Index/Index.jsx
  85. +93 −0 src/containers/Index/SwitchRoutes.js
  86. +0 −74 src/containers/Index/SwitchRoutes.jsx
  87. +86 −0 src/containers/Login/Login.js
  88. +0 −80 src/containers/Login/Login.jsx
  89. +167 −4 src/i18n.js
  90. +9 −3 src/index.js
  91. +25 −25 src/reducers/client.js
  92. +18 −18 src/reducers/index.js
  93. +29 −29 src/reducers/notification.js
  94. +27 −27 src/reducers/persistent.js
  95. +91 −79 src/reducers/user.js
  96. +15 −0 src/routes/ee.js
  97. +15 −15 src/routes/{ldap.jsx → ldap.js}
  98. +0 −10 src/routes/main.jsx
  99. +15 −0 src/routes/oidc.js
  100. +71 −47 src/routes/{other.jsx → other.js}
  101. +10 −2 src/routes/{saml.jsx → saml.js}
  102. +14 −21 src/routes/{sidebar.jsx → sidebar.js}
  103. +23 −23 src/services/api-client.js
  104. +1,536 −442 src/services/api-server.js
  105. +26 −26 src/services/api-static.js
  106. +58 −11 src/services/browser-client.js
  107. +6 −6 src/services/clientjs.js
  108. +460 −425 src/services/converter.js
  109. +144 −213 src/services/converter.test.js
  110. +441 −424 src/services/cryptoLibrary.js
  111. +0 −357 src/services/cryptoLibrary.test.js
  112. +119 −119 src/services/device.js
  113. +494 −428 src/services/helper.js
  114. +296 −262 src/services/helper.test.js
  115. +258 −193 src/services/host.js
  116. +41 −0 src/services/ivalt.js
  117. +42 −42 src/services/notification.js
  118. +29 −29 src/services/store.js
  119. +278 −164 src/services/user.js
  120. +66 −0 src/services/webauthn.js
  121. +14 −19 src/setupTests.js
  122. +63 −0 src/views/Dashboard/HealthCheck.js
  123. +432 −528 src/views/Dashboard/Index.jsx
  124. +115 −111 src/views/Group/Create.js
  125. +1,079 −450 src/views/Group/Edit.jsx
  126. +168 −0 src/views/Group/ShareRightCreate.js
  127. +166 −0 src/views/Groups/Index.jsx
  128. +57 −62 src/views/Icons/Icons.jsx
  129. +80 −84 src/views/LDAP/Index.jsx
  130. +0 −103 src/views/Maps/Maps.jsx
  131. +264 −280 src/views/Notifications/Notifications.jsx
  132. +77 −0 src/views/OIDC/Index.jsx
  133. +115 −0 src/views/Policies/Create.js
  134. +1,099 −0 src/views/Policies/Edit.jsx
  135. +144 −0 src/views/Policies/Index.jsx
  136. +75 −42 src/views/SAML/Index.jsx
  137. +76 −0 src/views/SCIM/Index.jsx
  138. +275 −283 src/views/SecurityReport/Edit.jsx
  139. +334 −713 src/views/SecurityReports/Index.jsx
  140. +119 −126 src/views/TableList/TableList.jsx
  141. +113 −142 src/views/Typography/Typography.jsx
  142. +201 −229 src/views/User/Create.js
  143. +565 −402 src/views/User/Edit.jsx
  144. +134 −138 src/views/UserProfile/UserProfile.jsx
  145. +331 −520 src/views/Users/Index.jsx
  146. +4 −2 var/build-ubuntu.sh
  147. +4 −7 var/deploy-docker.sh
  148. +2 −2 var/deploy-github.sh
  149. +5 −7 var/deploy_changelog.sh
  150. +12 −0 var/deploy_nightlyartifacts.sh
  151. +13 −0 var/deploy_releaseartifacts.sh
  152. +7 −3 var/download_translations_from_artifactory.sh
  153. +9 −61 var/sync_translations.py
  154. +135 −0 var/translate.py
  155. +58 −0 var/upload_translations.py
12 changes: 6 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "react-app",
"rules": {
"indent": ["error", 2]
}
}
{
"extends": "react-app",
"rules": {
"indent": "off"
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -18,4 +18,5 @@

npm-debug.log*

.idea
.idea
untranslated
Loading