5 Commits

Author SHA1 Message Date
primakov 61cfd689f8 2.4.4
platform/bro/pipeline/head This commit looks good
2024-04-27 11:54:26 +03:00
primakov 82a54022b2 Merge pull request '#25 Отображение только времени в случае сгрупированных по дате лекций' (#26) from feature/lesson-date-time into master
platform/bro/pipeline/head This commit looks good
Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/26
2024-04-15 13:48:39 +03:00
primakov f28c644da5 #25 Отображение только времени в случае сгрупированных по дате лекций
platform/bro/pipeline/head This commit looks good
platform/bro/pipeline/pr-master This commit looks good
2024-04-15 13:45:35 +03:00
primakov 50bf5b31b6 2.4.3
platform/bro/pipeline/head This commit looks good
2024-04-11 13:03:27 +03:00
primakov 5670a96696 check jenkins script
platform/bro/pipeline/head This commit looks good
2024-04-11 12:52:40 +03:00
4 changed files with 4 additions and 5 deletions
-1
View File
@@ -12,7 +12,6 @@ module.exports = {
},
features: {
journal: {
// add your features here in the format [featureName]: { value: string }
'lesson.bar': {
on: true,
value: '',
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "journal.pl",
"version": "2.4.2",
"version": "2.4.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "journal.pl",
"version": "2.4.2",
"version": "2.4.4",
"license": "MIT",
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "journal.pl",
"version": "2.4.2",
"version": "2.4.4",
"description": "inno-js platform journal ui repo",
"main": "./src/index.tsx",
"scripts": {
+1 -1
View File
@@ -453,7 +453,7 @@ const LessonList = () => {
</Td>
)}
<Td textAlign="center">
{dayjs(lesson.date).format('H:mm DD.MM.YY')}
{dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
</Td>
<Td>{lesson.name}</Td>
{isTeacher(user) && (