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

2116 commits

Author SHA1 Message Date
Urban Rotnik ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +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 c9bbc64751 Fix missing results of archived task 
[SCI-5394]
 2021-01-15 11:40:25 +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
Oleksii Kriuchykhin 8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +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
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
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
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 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
Urban Rotnik 427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
Urban Rotnik 6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature 
Move projects/folders modal [SCI-5334]
 2021-01-07 17:45:19 +01:00
Urban Rotnik 5d79eaa843 Pass projects mode(archived/active) to move_to modal for list [SCI-5334] 2021-01-07 17:42:05 +01:00
Urban Rotnik 20acd9b693 Fix controller and tests 2021-01-07 17:41:39 +01:00
aignatov-bio 276d6abe19
Update archive navigation for tasks page [SCI-5347] (#3052) 
* Update archive navigation for tasks page [SCI-5347]
 2021-01-07 17:18:52 +01:00
aignatov-bio 1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
aignatov-bio 1515ffa3f5
Add searching to projects member filter [SCI-5373] (#3054) 2021-01-07 13:01:14 +01:00
aignatov-bio ef57489cd9
Update repositories sidebar [SCI-5329] (#3031) 
* Update repositories sidebar [SCI-5329]
 2021-01-06 10:13:10 +01:00
Oleksii Kriuchykhin 696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
Alex Kriuchykhin a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
aignatov-bio f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +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
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin 738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Oleksii Kriuchykhin f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +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
Oleksii Kriuchykhin 069704cb78 Fix redirects after 2FA sign in [SCI-4973] 2020-12-17 19:32:15 +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
Urban Rotnik 9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +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
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
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
Oleksii Kriuchykhin 94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +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 188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Urban Rotnik 1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +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