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.

Sign up for GitHub

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

Jump to bottom

Development #462

Merged
merged 15 commits into from
Sep 22, 2020
Merged

Development #462

merged 15 commits into from
Sep 22, 2020

Conversation

odaghagheleh
Copy link
Contributor

No description provided.

Nolan Tellis and others added 14 commits September 16, 2020 15:53
changing h2 db directory to target for test
cd1134d
@dreamind
AP-312 AP-2244 AP-2236 Access rights, rename folder and PD search fixes
fd6a11a 
- AP-312 Set folders to collapse in  access right management
- AP-2244 No selection warning for folder rename
- AP-2236 Allow to scroll large collection of nodes in PD
@dreamind
Merge pull request #449 from apromore/feature/AP-312-2244-2236
33108bf 
AP-312 AP-2244 AP-2236 Access rights, rename folder and PD search fixes
Change CSV importer UI to start from row index 2
77ee6ef
@franklma
Merge pull request #450 from apromore/AP-2262
5deb304 
Change CSV importer UI to start from row index 2
@dreamind
AP-2257 Add analyst as additional default role
e181321
@dreamind
Merge pull request #451 from apromore/feature/AP-2257-2
d55c232 
AP-2257 Add analyst as additional default role
@brucenguyen1
Improve code and update unit tests.
8fb01ae
@dreamind
AP-2220 Update search fail message
19b3b85
@dreamind
Merge pull request #453 from apromore/feature/AP-2220
9244d82 
AP-2220 Update search fail message
@dreamind
AP-2286 Swap create and cancel button
711a490
@dreamind
Merge pull request #454 from apromore/feature/AP-2286
9d7a463 
AP-2286 Swap create and cancel button
@dreamind
AP-2292 Fix validation and OK buttons
0cae57b
@dreamind
Merge pull request #459 from apromore/feature/AP-2292
a4db74e 
AP-2292 Fix validation and OK buttons
raboczi
raboczi approved these changes Sep 22, 2020
View reviewed changes
Copy link
Contributor

@raboczi raboczi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did the very minor merges here in the web interface, so this ought to make AP-2300 compatible with the development branch.

@raboczi raboczi merged commit 9e82ade into feature/AP-2300 Sep 22, 2020
@raboczi raboczi deleted the feature/AP-2300-merged branch September 22, 2020 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raboczi raboczi raboczi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@odaghagheleh @raboczi @dreamind @franklma @brucenguyen1