Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
semancik committed Sep 3, 2018
2 parents 47dd761 + cf8d756 commit feb30a8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Expand Up @@ -79,7 +79,7 @@ public abstract class ObjectListPanel<O extends ObjectType> extends BasePanel<O>
private static final String ID_TABLE = "table";

private static final Trace LOGGER = TraceManager.getTrace(ObjectListPanel.class);
private static final String DOT_CLASS = ObjectListPanel.class.getName();
private static final String DOT_CLASS = ObjectListPanel.class.getName() + ".";
private static final String OPERATION_LOAD_CUSTOM_MENU_ITEMS = DOT_CLASS + "loadCustomMenuItems";

private ObjectTypes type;
Expand Down
Expand Up @@ -3416,6 +3416,7 @@ operation.com.evolveum.midpoint.task.api.Task.listSubtasksRaw=List subtasks raw
operation.com.evolveum.midpoint.web.page.self.PageSelfCredentials.savePassword=Change password (GUI)
operation.com.evolveum.midpoint.web.page.self.PageRequestRole.save=Changes were successfully saved
operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated=The process of assigning a role is waiting for the approval.
operation.com.evolveum.midpoint.gui.api.component.ObjectListPanel.loadCustomMenuItems=Load custom actions
PageError.button.home=Home
PageResource.tab.connector=Connector
PageResource.tab.connector.connectorLabel=Connector
Expand Down

0 comments on commit feb30a8

Please sign in to comment.