Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #2788

Merged
merged 54 commits into from
Jul 23, 2024
Merged

Main #2788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f91d586
[Feat] added log update and server in server-web (#2727)
syns2191 Jul 14, 2024
d59ec58
Update README.md
evereq Jul 15, 2024
e2e7900
Merge pull request #2728 from ever-co/develop
evereq Jul 15, 2024
fd73e81
Merge pull request #2729 from ever-co/stage
evereq Jul 15, 2024
10ccb5e
fix: add custome fields on including project repository
GloireMutaliko21 Jul 15, 2024
bf8a68e
Merge pull request #2730 from ever-co/fix/include-repository-relations
evereq Jul 15, 2024
917c048
Merge pull request #2731 from ever-co/develop
evereq Jul 15, 2024
17ec557
Merge pull request #2732 from ever-co/stage
evereq Jul 15, 2024
7c6a36d
fix: passcode signin issue
GloireMutaliko21 Jul 15, 2024
f69d065
Merge pull request #2736 from ever-co/fix/passcode-signin-issue
evereq Jul 15, 2024
cb5d399
[Feat] Filter Daily plans By date range (#2734)
Innocent-Akim Jul 15, 2024
c31986a
fix: daily plan creation, filters and sort etc.
GloireMutaliko21 Jul 15, 2024
5695f89
Merge pull request #2737 from ever-co/fix/daily-plan-creation-issue
evereq Jul 15, 2024
da377da
feat: add today plan notification trigger
GloireMutaliko21 Jul 16, 2024
99854ce
feat: soft Daily Plan triggers
GloireMutaliko21 Jul 16, 2024
e9eb607
refact: daily plan badge
GloireMutaliko21 Jul 17, 2024
caf9122
Merge pull request #2744 from ever-co/fix/daily-plan-badge-visibility
evereq Jul 17, 2024
2477b18
Merge pull request #2740 from ever-co/feat/soft-daily-plan-trigger
evereq Jul 17, 2024
3280c0f
feat: remove many daily plans (#2738)
Innocent-Akim Jul 17, 2024
07ca32d
[Fix] Profile | tab 'Assigned' values in Action menu (#2745)
GloireMutaliko21 Jul 17, 2024
ef94bf0
[Task] Daily Plan | Drag and Drop (#2743)
Innocent-Akim Jul 17, 2024
ba9477c
[Feature] Add manual time popup page (#2715)
GedeonTS Jul 17, 2024
4abbf26
[Task]: Daily Plan | tab Future tasks (#2748)
Innocent-Akim Jul 17, 2024
7caa404
Merge pull request #2749 from ever-co/develop
evereq Jul 17, 2024
9b880fa
Merge pull request #2750 from ever-co/stage
evereq Jul 17, 2024
4de1a32
fixbug: user should login and create a new team if there is no one (#…
CREDO23 Jul 17, 2024
2cd7c5e
fix: auto show error after login
Anishali2 Jul 17, 2024
0689967
Merge pull request #2752 from ever-co/2726-fix-auth-passcode-red-erro…
evereq Jul 18, 2024
f10226f
[Bug] Register | Tenant SMTP blocks new users to register (developmen…
GloireMutaliko21 Jul 18, 2024
dc04923
Merge pull request #2760 from ever-co/develop
evereq Jul 18, 2024
ace46a9
Merge pull request #2761 from ever-co/stage
evereq Jul 18, 2024
8c5f359
[Feat] Display all data if no range date (#2763)
Innocent-Akim Jul 19, 2024
dd315b3
[Feature] #2373 Task status order kanban settings (#2651)
evereq Jul 19, 2024
f5e45af
fix: remove unecessary paddings / margings on home and team page (#2759)
CREDO23 Jul 19, 2024
7e7ed82
Merge pull request #2765 from ever-co/develop
evereq Jul 19, 2024
b43e27e
Merge pull request #2766 from ever-co/stage
evereq Jul 19, 2024
6d525cc
fixbug: Ability to add 'Code' to Code inputs even if there is a curre…
CREDO23 Jul 19, 2024
ff54887
Merge pull request #2770 from ever-co/2746-bug-login--ability-to-add-…
evereq Jul 19, 2024
a8637b9
fixbug: system should filter kanban page with tasks assigned to a mem…
CREDO23 Jul 19, 2024
381b524
feat: feat: daily plan compare estimated
Innocent-Akim Jul 19, 2024
6096718
feat: display daily plan today
Innocent-Akim Jul 20, 2024
d13075d
fix: display daily plan today
Innocent-Akim Jul 20, 2024
ad0a0cb
Merge pull request #2774 from ever-co/feat/daily-plan-compare-estimated
evereq Jul 20, 2024
5847f54
fix: Profil All Plans Ui colors
Cedric921 Jul 20, 2024
730c663
fix: colors on Others Plan Tabs
Cedric921 Jul 20, 2024
7db14da
Merge pull request #2776 from ever-co/fix/ui-improvements
evereq Jul 20, 2024
4973610
[Feat]: Daily Plan Compare Estimated LOGIC (#2778)
Innocent-Akim Jul 20, 2024
f0282ec
Added a customizable PopoverTimepicker (#2781)
Innocent-Akim Jul 22, 2024
c45ed80
[Fix] server web dynamic api url (#2780)
syns2191 Jul 22, 2024
eac1261
chore(deps): bump electron-updater from 6.1.8 to 6.3.0
dependabot[bot] Jul 22, 2024
0682c3a
[Fix] User can NOT start tracking time (#2769)
GloireMutaliko21 Jul 23, 2024
2a10b10
Merge pull request #2782 from ever-co/dependabot/npm_and_yarn/electro…
evereq Jul 23, 2024
4af6326
Merge pull request #2786 from ever-co/develop
evereq Jul 23, 2024
287b1cc
Merge pull request #2787 from ever-co/stage
evereq Jul 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"Accordian",
"adipiscing",
"aliqua",
"tblr",
"conver",
"amet",
"Andross",
"animatable",
Expand All @@ -23,6 +21,7 @@
"arrowleft",
"asel",
"Authentificate",
"authjs",
"barcodes",
"billrate",
"binutils",
Expand All @@ -48,6 +47,7 @@
"choos",
"ciphertext",
"classpath",
"Clik",
"cloc",
"clockcircleo",
"cloudinary",
Expand All @@ -62,13 +62,21 @@
"combx",
"commitlint",
"comparision",
"comparization",
"compodoc",
"consectetur",
"containerd",
"contaniner",
"conver",
"creatoe",
"dailyplan",
"Darkmode",
"datas",
"dataToDisplay",
"dearmor",
"deepscan",
"Defaul",
"Desabled",
"Descrption",
"deserunt",
"dimesions",
Expand All @@ -79,6 +87,7 @@
"domutils",
"DONT",
"dotenv",
"dpkg",
"Dropown",
"dropwdown",
"dummyimage",
Expand All @@ -90,6 +99,7 @@
"embla",
"Enderbury",
"endregion",
"Entra",
"Entypo",
"envalid",
"errr",
Expand All @@ -115,6 +125,7 @@
"gauzystage",
"gcloud",
"Gitter",
"GlobalSkeleton",
"gradlew",
"graphicsmagick",
"greenkeeper",
Expand Down Expand Up @@ -170,9 +181,11 @@
"kanban",
"Kanbanboard",
"kanbandata",
"keyrings",
"Kiritimati",
"Kolkata",
"Kosrae",
"Koyeb",
"labore",
"Lask",
"lastest",
Expand All @@ -191,6 +204,7 @@
"mathieudutour",
"Mazen",
"Metral",
"MICROSOFTENTRAID",
"miliseconds",
"millisencods",
"mobx",
Expand All @@ -200,7 +214,11 @@
"nextjs",
"nimg",
"nocheck",
"nodesource",
"nodistro",
"noreferrer",
"Northflank",
"Notif",
"Opena",
"opentelemetry",
"Ordereds",
Expand All @@ -220,10 +238,12 @@
"phraseapp",
"pkill",
"Plaholder",
"plan",
"plasmo",
"plasmohq",
"popperjs",
"Pourtcent",
"prebuild",
"precommit",
"Pressable",
"Pressible",
Expand All @@ -236,6 +256,7 @@
"RECAPTCHA",
"recieve",
"Reconds",
"Relationnal",
"Repobeats",
"RESERVERD",
"Rickert",
Expand All @@ -249,6 +270,7 @@
"Settingfilter",
"setuptools",
"setwin",
"setwork",
"shadcn",
"shandow",
"signin",
Expand All @@ -259,9 +281,8 @@
"skey",
"smalltext",
"snyk",
"Sonner",
"sonner",
"Notif",
"Sonner",
"stackoverflow",
"statsus",
"statut",
Expand All @@ -270,8 +291,8 @@
"stylelint",
"stylesheet",
"subsquently",
"svgs",
"svgr",
"svgs",
"Swith",
"Syle",
"Synk",
Expand All @@ -281,6 +302,7 @@
"tanstack",
"taskid",
"taskstatus",
"tblr",
"teamtask",
"tempor",
"testid",
Expand All @@ -290,6 +312,7 @@
"tinvitations",
"tnode",
"Togger",
"tomorow",
"Tongatapu",
"tota",
"TRANSFERT",
Expand Down Expand Up @@ -326,29 +349,7 @@
"Xlarge",
"xlcard",
"xlight",
"yellowbox",
"Desabled",
"keyrings",
"dearmor",
"dpkg",
"containerd",
"nodistro",
"nodesource",
"Koyeb",
"Northflank",
"prebuild",
"dataToDisplay",
"GlobalSkeleton",
"dailyplan",
"tomorow",
"comparization",
"plan",
"setwork",
"Clik",
"Relationnal",
"authjs",
"MICROSOFTENTRAID",
"Entra"
"yellowbox"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
82 changes: 41 additions & 41 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
{
"importSorter.generalConfiguration.sortOnBeforeSave": false,
"importSorter.sortConfiguration.joinImportPaths": false,
"cSpell.userWords": [],
"cSpell.enabled": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"npm.packageManager": "yarn",
"prettier.trailingComma": "none",
"prettier.singleQuote": true,
"editor.formatOnSave": true,
"eslint.format.enable": true,
"editor.tabSize": 4,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "never",
"source.sortMembers": "never",
"organizeImports": "never"
},
"vsicons.presets.angular": true,
"deepscan.enable": true,
"cSpell.words": [],
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/node_modules": false,
"**/public/**/*.png": false,
"**/public/**/*.jpg": false,
"**/public/**/*.pdf": true
},
"search.exclude": {
"**/node_modules": true,
"**/.idea": true,
"**/.idea/**/*.{xml,iml}": true,
"**/.iml": true,
"**/.yarn": true,
"**/yarn.lock": true
},
"docwriter.style": "Auto-detect"
"importSorter.generalConfiguration.sortOnBeforeSave": false,
"importSorter.sortConfiguration.joinImportPaths": false,
"cSpell.userWords": [],
"cSpell.enabled": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"npm.packageManager": "yarn",
"prettier.trailingComma": "none",
"prettier.singleQuote": true,
"editor.formatOnSave": true,
"eslint.format.enable": true,
"editor.tabSize": 4,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "never",
"source.sortMembers": "never",
"organizeImports": "never"
},
"vsicons.presets.angular": true,
"deepscan.enable": true,
"cSpell.words": ["Timepicker"],
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/node_modules": false,
"**/public/**/*.png": false,
"**/public/**/*.jpg": false,
"**/public/**/*.pdf": true
},
"search.exclude": {
"**/node_modules": true,
"**/.idea": true,
"**/.idea/**/*.{xml,iml}": true,
"**/.iml": true,
"**/.yarn": true,
"**/yarn.lock": true
},
"docwriter.style": "Auto-detect"
}
2 changes: 1 addition & 1 deletion apps/extensions/components/popup/Timer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const Timer: React.FC<Props> = ({ port }) => {
? new Date(msg.payload.timer * 1000).toISOString().substr(11, 8)
: '00:00:00';
const totalWorkedTime =
msg.payload.totalWorked > 0
msg.payload!.totalWorked > 0
? new Date(msg.payload.totalWorked * 1000).toISOString().substr(11, 8)
: '00:00:00';
setTimeString(taskWorkedTime);
Expand Down
3 changes: 2 additions & 1 deletion apps/server-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
"i18next-resources-to-backend": "^1.2.1",
"react-i18next": "^14.1.0",
"@radix-ui/react-switch": "^1.1.0",
"classnames": "^2.5.1"
"classnames": "^2.5.1",
"fast-glob": "^3.3.2"
},
"devDependencies": {
"electron": "28.1.0",
Expand Down
29 changes: 25 additions & 4 deletions apps/server-web/src/locales/i18n/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"APP_QUIT": "Откажете се",
"GENERAL": "Общ",
"SERVER_STATUS_STOPPED": "Статус: Спряна",
"SERVER_STATUS_STARTED": "Статус: започна"
"SERVER_STATUS_STARTED": "Статус: започна",
"OPEN_WEB": "Отворете уеб в браузъра",
"SERVER_WINDOW": "Прозорец на сървъра"
},
"FORM": {
"FIELDS": {
Expand All @@ -22,7 +24,15 @@
},
"BUTTON": {
"SAVE_SETTING": "Запазване на настройката",
"OK": "Добре"
"OK": "Добре",
"YES": "да",
"NO": "Не",
"DOWNLOAD_NOW": "Свали сега",
"LATER": "По късно",
"CANCEL": "Отказ",
"CLOSE": "Близо",
"START": "Започнете",
"STOP": "Спри се"
},
"LABELS": {
"CHECKING": "Проверка",
Expand All @@ -42,11 +52,22 @@
"AUTO_UPDATE_SUBTITLE": "Активирайте автоматичната проверка на актуализацията, за да стартирате заявка за проверка дали е налична нова версия и да уведомите",
"AUTO_UPDATE_TOGLE": "Автоматична актуализация",
"CHECK_UPDATE_TITLE": "Проверете и актуализирайте версията на приложението си",
"CHECK_UPDATE_SUBTITLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу."
"CHECK_UPDATE_SUBTITLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу.",
"LANGUAGES": "Езици"
}
},
"MESSAGE": {
"SUCCESS": "Успех",
"ERROR": "Грешка"
"ERROR": "Грешка",
"WARNING": "Warning",
"INFO": "Информация",
"UPDATE_AVAILABLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу.",
"EXIT_MESSAGE": "Мрежата на сървъра все още работи, сигурни ли сте, че ще излезете от приложението?",
"UPDATE_SUCCESS": "Актуализирайте успешно",
"SERVER_RUN_DIALOG": "Сървърната мрежа работи в момента, искате ли да рестартирате сървъра?"
},
"LANGUAGES": {
"en": "Английски",
"bg": "България"
}
}
Loading
Loading