Commit graph

2987 commits

Author SHA1 Message Date
aignatov-bio
6011bb36b6 Fix archived experiment dropdown and archived view for projects page [SCI-5392] 2021-01-15 15:08:27 +01:00
Urban Rotnik
998d66b8b9 Add data attribute for moveable permissions
SCI-5405
2021-01-15 13:54:18 +01:00
Urban Rotnik
517026a252
Merge pull request #3083 from urbanrotnik/ur-sci-5393-fix-filters
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
2021-01-15 11:34:03 +01:00
aignatov-bio
823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Urban Rotnik
7cd85d8e9d
Merge pull request #3080 from urbanrotnik/ur-sci-5388
Fix border radius [SCI-5388]
2021-01-14 14:05:20 +01:00
Urban Rotnik
e099827b1b Trigger search on filters flyout close, fix render when filters are clear [SCI-5393] 2021-01-14 13:36:45 +01:00
Oleksii Kriuchykhin
8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Urban Rotnik
0e17cde499 Fix line height 2021-01-14 08:54:17 +01:00
Urban Rotnik
8d076d8c58 Fix border radius [SCI-5388] 2021-01-13 09:07:35 +01:00
Alex Kriuchykhin
5f506b7459
Merge pull request #3072 from okriuchykhin/ok_SCI_5383
Fix folder creation for archived view [SCI-5383]
2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin
78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
mlorb
8fbdfa28d5
Merge pull request #3070 from mlorb/ml-sci-5333
Add no results page for search on project page [SCI-5333]
2021-01-12 12:02:37 +01:00
Urban Rotnik
c04f427c9e
Merge pull request #3065 from urbanrotnik/ur-sci-5377-missing-arrows
Fix arrows for JS Tree [SCI-5377]
2021-01-12 11:08:05 +01:00
Alex Kriuchykhin
04f68facd3
Merge pull request #3064 from okriuchykhin/ok_SCI_5344
Add Restore button to the archived Projects screen [SCI-5344]
2021-01-12 10:59:39 +01:00
Mojca Lorber
54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
Urban Rotnik
244995cb3d Fix assets location and url references [SCI-5377] 2021-01-11 17:56:51 +01:00
aignatov-bio
e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +01:00
Oleksii Kriuchykhin
684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik
f478ad91c3
Merge pull request #3058 from urbanrotnik/ur-sci-5312
Folder name uniqueness validation on folder level and renaming [SCI-5312]
2021-01-08 10:40:52 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders
Features/folders into develop
2021-01-08 06:26:44 +01:00
Urban Rotnik
6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature
Move projects/folders modal [SCI-5334]
2021-01-07 17:45:19 +01:00
Urban Rotnik
5d79eaa843 Pass projects mode(archived/active) to move_to modal for list [SCI-5334] 2021-01-07 17:42:05 +01:00
Urban Rotnik
3dc76a3e57 Fix typo, update carets 2021-01-07 17:42:04 +01:00
Urban Rotnik
3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
Urban Rotnik
ba13a0b14b Add jstree lib 2021-01-07 17:41:32 +01:00
aignatov-bio
0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
Urban Rotnik
88ed583a0c Fix error rendering on new proejct_folder modal 2021-01-07 16:41:10 +01:00
Alex Kriuchykhin
962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317
Add project permissions check to projects toolbar [SCI-5317]
2021-01-07 13:25:34 +01:00
aignatov-bio
1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048)
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin
9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
Mojca Lorber
b1eb4003ed Fix bug with users edit link not working 2021-01-06 14:55:27 +01:00
Oleksii Kriuchykhin
53be6a95c4 Fix projects filter mark, titles and comments mark [SCI-5332] 2021-01-06 11:28:39 +01:00
mlorb
e8b48e51f4
Merge pull request #3050 from mlorb/ml-sci-5336
Fix table view of project page display of users [SCI-5336]
2021-01-06 10:14:08 +01:00
aignatov-bio
ef57489cd9
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
2021-01-06 10:13:10 +01:00
Mojca Lorber
5298a91b48 Fix table view of project page display of users [SCI-5336] 2021-01-06 09:52:13 +01:00
Urban Rotnik
8f11376285
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars
Tooltip for users on project cards [SCI-5320]
2021-01-06 09:18:00 +01:00
Mojca Lorber
283bfc8759 Update css for users on project cards 2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin
c83327b720 Fix project buttons visibility [SCI-5318] 2021-01-05 14:29:20 +01:00
Oleksii Kriuchykhin
696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
Alex Kriuchykhin
a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341
Fix restore action for experiments and tasks [SCI-5341]
2021-01-05 10:09:39 +01:00
aignatov-bio
f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
aignatov-bio
2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Urban Rotnik
216db90e4a
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon
Fix cursor on SmartAnnotation [SCI-5084]
2021-01-04 11:18:13 +01:00
mlorb
dafe8a072a
Merge pull request #3035 from mlorb/ml-sci-5095
[SCI-5095] Change color of sidebar icons and labels
2021-01-04 10:23:52 +01:00
Oleksii Kriuchykhin
738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Mojca Lorber
bd49e277cc [SCI-5059] Change font size for manage columns list 2020-12-29 11:27:52 +01:00
Mojca Lorber
80b472aba0 [SCI-5095] Change color of sidebar icons and labels 2020-12-29 11:15:22 +01:00
Oleksii Kriuchykhin
f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
mlorb
a999fb0c80
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021)
* change the layout of the archived projects cards and the list view

* change order in css
2020-12-18 13:05:23 +01:00
Urban Rotnik
d3e38c89f8 Update BE sorting for archived fodlers&projects
SCI-5306
2020-12-18 11:27:17 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search
SCI-5306
2020-12-18 09:43:11 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view
[SCI-5306]
2020-12-18 08:41:51 +01:00
Urban Rotnik
4f657ab343 Fix CSS
SCI-5306
2020-12-18 08:37:57 +01:00
mlorb
f6f7211d77
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012)
* Update styling for projects filters and fix some js bugs

* Fix hound
2020-12-17 23:13:45 +01:00
Urban Rotnik
ad4ee65f6b
Merge pull request #3007 from urbanrotnik/ur-sci-5300
Connect manage users modal with new projects cards [SCI-5300]
2020-12-17 13:48:10 +01:00
Urban Rotnik
3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards
Archived tasks cards [SCI-5274] [SCI-5275]
2020-12-17 13:17:11 +01:00
Urban Rotnik
d4c84a38e5 Fix css
[SCI-5274]
2020-12-17 13:11:30 +01:00
Urban Rotnik
19f16555c6 Add checkbox and restore button
[SCI-5275]
2020-12-17 13:11:20 +01:00
Urban Rotnik
cd7b94b434 Fix users/comments tab showing
[SCI-5274]
2020-12-17 13:08:58 +01:00
Urban Rotnik
9a7ffb0645 Add Tags modal to archived tags screen
[SCI-5274]
2020-12-17 13:08:57 +01:00
Urban Rotnik
2ae075e893 Use canvas task card for archived task card
[SCI-5274]
2020-12-17 13:08:53 +01:00
aignatov-bio
2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011)
* Change experiment archived card [SCI-5270]
2020-12-17 13:07:30 +01:00
Oleksii Kriuchykhin
0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
aignatov-bio
329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Urban Rotnik
c7c6e2d0f2 Fix cursor on SmartAnnotation 2020-12-14 17:29:30 +01:00
aignatov-bio
30cfe78805
Add edit modal for project folders [SCI-5265] (#3002)
Add edit modal for project folders [SCI-5265]
2020-12-14 15:54:18 +01:00
Urban Rotnik
398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Urban Rotnik
207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Urban Rotnik
152990b4d6 Add archived mode for Projects
[SCI-5266]
2020-12-09 08:51:55 +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
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
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
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
Oleksii Kriuchykhin
9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Mojca Lorber
d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +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
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
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
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
85b22cd486 Fix syntax 2020-11-26 12:31:45 +01:00
Urban Rotnik
efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Urban Rotnik
34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
aignatov-bio
3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio
c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
aignatov-bio
1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
mlorb
e4001dd406
Merge pull request #2977 from mlorb/ml-sci-5048
Implement ESC button to exit full-screen modals [SCI-5048]
2020-11-25 09:55:16 +01:00
Mojca Lorber
2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio
f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio
dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
2020-11-24 11:25:36 +01:00
aignatov-bio
966bb7c9ed
Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new
Replace loading spinner [SCI-5229]
2020-11-23 16:32:49 +01:00