Commit graph

8835 commits

Author SHA1 Message Date
Mojca Lorber
283bfc8759 Update css for users on project cards 2021-01-05 18:31:33 +01:00
Urban Rotnik
cd43973952 Add tooltips for users on project cards 2021-01-04 16:44:31 +01:00
Alex Kriuchykhin
163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340
Make active projects view default [SCI-5340]
2021-01-04 11:56:22 +01:00
Alex Kriuchykhin
e0e796c5e7
Merge pull request #3040 from okriuchykhin/ok_SCI_5328
Fix project card menu visibility [SCI-5328]
2021-01-04 11:55:54 +01:00
Alex Kriuchykhin
4638e74e1e
Merge pull request #3041 from okriuchykhin/ok_SCI_5327
Fix links in sidebar navigation [SCI-5327]
2021-01-04 10:53:38 +01:00
Alex Kriuchykhin
15a8524a99
Merge pull request #3039 from okriuchykhin/ok_SCI_5339
Disable comment adding for archived objects [SCI-5339]
2021-01-04 10:53:13 +01:00
mlorb
7b48869557
Merge pull request #3024 from mlorb/ml-sci-5293
[SCI-5293] Remove Archived results tab on archived Task
2021-01-04 10:25:18 +01:00
mlorb
67b8b13b81
Merge pull request #3025 from mlorb/ml-sci-5280
[SCI-5280] Rename Academy to Courses
2021-01-04 10:24:22 +01:00
Alex Kriuchykhin
6d1ff4a047
Merge pull request #3032 from okriuchykhin/ok_SCI_5324
Fix global activities page [SCI-5324]
2021-01-04 10:23:52 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin
8f0a3fb61c Fix links in sidebar navigation [SCI-5327] 2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin
49dc56caf2 Fix project card menu visibility [SCI-5328] 2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin
738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Oleksii Kriuchykhin
0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
Mojca Lorber
5910d56903 [SCI-5280] Rename Academy to Courses 2020-12-21 12:19:14 +01:00
Mojca Lorber
21c0ea4f8d [SCI-5293] Remove Archived results tab on archived Task 2020-12-21 11:56:33 +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
c7ce7f2fc3
Merge pull request #3020 from urbanrotnik/ur-sci-5306-filters
Apply new filters, css fixes, JS fix for dropdown toggle [SCI-5306]
2020-12-18 11:49:26 +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
7c967d32f1 Reset invalid state
SCI-5306
2020-12-18 09:46:05 +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
Miha Mencin
f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276
Archiving: update archived TASK screen layout [SCI-5276]
2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin
7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +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
Miha Mencin
6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268
Archiving: add 'archived' flag on folder [SCI-5268]
2020-12-17 13:13:26 +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
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Alex Kriuchykhin
4a088589b5
Merge pull request #3001 from okriuchykhin/ok_SCI_5281
Implement sorting on the project screen (when filterin/searching) [SCI-5281]
2020-12-17 12:43:55 +01:00
Oleksii Kriuchykhin
0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Miha Mencin
ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
2020-12-17 09:44:40 +01:00
Miha Mencin
ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
2020-12-17 09:17:44 +01:00
Urban Rotnik
2d4b0fdbdc
Merge pull request #3010 from urbanrotnik/ur-sci-5294-remove-editing-options-of-archived-results
Refactor result permissions [SCI-5294]
2020-12-17 06:17:18 +01:00
Miha Mencin
d83911580f
Merge pull request #3006 from biosistemika/dependabot/npm_and_yarn/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7
2020-12-16 13:42:05 +01:00
Urban Rotnik
525df6fb42
Bump version to 1.20.5 2020-12-16 10:37:28 +01:00
aignatov-bio
329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +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
ad8cf8a1fa Refactor result permissions 2020-12-14 12:50:54 +01:00
Oleksii Kriuchykhin
94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
Urban Rotnik
398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +01:00