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

Release #8486

Merged
merged 96 commits into from
Oct 25, 2024
Merged

Release #8486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
7d8c873
Fix employee fields edition
samuelmbabhazi Oct 18, 2024
6c2f4db
Merge branch 'develop' into fix/8457-employee-edition-fields
samuelmbabhazi Oct 18, 2024
ff38172
Rename jobSearchAvailability component
samuelmbabhazi Oct 18, 2024
434c237
coderabbitai suggestion integrations
samuelmbabhazi Oct 18, 2024
af9e72f
feat(header): update header-container styles based on position
rahul-rocket Oct 19, 2024
f2a133b
[Fix] Employee Duplication in the Selection Input During Task Retriev…
samuelmbabhazi Oct 20, 2024
6a0c75e
Merge branch 'develop' into fix/8457-employee-edition-fields
rahul-rocket Oct 21, 2024
7d78377
fix: toggle switcher output events
rahul-rocket Oct 21, 2024
fc98cdf
refactor: use common toggle switcher
rahul-rocket Oct 21, 2024
19d94da
chore: add integration UI plugins build command to scripts
rahul-rocket Oct 21, 2024
62e247b
Merge pull request #8467 from ever-co/fix/8466-employee-duplication
rahul-rocket Oct 21, 2024
0db3a2c
Merge pull request #8468 from ever-co/fix/toggle-switcher-component
rahul-rocket Oct 21, 2024
0517849
Merge branch 'develop' into fix/8457-employee-edition-fields
rahul-rocket Oct 21, 2024
9b70600
fix: use common toggle switcher for job search status
rahul-rocket Oct 21, 2024
b5c9317
feat: apply code rabbit suggestions
rahul-rocket Oct 21, 2024
0eb8b3b
fix: implement refresh the data table on edit cancellation
rahul-rocket Oct 21, 2024
c100170
Merge pull request #8462 from ever-co/fix/8457-employee-edition-fields
rahul-rocket Oct 21, 2024
e6dca10
Dates should be translated when switching to other languages
samuelmbabhazi Oct 21, 2024
d9b6b54
Dates should be translated when switching to other languages
samuelmbabhazi Oct 21, 2024
bb8f989
chore(deps): bump angular2-smart-table from 3.2.0 to 3.3.0
rahul-rocket Oct 21, 2024
bf4efbe
chore(deps): bump angular2-smart-table from 3.2.0 to 3.3.0
rahul-rocket Oct 21, 2024
443dd2e
add allow manual time filed
samuelmbabhazi Oct 21, 2024
be377a7
Merge pull request #8470 from ever-co/chore/angular2-smart-table-v3.3.0
rahul-rocket Oct 21, 2024
b4e63c5
Dates should be translated when switching to other languages
samuelmbabhazi Oct 21, 2024
3803358
fix: add type validation for sprint entity
GloireMutaliko21 Oct 22, 2024
27ed2e0
Merge branch 'develop' into fix/7175-date-translation
samuelmbabhazi Oct 22, 2024
b73f18f
Merge branch 'develop' into feature/#5507-enable-add-manual-time
samuelmbabhazi Oct 22, 2024
fa8c2ce
fix: register dynamic data-table columns for employee management page
rahul-rocket Oct 22, 2024
ae68c88
avoid undefined locale
samuelmbabhazi Oct 22, 2024
4a49b24
Merge pull request #8471 from ever-co/fix/organization-sprint-entity-…
rahul-rocket Oct 22, 2024
a40fc0a
fix(deepscan): removed unused 'Cell' property
rahul-rocket Oct 22, 2024
9d16b47
fix: correct the property syntax
rahul-rocket Oct 22, 2024
a048407
fix: #8472 apply code rabbit suggestions
rahul-rocket Oct 22, 2024
b0cdaaa
Merge pull request #8472 from ever-co/fix/register-dynamic-columns
rahul-rocket Oct 22, 2024
0a03580
fix: register dynamic tabset columns for edit employee
rahul-rocket Oct 22, 2024
e90eed9
fix: hide selectors completely, if login employee don't have access
rahul-rocket Oct 22, 2024
f357964
Merge pull request #8474 from ever-co/fix/header-selectors-visibility
rahul-rocket Oct 22, 2024
764d109
Merge pull request #8473 from ever-co/fix/register-dynamic-tabs
rahul-rocket Oct 22, 2024
62759f3
fix: updated date format pipe
rahul-rocket Oct 23, 2024
ba27118
Merge branch 'develop' into fix/7175-date-translation
rahul-rocket Oct 23, 2024
901cdf9
Merge pull request #8469 from ever-co/fix/7175-date-translation
rahul-rocket Oct 23, 2024
79c3970
Feature: enable/disable manual time settings for employees
samuelmbabhazi Oct 23, 2024
39f10e2
Merge branch 'develop' into feature/#5507-enable-add-manual-time
samuelmbabhazi Oct 23, 2024
f51bd56
feat: add settings nav menu
rahul-rocket Oct 23, 2024
7076fcd
fix: prettier formatting
rahul-rocket Oct 23, 2024
72b2cf8
feat: registered settings menu into base nan menu component
rahul-rocket Oct 23, 2024
bfb62a2
fix: missing translation for bg.json
rahul-rocket Oct 23, 2024
a222b27
feat: add dynamic menus for settings/accordion
rahul-rocket Oct 23, 2024
4c196ee
fix: hide nb-icon for accordion menu category
rahul-rocket Oct 23, 2024
3d0db6c
fix: updated add nav menu section example
rahul-rocket Oct 23, 2024
0c0ab32
fix: #8476 apply code rabbit suggestions
rahul-rocket Oct 23, 2024
722df90
fix: #8476 apply code rabbit suggestions
rahul-rocket Oct 23, 2024
20eab58
fix: ui packages build
rahul-rocket Oct 23, 2024
b890571
Merge pull request #8476 from ever-co/feat/dynamic-settings-menu
rahul-rocket Oct 23, 2024
82d9ed2
[Fix] Product Name Not Displayed During Estimate Editing
samuelmbabhazi Oct 23, 2024
1e26edd
Merge branch 'develop' into feature/#5507-enable-add-manual-time
samuelmbabhazi Oct 23, 2024
e9b031f
feat: cookie validation to allow access from all subdomains
rahul-rocket Oct 24, 2024
657d4cc
fix: retrieve missing refresh token from cookie
rahul-rocket Oct 24, 2024
1e220ff
fix: #8480 apply code rabbit suggestions
rahul-rocket Oct 24, 2024
16bbb9d
fix: #8480 apply code rabbit suggestions
rahul-rocket Oct 24, 2024
23207ff
Add Sqlite migration
samuelmbabhazi Oct 24, 2024
289fd62
fiix: after logout delete stored cookie
rahul-rocket Oct 24, 2024
2e25ee3
fix: #8480 apply code rabbit suggestions
rahul-rocket Oct 24, 2024
cec5e81
fix: security enhance token validation and cookie security.
rahul-rocket Oct 24, 2024
f9a5ff6
fix: #8480 apply code rabbit suggestions
rahul-rocket Oct 24, 2024
932e600
Merge pull request #8480 from ever-co/fix/cross-domain-auth-token-tra…
rahul-rocket Oct 24, 2024
23eb927
fix: use environment configuration for default domain.
rahul-rocket Oct 24, 2024
f6bd376
Update packages/ui-config/src/lib/environments/model.ts
rahul-rocket Oct 24, 2024
02df295
Merge pull request #8481 from ever-co/fix/cross-domain-token-transfer
rahul-rocket Oct 24, 2024
4f9df18
Merge pull request #8478 from ever-co/fix/#8477-display-product-name
rahul-rocket Oct 24, 2024
17518f5
fix: reports menu should be show/hide after organization change
rahul-rocket Oct 24, 2024
b9f6ec1
fix: #8482 apply code rabbit suggestions
rahul-rocket Oct 24, 2024
df3a4fd
Merge pull request #8482 from ever-co/fix/dynamic-reports-menu
rahul-rocket Oct 24, 2024
d1e7d66
Add postgres migration && mysql migration
samuelmbabhazi Oct 24, 2024
c5b3967
reset env.local
samuelmbabhazi Oct 24, 2024
506c4e4
Merge branch 'develop' into feature/#5507-enable-add-manual-time
samuelmbabhazi Oct 24, 2024
73b0a62
Improve time-tracking-authorized-directive
samuelmbabhazi Oct 24, 2024
97995ec
Remove console log
samuelmbabhazi Oct 25, 2024
0ac3f94
integration of codeRabitai suggestions
samuelmbabhazi Oct 25, 2024
319d7b1
chore(deps): bump http-proxy-middleware from 2.0.6 to 2.0.7
dependabot[bot] Oct 25, 2024
fb2e34b
Fix time tracking authorized directive
samuelmbabhazi Oct 25, 2024
855bf65
Merge pull request #8483 from ever-co/dependabot/npm_and_yarn/http-pr…
rahul-rocket Oct 25, 2024
8ac0818
Merge branch 'develop' into feature/#5507-enable-add-manual-time
rahul-rocket Oct 25, 2024
c94d342
integration of codeRabitai suggestions
rahul-rocket Oct 25, 2024
fbc4faa
fix: alter constraints for `resource_link` table
rahul-rocket Oct 25, 2024
b897047
fix: #8484 apply code rabbit suggestions
rahul-rocket Oct 25, 2024
23f778b
fix: #8484 apply code rabbit suggestions
rahul-rocket Oct 25, 2024
d7b1d53
fix: #8484 apply code rabbit suggestions
rahul-rocket Oct 25, 2024
c6c0984
Merge pull request #8484 from ever-co/fix/resource-link-migration
rahul-rocket Oct 25, 2024
fc85f4f
Merge branch 'develop' into feature/#5507-enable-add-manual-time
rahul-rocket Oct 25, 2024
21b3b2a
fix(migration): add time tracking settings for employee entity (Postg…
rahul-rocket Oct 25, 2024
f57d7d0
fix: employee table migration
rahul-rocket Oct 25, 2024
b26eee3
fix: employee table migration
rahul-rocket Oct 25, 2024
367e008
fix: #8484 apply code rabbit suggestions
rahul-rocket Oct 25, 2024
96c1715
Merge pull request #8475 from ever-co/feature/#5507-enable-add-manual…
rahul-rocket Oct 25, 2024
33f0b08
Fix/about page desktop window (#8461)
syns2191 Oct 25, 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
2 changes: 2 additions & 0 deletions .scripts/configure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ if (!isDocker) {

API_BASE_URL: API_BASE_URL,
CLIENT_BASE_URL: CLIENT_BASE_URL,
COOKIE_DOMAIN: '${env.COOKIE_DOMAIN}',

PLATFORM_WEBSITE_URL: '${env.PLATFORM_WEBSITE_URL}',
PLATFORM_WEBSITE_DOWNLOAD_URL: '${env.PLATFORM_WEBSITE_DOWNLOAD_URL}',
Expand Down Expand Up @@ -221,6 +222,7 @@ if (!isDocker) {

API_BASE_URL: API_BASE_URL,
CLIENT_BASE_URL: CLIENT_BASE_URL,
COOKIE_DOMAIN: 'DOCKER_COOKIE_DOMAIN',

PLATFORM_WEBSITE_URL: 'DOCKER_PLATFORM_WEBSITE_URL',
PLATFORM_WEBSITE_DOWNLOAD_URL: 'DOCKER_PLATFORM_WEBSITE_DOWNLOAD_URL',
Expand Down
4 changes: 4 additions & 0 deletions .scripts/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type Env = Readonly<{
// Set to true if build / runs in Docker
IS_DOCKER: boolean;

COOKIE_DOMAIN: string;

// Base URL of Gauzy UI website
CLIENT_BASE_URL: string;

Expand Down Expand Up @@ -140,6 +142,8 @@ export const env: Env = cleanEnv(

IS_DOCKER: bool({ default: false }),

COOKIE_DOMAIN: str({ default: '.gauzy.co' }),

CLIENT_BASE_URL: str({ default: 'http://localhost:4200' }),

API_BASE_URL: str({ default: 'http://localhost:3000' }),
Expand Down
10 changes: 2 additions & 8 deletions apps/desktop-timer/src/assets/styles/gauzy/theme.gauzy-dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NbJSThemeOptions } from '@nebular/theme';
import { NbJSThemeOptions, NbJSThemeVariable } from '@nebular/theme';

const palette = {
primary: '#6200ee',
Expand Down Expand Up @@ -47,20 +47,14 @@ export const baseTheme: NbJSThemeOptions = {
}
};

const baseThemeVariables = baseTheme.variables;
const baseThemeVariables = baseTheme.variables as NbJSThemeVariable;

export const MATERIAL_LIGHT_THEME = {
name: 'material-light',
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/desktop-timer/src/assets/styles/theme.dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
4 changes: 4 additions & 0 deletions apps/desktop-timer/src/preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ window.addEventListener('DOMContentLoaded', async () => {
titleBar.refreshMenu();
});

ipcRenderer.on('hide-menu', () => {
titleBar.dispose();
})

const overStyle = document.createElement('style');
overStyle.innerHTML = `
.cet-container {
Expand Down
10 changes: 2 additions & 8 deletions apps/desktop/src/assets/styles/gauzy/theme.gauzy-dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ const theme = {

export const GAUZY_DARK = {
name: 'gauzy-dark',
base: 'dark',
base: 'dark',
variables: {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
12 changes: 3 additions & 9 deletions apps/desktop/src/assets/styles/material/theme.material-light.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NbJSThemeOptions } from '@nebular/theme';
import { NbJSThemeOptions, NbJSThemeVariable } from '@nebular/theme';

const palette = {
primary: '#6200ee',
Expand Down Expand Up @@ -47,20 +47,14 @@ export const baseTheme: NbJSThemeOptions = {
}
};

const baseThemeVariables = baseTheme.variables;
const baseThemeVariables = baseTheme.variables as NbJSThemeVariable;

export const MATERIAL_LIGHT_THEME = {
name: 'material-light',
base: 'default',
variables: {
temperature: {
arcFill: [
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary,
baseThemeVariables.primary
],
arcFill: Array(5).fill(baseThemeVariables.primary),
arcEmpty: baseThemeVariables.bg2,
thumbBg: baseThemeVariables.bg2,
thumbBorder: baseThemeVariables.primary
Expand Down
8 changes: 1 addition & 7 deletions apps/desktop/src/assets/styles/theme.dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ export const DARK_THEME = {
...theme,

temperature: {
arcFill: [
theme.primary,
theme.primary,
theme.primary,
theme.primary,
theme.primary
],
arcFill: Array(5).fill(theme.primary),
arcEmpty: theme.bg2,
thumbBg: theme.bg2,
thumbBorder: theme.primary
Expand Down
4 changes: 4 additions & 0 deletions apps/desktop/src/preload/preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ window.addEventListener('DOMContentLoaded', async () => {
titleBar.refreshMenu();
});

ipcRenderer.on('hide-menu', () => {
titleBar.dispose();
})

ipcRenderer.on('adjust_view', () => {
clearInterval(contentInterval);
const headerIcon = '/html/body/div[2]/ga-app/ngx-pages/ngx-one-column-layout/nb-layout/div[1]/div/div/nb-sidebar[1]/div/div/div';
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@sentry/types": "^7.101.1",
"@sentry/utils": "^7.90.0",
"@swimlane/ngx-charts": "^20.1.0",
"angular2-smart-table": "^3.2.0",
"angular2-smart-table": "^3.3.0",
"angular2-toaster": "^11.0.1",
"bootstrap": "^4.3.1",
"brace": "^0.11.1",
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy/src/app/app.module.guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { Router, CanActivate, ActivatedRouteSnapshot } from '@angular/router';
import { Router, ActivatedRouteSnapshot } from '@angular/router';
import { environment } from '@gauzy/ui-config';
import { Store } from '@gauzy/ui-core/core';

@Injectable()
export class AppModuleGuard implements CanActivate {
export class AppModuleGuard {
constructor(private readonly router: Router, private readonly store: Store) {}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<nb-route-tabset [tabs]="tabs" class="tabset-container"></nb-route-tabset>
<gz-dynamic-tabs class="tabset-container" [tabsetId]="tabsetId"></gz-dynamic-tabs>
Loading
Loading