-
- <% if Setting.lost_password? %>
- <%= link_to t(:label_password_lost), { controller: '/account', action: 'lost_password' } %>
-
- <% end %>
- <% if Setting::SelfRegistration.enabled? %>
- <%= link_to t(:label_register),
- '',
- title: t(:label_register),
- class: 'registration-modal--activation-link' %>
- <% end %>
+
+
+ <% if Setting.lost_password? %>
+ <%= link_to t(:label_password_lost),
+ { controller: '/account', action: 'lost_password' },
+ class: 'login-form--footer-link' %>
+
<% end %>
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 4b0de20a7ed..156563d6e09 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -384,17 +384,20 @@ en:
learn_about: "Learn more about the new features"
# Include the version to invalidate outdated translations in other locales.
# Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
- "13_3":
+ "13_4":
standard:
- learn_about_link: https://www.openproject.org/blog/openproject-13-3-release/
+ learn_about_link: https://www.openproject.org/blog/openproject-13-4-release/
new_features_html: >
The release contains various new features and improvements:
- Filter and save custom project lists.
- Separate Gantt charts module with new default views.
- Automatically managed project folders for OneDrive/SharePoint integration.
- Show number of "Shared users" in the share button and display them in the work packages list.
- Improved calculations and updates for progress reporting for work package hierarchies.
+ GitLab integration (originally developed by Community contributors)
+ Advanced features for custom project lists
+ Advanced features for the Meetings module
+ Admins are nudged to go through OAuth flow when activating a storage
+ Virus scanning functionality with ClamAV (Enterprise add-on)
+ PDF Export: Lists in table cells are supported
+ WebAuthn/FIDO/U2F is added as a second factor
+ More languages added to the default available set
ical_sharing_modal:
diff --git a/docker/pullpreview/docker-compose.yml b/docker/pullpreview/docker-compose.yml
index f4879929d17..7c9664a6063 100644
--- a/docker/pullpreview/docker-compose.yml
+++ b/docker/pullpreview/docker-compose.yml
@@ -45,7 +45,7 @@ services:
- "caddy_data:/data"
db:
- image: postgres:10
+ image: postgres:13
environment:
POSTGRES_USER: app
POSTGRES_PASSWORD: p4ssw0rd
diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.html b/frontend/src/app/core/global_search/input/global-search-input.component.html
index 13f26dd12eb..61491b30798 100644
--- a/frontend/src/app/core/global_search/input/global-search-input.component.html
+++ b/frontend/src/app/core/global_search/input/global-search-input.component.html
@@ -26,11 +26,12 @@
[searchFn]="customSearchFn"
[virtualScroll]="false"
(focus)="onFocus()"
+ (blur)="onFocusOut()"
(search)="search($event)"
(close)="onClose()"
(change)="followItem($event)"
(keydown.enter)="onEnterBeforeResultsLoaded()"
- (keydown.escape)="blur()"
+ (keydown.escape)="onFocusOut()"
(clear)="clearSearch()"
[filters]="autocompleterOptions.filters"
[resource]="autocompleterOptions.resource"
diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.ts b/frontend/src/app/core/global_search/input/global-search-input.component.ts
index cebe005a1e2..aa2e8291087 100644
--- a/frontend/src/app/core/global_search/input/global-search-input.component.ts
+++ b/frontend/src/app/core/global_search/input/global-search-input.component.ts
@@ -251,6 +251,8 @@ export class GlobalSearchInputComponent implements AfterViewInit, OnDestroy {
this.selectedItem = undefined;
this.toggleTopMenuClass();
}
+
+ (
document.activeElement).blur();
}
public onClose():void {
@@ -467,11 +469,6 @@ export class GlobalSearchInputComponent implements AfterViewInit, OnDestroy {
}
}
- public blur():void {
- this.ngSelectComponent.ngSelectInstance.searchTerm = '';
- (document.activeElement).blur();
- }
-
private get currentScope():string {
const serviceScope = this.globalSearchService.projectScope;
return (serviceScope === '') ? 'current_project_and_all_descendants' : serviceScope;
diff --git a/frontend/src/app/features/homescreen/blocks/new-features.component.ts b/frontend/src/app/features/homescreen/blocks/new-features.component.ts
index 37241f6597d..b6f044b4fdd 100644
--- a/frontend/src/app/features/homescreen/blocks/new-features.component.ts
+++ b/frontend/src/app/features/homescreen/blocks/new-features.component.ts
@@ -35,10 +35,10 @@ import { imagePath } from 'core-app/shared/helpers/images/path-helper';
export const homescreenNewFeaturesBlockSelector = 'homescreen-new-features-block';
// The key used in the I18n files to distinguish between versions.
-const OpVersionI18n = '13_3';
+const OpVersionI18n = '13_4';
/** Update the teaser image to the next version */
-const featureTeaserImage = '13_3_features.svg';
+const featureTeaserImage = '13_4_features.svg';
@Component({
template: `
diff --git a/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts b/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
index 435b8e463f3..9d6fefe8fc3 100644
--- a/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/assignee/add-assignee.component.ts
@@ -85,9 +85,9 @@ export class AddAssigneeComponent {
.apiV3Service
.principals
.filtered(filters)
- .get()
+ .getPaginatedResults()
.pipe(
- map((collection) => collection.elements.filter(
+ map((elements) => elements.filter(
(user) => !this.alreadySelected.find((selected) => selected === user.id),
)),
);
diff --git a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
index 2755041a09e..75342254a4d 100644
--- a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
@@ -82,6 +82,7 @@ import {
import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
+import { MAGIC_PAGE_NUMBER } from 'core-app/core/apiv3/helpers/get-paginated-results';
import { CalendarDragDropService } from 'core-app/features/team-planner/team-planner/calendar-drag-drop.service';
import { StatusResource } from 'core-app/features/hal/resources/status-resource';
import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/resource-changeset';
@@ -223,7 +224,7 @@ export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit,
return this
.capabilitiesResourceService
- .fetchCapabilities({ pageSize: -1, filters });
+ .fetchCapabilities({ pageSize: MAGIC_PAGE_NUMBER, filters });
}),
map((result) => result
._embedded
@@ -250,6 +251,7 @@ export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit,
filter((ids) => ids.length > 0),
map((ids) => ({
filters: [['id', '=', ids]],
+ pageSize: MAGIC_PAGE_NUMBER,
}) as ApiV3ListParameters),
);
diff --git a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
index afb48aa709d..61802814662 100644
--- a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
+++ b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
@@ -8,4 +8,13 @@
-
+
+
+
+
diff --git a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
index 31c9b9f068f..64377300b05 100644
--- a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
+++ b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.ts
@@ -33,6 +33,7 @@ import { CurrentProjectService } from 'core-app/core/current-project/current-pro
import {
WorkPackageIsolatedQuerySpaceDirective,
} from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
+import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -40,10 +41,19 @@ import {
hostDirectives: [WorkPackageIsolatedQuerySpaceDirective],
})
export class WidgetWpCalendarComponent extends AbstractWidgetComponent {
- constructor(protected readonly i18n:I18nService,
+ text = {
+ missing_permission: this.I18n.t('js.grid.widgets.missing_permission'),
+ };
+
+ hasCapability$ = this.currentUser.hasCapabilities$('work_packages/read', this.currentProject.id);
+
+ constructor(
+ protected readonly I18n:I18nService,
protected readonly injector:Injector,
- protected readonly currentProject:CurrentProjectService) {
- super(i18n, injector);
+ protected readonly currentProject:CurrentProjectService,
+ protected readonly currentUser:CurrentUserService,
+ ) {
+ super(I18n, injector);
}
public get projectIdentifier() {
diff --git a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
index 41d12a412d2..1b0c0c344e9 100644
--- a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
+++ b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
@@ -33,8 +33,10 @@ import {
ElementRef,
EventEmitter,
Input,
+ OnChanges,
OnInit,
Output,
+ SimpleChanges,
ViewChild,
} from '@angular/core';
@@ -60,7 +62,7 @@ import SpotDropAlignmentOption from 'core-app/spot/drop-alignment-options';
templateUrl: './file-link-list-item.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class FileLinkListItemComponent implements OnInit, AfterViewInit {
+export class FileLinkListItemComponent implements OnInit, OnChanges, AfterViewInit {
@Input() public fileLink:IFileLink;
@Input() public allowEditing = false;
@@ -132,8 +134,16 @@ export class FileLinkListItemComponent implements OnInit, AfterViewInit {
'js.storages.file_links.download',
{ fileName: this.fileLink.originData.name },
);
+ }
- this.floatingActions = this.getFloatingActions();
+ // Before, the getFloatingActions() method was called in the ngOnInit() method.
+ // The value of the allowEditing property can be calculated after the component is already initialized (in fact it is determined
+ // asynchronously, by getting a value from the server in a separate request). Therefore, the available actions need
+ // to be calculated whenever the value is set.
+ ngOnChanges(changes:SimpleChanges):void {
+ if (changes.allowEditing) {
+ this.floatingActions = this.getFloatingActions();
+ }
}
ngAfterViewInit():void {
diff --git a/frontend/src/assets/images/13_3_features.svg b/frontend/src/assets/images/13_3_features.svg
deleted file mode 100644
index 620ebdbccf8..00000000000
--- a/frontend/src/assets/images/13_3_features.svg
+++ /dev/null
@@ -1 +0,0 @@
-
@@ -68,15 +68,23 @@
<%= hidden_field_tag 'use_device', @service.device.id %>
-
- <% default_channel = @service.device.channel %>
- <% supported_channels = @used_device.class.supported_channels & @strategy.class.supported_channels %>
- <% supported_channels.each do |channel| %>
+
+ <% default_channel = @service.device.channel %>
+ <% supported_channels = @used_device.class.supported_channels & @strategy.class.supported_channels %>
+ <% supported_channels.each do |channel| %>
+
<%= radio_button_tag 'use_channel', channel, default_channel == channel %>
<%= t("button_otp_by_#{channel}") %>
+<<<<<<< HEAD
<% end %>
+=======
+
+ <% end %>
+
+
+>>>>>>> origin/release/13.4
<% end %>
<% end %>
<% if has_other_devices %>
@@ -95,12 +103,13 @@
<% end %>
<% if has_backup_codes %>
+
+
<%= link_to(t('two_factor_authentication.login.enter_backup_code_title'), { action: :enter_backup_code }) %>
-
-
-
- <% end %>
-
+
+
+ <% end %>
+
diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb
index 64107c8b5c0..44c45f1da3f 100644
--- a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb
+++ b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb
@@ -14,6 +14,6 @@