scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
9249 commits 69 branches 179 tags 166 MiB
Commit graph

9249 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mlorb aa7ddb7fbe
Merge pull request #3036 from mlorb/ml-sci-5059 
[SCI-5059] Change font size for manage columns list
 2021-01-04 10:23:22 +01:00
mlorb 418c900770
Merge pull request #3029 from mlorb/ml-sci-5287 
[SCI-5287] Show step collapse/expand on task
 2021-01-04 10:22:43 +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
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 0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
Mojca Lorber 62af5cc723 [SCI-5287] Show step collapse/expand on task 2020-12-22 15:50:27 +01:00
aignatov-bio b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +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
Urban Rotnik 4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +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
Oleksii Kriuchykhin 069704cb78 Fix redirects after 2FA sign in [SCI-4973] 2020-12-17 19:32:15 +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
Alex Kriuchykhin 851e806272
Merge pull request #3017 from okriuchykhin/ok_SCI_5297 
Implement additional preview type PDF of the whole document [SCI-5297]
 2020-12-16 12:55:24 +01:00
Oleksii Kriuchykhin 2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +01:00
Urban Rotnik b585bf5010
Merge pull request #3016 from biosistemika/develop 
Develop to Master
 2020-12-16 10:49:31 +01:00
Urban Rotnik 525df6fb42
Bump version to 1.20.5 2020-12-16 10:37:28 +01:00