scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
9011 commits 69 branches 179 tags 165 MiB
Commit graph

9011 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
aignatov-bio 329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Urban Rotnik a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +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 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
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