scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
8867 commits 70 branches 179 tags 165 MiB
Commit graph

8867 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot] b4c9b96171
Bump ini from 1.3.5 to 1.3.7 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-11 07:25:38 +00:00
Alex Kriuchykhin 691072f519
Merge pull request #3004 from mlorb/ml-sci-5173-5174-5237 
Update layout of the navigation... [SCI-5173] [SCI-5174] [SCI-5237]
 2020-12-10 18:15:14 +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 d84aa103f1
Merge pull request #2997 from urbanrotnik/ur-sci-5266-archived-projects 
Archived projects layout [SCI-5266]
 2020-12-10 13:40:38 +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
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