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
9259 commits 70 branches 179 tags 165 MiB
Commit graph

9259 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order 2021-01-15 17:04:31 +01:00
aignatov-bio d355b4806b
Fix new project modal initialization [SCI-5381] (#3068) 2021-01-15 15:29:12 +01:00
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 dca0e5f188
Merge pull request #3090 from urbanrotnik/ur-sci-5405-missing-move-button 
Add data attribute for moveable permissions [SCI-5405]
 2021-01-15 14:23:27 +01:00
Urban Rotnik 97371f8216 Reorder ProjectFolder inner foldres 2021-01-15 14:22:48 +01:00
Urban Rotnik 998d66b8b9 Add data attribute for moveable permissions 
SCI-5405
 2021-01-15 13:54:18 +01:00
Urban Rotnik 05bcb7c502
Merge pull request #3086 from urbanrotnik/ur-sci-5394-missing-archived-results 
Fix missing results of archived task [SCI-5394]
 2021-01-15 13:53:13 +01:00
Urban Rotnik 2fa54d7898
Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities 
Fix folder's activities links [SCI-5397]
 2021-01-15 13:52:55 +01:00
Urban Rotnik c9bbc64751 Fix missing results of archived task 
[SCI-5394]
 2021-01-15 11:40:25 +01:00
Alex Kriuchykhin 902a47490d
Merge pull request #3082 from okriuchykhin/ok_SCI_5383_v2 
Show folder creation button on archived page [SCI-5383]
 2021-01-15 11:38:58 +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 adb9084787
Fix comments red dot and ordering of comments [SCI-5384] (#3084) 
* Fix comments red dot and ordering of comments [SCI-5384]
 2021-01-14 16:28:11 +01:00
aignatov-bio 823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Urban Rotnik 531b6cd554 Fix folder's activities links 2021-01-14 15:06:56 +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
Alex Kriuchykhin 668b0b5008
Merge pull request #3081 from okriuchykhin/ok_SCI_5380 
Fix projects index page JS initialization [SCI-5380]
 2021-01-14 13:15:03 +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
Oleksii Kriuchykhin ec7d1bf813 Show folder creation button on arhived page [SCI-5383] 2021-01-13 15:26:02 +01:00
Urban Rotnik 8d076d8c58 Fix border radius [SCI-5388] 2021-01-13 09:07:35 +01:00
Urban Rotnik 451e0316ad
Merge pull request #3079 from urbanrotnik/ur-sci-5376 
Add ProjectFolders relation to Folder Serializer [SCI-5376]
 2021-01-12 21:19:51 +01:00
Urban Rotnik 60a1e602e0 Add ProjectFolders relation to Folder serializer 2021-01-12 17:09:39 +01:00
Alex Kriuchykhin e61679bcdd
Merge pull request #3078 from urbanrotnik/ur-sci-fix-for-move-modal-partial 
Fix for move_modal partial rendering
 2021-01-12 15:46:43 +01:00
Urban Rotnik 1c5337e6ab Fix for move_modal partial rendering 2021-01-12 15:45:21 +01:00
Alex Kriuchykhin 62b1aaf033
Merge pull request #3077 from okriuchykhin/ok_SCI_5386 
Fix flash messages on sign-in [SCI-5386]
 2021-01-12 15:44:24 +01:00
Urban Rotnik 91ea82a21d
Merge pull request #3062 from urbanrotnik/ur-sci-5362-missing-archived-on-date 
Add fallback archived_on and archived_by for MyModule and Experiment [SCI-5362]
 2021-01-12 15:36:51 +01:00
Urban Rotnik 1070e813fc Add helper for archived_on date 2021-01-12 15:35:35 +01:00
Oleksii Kriuchykhin cf3b0916f6 Fix flash messages on sign-in [SCI-5386] 2021-01-12 15:28:30 +01:00
Urban Rotnik ef82fcc5ee
Merge pull request #3075 from urbanrotnik/ur-sci-5379-clean-folder-info 
Remove project_folder in callback [SCI-5379]
 2021-01-12 15:17:16 +01:00
Urban Rotnik 2a3bafd6a0 Add fallback archived_on and archived_by columns to parent for MyModule and Experiment [SCI-5362] 2021-01-12 14:53:06 +01:00
mlorb 61c3a8417e
Merge pull request #3076 from mlorb/ml-sci-5335-v2 
Change button style again [SCI-5335]
 2021-01-12 14:52:50 +01:00
aignatov-bio 7cc6ce5659
Fix projects page member filter [SCI-5385] (#3074) 2021-01-12 14:49:24 +01:00
Mojca Lorber 0b9daaa7d5 Change button style again 2021-01-12 14:37:22 +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
Urban Rotnik 485aa0d541 Remove project_folder in callback 2021-01-12 13:04:36 +01:00
aignatov-bio 8533e54adb
Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073) 2021-01-12 12:16:33 +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 3ad14e06b2
Merge pull request #3067 from urbanrotnik/ur-sci-5379-clean-folder-info 
Remove project_folder reference on project archive [SCI-5379]
 2021-01-12 11:27:08 +01:00
aignatov-bio 8099c4ed4c
Fix error on task page without due date [SCI-5375] (#3066) 2021-01-12 11:11:40 +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
Urban Rotnik 18e2f8e656
Merge pull request #3071 from urbanrotnik/ur-sci-5378-counters-fix 
Touch parent folder of folder [SCI-5378]
 2021-01-12 10:56:42 +01:00
Urban Rotnik 996f604df1 Touch parent folder of folder 2021-01-12 10:46:19 +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
Urban Rotnik baba7fc9e7 Remove project_folder reference on project archive [SCI-5379] 2021-01-11 13:54:21 +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