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

7452 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb ba438e7728
Merge branch 'features/dashboard' into ml-sci-4354 2020-03-03 16:29:47 +01:00
Mojca Lorber 4f37260571 Fix controller 2020-03-03 16:17:29 +01:00
aignatov-bio 9fa8818a5d Fix markup 2020-03-03 16:10:52 +01:00
aignatov-bio da4967b3d0 Fix markup 2020-03-03 16:09:19 +01:00
aignatov-bio 7d7cdce91a Add file size limitation to tinyMCE 2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin 11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
Alex Kriuchykhin ac06f307c5
Merge pull request #2444 from aignatov-bio/ai-sci-4406-current-tasks-visual-imporvments 
Small visual improvements for current tasks widget [SCI-4406]
 2020-03-03 15:23:19 +01:00
aignatov-bio 3dc94a225d Small visual improvments for current tasks widget 2020-03-03 14:21:16 +01:00
Mojca Lorber 7dfd1d5ba6 Small fixes 2020-03-03 13:52:36 +01:00
aignatov-bio eb4a783337 Fix task visibility for current task widget 2020-03-03 13:13:46 +01:00
mlorb 4d52fc9b45
Merge branch 'features/dashboard' into ml-sci-4354 2020-03-03 13:00:05 +01:00
Alex Kriuchykhin a09d6151cd
Merge pull request #2441 from aignatov-bio/ai-sci-4353-add-search-to-current-task-widget 
Add search to current task widget [SCI-4353]
 2020-03-03 12:10:11 +01:00
Mojca Lorber 52493fd834 Add pagination for current tasks on dashboard 2020-03-03 12:07:21 +01:00
Alex Kriuchykhin 3f52d538e9
Merge pull request #2442 from aignatov-bio/ai-sci-fix-invite-user-modal 
Add user check to invite user modal
 2020-03-03 11:29:20 +01:00
aignatov-bio e46e496702 Add user check to invite user modal 2020-03-03 10:30:04 +01:00
aignatov-bio 51c7aa2c7a Remove keydown event 2020-03-03 09:58:53 +01:00
aignatov-bio 50810dc55e Fix markup 2020-03-03 09:53:44 +01:00
aignatov-bio d9bfd8c28e Add search to current task widget 2020-03-03 09:50:44 +01:00
aignatov-bio 1eed4c500d Remove validation for items list 2020-03-02 14:35:47 +01:00
Oleksii Kriuchykhin a819e1b8f4 Merge branch 'hotfix/1.17.11' into develop 2020-03-02 11:58:25 +01:00
Oleksii Kriuchykhin 03f08c4c06 Merge branch 'hotfix/1.18.4' into develop 2020-03-02 11:56:45 +01:00
Oleksii Kriuchykhin daaea277f1 Bump version to 1.18.4 2020-03-02 10:20:45 +01:00
Oleksii Kriuchykhin 73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
Alex Kriuchykhin f9ad438fb5
Merge pull request #2431 from okriuchykhin/ok_SCI_4381 
Add invite users to the team permission check [SCI-4381]
 2020-02-28 16:40:57 +01:00
Alex Kriuchykhin f6a47eca14
Merge pull request #2423 from okriuchykhin/ok_SCI_4370 
Add variables with TLS CA configuration for mail [SCI-4370]
 2020-02-28 16:40:41 +01:00
Alex Kriuchykhin b83cbf33a7
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug 
Fix files handling in results [SCI-4345]
 2020-02-28 16:40:05 +01:00
Alex Kriuchykhin 409c4b7f65
Merge pull request #2438 from okriuchykhin/ok_SCI_4356 
Improve loading of tasks statistics for dashboard [SCI-4356]
 2020-02-28 16:38:39 +01:00
Oleksii Kriuchykhin 78ceb41a9e Improve loading of tasks statistics for dashboard [SCI-4356] 2020-02-28 16:17:32 +01:00
aignatov-bio c4be9bca2f Fix files handling in results 2020-02-28 14:55:13 +01:00
aignatov-bio 6900d8384b
Merge pull request #2428 from aignatov-bio/ai-sci-4375-end-point-to-task-create 
Service for task creating and quick start end point [SCI-4375]
 2020-02-28 14:38:07 +01:00
aignatov-bio 0ae5e51cb3 Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create 2020-02-28 14:37:27 +01:00
aignatov-bio a70b666e5a
Merge pull request #2430 from aignatov-bio/ai-sci-4378-quick-start-main-layout 
Add quick start layout and create task modal [SCI-4378][SCI-4374]
 2020-02-28 14:35:59 +01:00
aignatov-bio 95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
aignatov-bio 6dcb8be849 Merge branch 'develop' into ai-sci-4380-saving-navigation-state 2020-02-28 14:14:08 +01:00
aignatov-bio 8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio a0015fe184
Merge pull request #2432 from aignatov-bio/ai-sci-4304-fix-assigned-task-position 
Fix assigned tasks position [SCI-4304]
 2020-02-28 13:54:19 +01:00
aignatov-bio 4aaeb2043f
Merge pull request #2433 from aignatov-bio/ai-sci-4390-change-new-inventory-button-design 
Change button style for new inventory [SCI-4390]
 2020-02-28 13:54:07 +01:00
aignatov-bio 6625ef9eb5
Merge pull request #2435 from aignatov-bio/ai-sci-4385-fix-z-index-for-dropdown 
Fix z-index for dropdown [SCI-4385]
 2020-02-28 13:53:55 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
Alex Kriuchykhin 77f422ceda
Merge pull request #2436 from okriuchykhin/ok_SCI_4404 
Switch to serial multiple file uploads for better compatibility [SCI-4404]
 2020-02-28 11:54:08 +01:00
Mojca Lorber 3c09923d96 Refactoring current tasks backend 2020-02-28 11:51:08 +01:00
Mojca Lorber 415721112a Optimize completed_steps_percentage 2020-02-27 17:12:31 +01:00
Oleksii Kriuchykhin b4a8a7ba72 Switch to serial multiple file uploads for better compatibility [SCI-4404] 2020-02-27 16:58:00 +01:00
aignatov-bio 9e15d1ea42 Refactor experiment sidebar 2020-02-27 16:04:44 +01:00
aignatov-bio ace8613457 Fix z-index for dropdown 2020-02-27 13:16:11 +01:00
aignatov-bio b2580c1704 Prevent create empty dropdown in inventories 2020-02-27 13:10:00 +01:00
aignatov-bio 630412c18a Change button style for new inventory 2020-02-27 12:11:38 +01:00
aignatov-bio d31fc33873 Fic assigned tasks position 2020-02-27 11:47:47 +01:00
Alex Kriuchykhin bf1fac0b10
Merge pull request #2421 from aignatov-bio/ai-sci-4256-transparent-image-for-image-preview 
Add checkboard background for transparent images [SCI-4256]
 2020-02-26 17:46:48 +01:00
Alex Kriuchykhin a41c1c606b
Merge pull request #2419 from aignatov-bio/ai-sci-4328-hide-tooltip-if-object-hide 
Hide tooltip if parent object disabled or hidden [SCI-4328]
 2020-02-26 17:35:34 +01:00