Commit graph

9320 commits

Author SHA1 Message Date
aignatov-bio
edd774b045
Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card
Fix asset link partial in item card
2020-12-03 13:19:30 +01:00
Mojca Lorber
bdc8cfc5d5 Fix merging 2020-12-03 13:04:55 +01:00
aignatov-bio
e6e9c84a7c Fix asset link partial in item card 2020-12-03 12:58:54 +01:00
Mojca Lorber
d9fdb20a99 Fix hound 2020-12-03 12:57:45 +01:00
Mojca Lorber
9253cf5ade Change javascript for modal handeling and some other small fixes 2020-12-03 12:53:19 +01:00
mlorb
74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
aignatov-bio
9a9618b506
Merge pull request #2991 from aignatov-bio/ai-sci-5279-fix-download-links-in-report
Fix download links in reports [SCI-5279]
2020-12-03 12:47:37 +01:00
Urban Rotnik
478d43f9ce
Merge pull request #2987 from urbanrotnik/ur-sci-5208
Projects cards and list view with filters  [SCI-5208]
2020-12-03 12:30:37 +01:00
Urban Rotnik
3700faa04a Update proejcts grid, include breadcrumbs, fix JS
[SCI-5208]
2020-12-03 12:29:28 +01:00
aignatov-bio
c43851a2f4 Fix download links in reports [SCI-5279] 2020-12-03 12:16:48 +01:00
Alex Kriuchykhin
7bc55d7f97
Merge pull request #2967 from okriuchykhin/ok_SCI_5177
Prepare backend for the improved navigation [SCI-5177]
2020-12-03 10:24:50 +01:00
Oleksii Kriuchykhin
dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin
9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Alex Kriuchykhin
92d579ab8e
Merge pull request #2935 from okriuchykhin/ok_SCI_5135
Generate backend for moving the projects and folders [SCI-5135]
2020-12-02 14:59:01 +01:00
Alex Kriuchykhin
7025c90d91
Merge pull request #2970 from urbanrotnik/ur-sci-5185
Folders API endpoints [SCI-5185]
2020-12-02 14:58:43 +01:00
Urban Rotnik
87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
Urban Rotnik
df2b8ab3df Remove jsonapi_parameters gem, accept rails params in controller 2020-12-02 13:15:49 +01:00
Urban Rotnik
7c1a0a9044 Add projects to project_folder serializer 2020-12-02 13:15:49 +01:00
Urban Rotnik
97733498d9 Include project_folders at Projects API endpoints 2020-12-02 13:15:48 +01:00
Urban Rotnik
a4fc01d595 Add jsonapi_parameters gem, use relationships for parent_folder relation 2020-12-02 13:15:48 +01:00
Urban Rotnik
088fa79874 Add Project Folders API endpoints 2020-12-02 13:15:48 +01:00
Oleksii Kriuchykhin
dfce57d481 Generate backend for moving the projects and folders [SCI-5135] 2020-12-02 12:11:01 +01:00
aignatov-bio
a27c78e445
Merge pull request #2988 from aignatov-bio/ai-sci-5260-add-direction-condition-for-status-consequences
Add direction condition for status consequences [SCI-5260]
2020-12-01 16:14:31 +01:00
aignatov-bio
d1af011c0c [SCI-5260] Fix markup 2020-12-01 15:10:28 +01:00
aignatov-bio
04624692d3 [SCI-5260] Add afterward and backward actions to consequence 2020-12-01 15:07:01 +01:00
Urban Rotnik
13d157d1c7
Merge pull request #2983 from urbanrotnik/ur-sci-5252-technician-can-not-complete-step
Remove manage permissions check from step toggle [SCI-5252]
2020-12-01 13:37:40 +01:00
Mojca Lorber
d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
Alex Kriuchykhin
7b17d9d54d
Merge pull request #2971 from okriuchykhin/ok_SCI_5238
Improve limit check for repository list and checklist items [SCI-5238]
2020-11-30 19:59:46 +01:00
aignatov-bio
ad960d801d [SCI-5260] Fix markup 2020-11-30 15:20:02 +01:00
aignatov-bio
99ad705d82 [SCI-5260] Fix markup 2020-11-30 15:18:46 +01:00
aignatov-bio
0620da99de [SCI-5260] Add direction condition for status consequences 2020-11-30 12:28:29 +01:00
aignatov-bio
48184df312
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all
Add preview files to export all [SCI-5250]
2020-11-30 12:21:43 +01:00
aignatov-bio
f92f65b74b
Merge pull request #2986 from aignatov-bio/ai-sci-5256-add-h6-render-to-docx-report
Add h6 render to docx report [SCI-5256]
2020-11-30 10:22:49 +01:00
Urban Rotnik
6048621f9e
Merge pull request #2975 from okriuchykhin/ok_SCI_5171
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
2020-11-27 17:09:25 +01:00
Oleksii Kriuchykhin
8ee1580ae4 Fix tests for repository list and checklist items [SCI-5238] 2020-11-27 14:59:17 +01:00
Oleksii Kriuchykhin
78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio
8245f18076 Add h6 render to docx report 2020-11-27 13:33:44 +01:00
Urban Rotnik
fcb82fd0d2
Merge pull request #2984 from okriuchykhin/ok_SCI_5204
Project filters: add text field to the filters [SCI-5204]
2020-11-27 12:04:46 +01:00
Urban Rotnik
dc9fae6af0 Remove manage permissions check from step toggle 2020-11-27 11:37:39 +01:00
aignatov-bio
8cdf09f244 Add preview files to export all 2020-11-27 11:07:37 +01:00
Alex Kriuchykhin
0d5d91a9bc
Merge pull request #2965 from biosistemika/dependabot/npm_and_yarn/dot-prop-4.2.1
Bump dot-prop from 4.2.0 to 4.2.1
2020-11-27 10:48:31 +01:00
Alex Kriuchykhin
80a53e14c2
Merge pull request #2966 from okriuchykhin/ok_SCI_5235
Fix permission check for archived tasks [SCI-5235]
2020-11-27 10:46:25 +01:00
Alex Kriuchykhin
b45692ab1f
Merge pull request #2954 from aignatov-bio/ai-sci-5182-add-activity-for-project-moving
Add activity for project moving [SCI-5182]
2020-11-27 09:47:49 +01:00
Oleksii Kriuchykhin
1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
aignatov-bio
d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
Add delete asset confirmation modal [SCI-5241]
2020-11-26 15:35:40 +01:00
aignatov-bio
c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
aignatov-bio
fbc7822bfe Add ability to close modal by esc 2020-11-26 14:51:10 +01:00
aignatov-bio
60359b595c Add button disabling 2020-11-26 14:37:12 +01:00
aignatov-bio
b0ebdceb08 Fix typo 2020-11-26 14:04:26 +01:00
Urban Rotnik
8c2fe31b83
Merge pull request #2976 from urbanrotnik/ur-sci-5203
Add members to filters flyout [SCI-5203]
2020-11-26 12:33:10 +01:00