Commit graph

9538 commits

Author SHA1 Message Date
Urban Rotnik
207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Miha Mencin
72a4c2ddd1
Merge pull request #3000 from biosistemika/develop
December 2020 release, ver: 1.20.4
2020-12-09 10:32:46 +01:00
Urban Rotnik
152990b4d6 Add archived mode for Projects
[SCI-5266]
2020-12-09 08:51:55 +01:00
Miha Mencin
1025642afe
Bump version to 1.20.4 2020-12-09 08:50:28 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995)
* Add projects sidebar navigation [SCI-5178]
2020-12-08 16:07:26 +01:00
aignatov-bio
58bf6ed992
Merge pull request #2999 from aignatov-bio/ai-sci-fix-permission-check-for-result
Fix permission for assets in results
2020-12-08 15:34:25 +01:00
aignatov-bio
a32a2f28d3 Fix permission for assets in results 2020-12-08 15:31:57 +01:00
aignatov-bio
bef442257f
Merge pull request #2998 from aignatov-bio/ai-sci-5289-change-permission-for-sorting-and-card-view
Change permission for sorting in steps and asset view [SCI-5289]
2020-12-08 12:12:27 +01:00
aignatov-bio
188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Oleksii Kriuchykhin
62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
Urban Rotnik
2c8adc9496
Merge pull request #2990 from urbanrotnik/ur-sci-5181-add-folders-activities
Add activities for Project Folders [SCI-5181]
2020-12-04 17:51:04 +01:00
Urban Rotnik
1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +01:00
Urban Rotnik
342eb34925
Merge pull request #2994 from aignatov-bio/ai-sci-5285-fix-protocol-revert-from-repository
Fix protocol revert from repository [SCI-5285]
2020-12-04 12:25:36 +01:00
aignatov-bio
568fcb20df Fix protocol revert from repository [SCI-5285] 2020-12-04 12:07:25 +01:00
Urban Rotnik
7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
aignatov-bio
6bd021d88a
Add gallery view after image update [SCI-5286] (#2993)
* Add gallery view after image update [SCI-5286]
2020-12-04 11:47:24 +01:00
Alex Kriuchykhin
7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240
[SCI-5240] Implement Create new folder function
2020-12-04 09:57:05 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968)
* Implement actions dropdown on project card
* make comments counter to work
2020-12-04 09:38:34 +01:00
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