scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 02:16:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
7449 commits 69 branches 179 tags 166 MiB
Commit graph

5786 commits

Author SHA1 Message Date
aignatov-bio d886a42c8e Fix team description white space 2020-03-05 14:47:48 +01:00
aignatov-bio 3494d1071e
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates 
Refactor current task widget [SCI-4416]
 2020-03-05 14:46:16 +01:00
aignatov-bio 79560e517d Fix markup 2020-03-05 14:40:46 +01:00
aignatov-bio 4af992ef35 Fix date import for repository 2020-03-05 14:34:31 +01:00
aignatov-bio 024fc5b421 Add rounded corners to porgress bar 2020-03-05 13:13:54 +01:00
aignatov-bio f9be7a2cb8 Add alphabetical order for tasks without due date 2020-03-05 12:58:25 +01:00
Alex Kriuchykhin f201826eb8
Merge pull request #2426 from okriuchykhin/ok_SCI_4383 
Add global repositories limit [SCI-4383]
 2020-03-05 12:45:02 +01:00
Mojca Lorber 8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio d830fcec4a Remove locked task css and i18n 2020-03-04 14:56:06 +01:00
aignatov-bio 77d66b65b1 Refactor current task for addons integration 2020-03-04 13:21:52 +01:00
aignatov-bio 30545f5cf4
Merge pull request #2443 from aignatov-bio/ai-sci-4409-fix-visibilty-of-tasks 
Fix task visibility for current task widget [SCI-4409]
 2020-03-03 16:35:22 +01:00
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
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
Mojca Lorber 52493fd834 Add pagination for current tasks on dashboard 2020-03-03 12:07:21 +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 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 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 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
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
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
Alex Kriuchykhin 6841cdd6a6
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items 
New description to import items modal window [SCI-4365]
 2020-02-26 17:34:57 +01:00
Alex Kriuchykhin 9917a547ce
Merge pull request #2417 from aignatov-bio/ai-sci-4364-add-border-to-add-column-button 
Add border to add column button [SCI-4363]
 2020-02-26 17:33:47 +01:00
Oleksii Kriuchykhin 62c19f7c02 Add invite users to the team permission check [SCI-4381] 2020-02-26 17:25:38 +01:00
Mojca Lorber f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio 8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio 294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio 3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio 32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
Oleksii Kriuchykhin 0cb9584a2b Fix empty mime type for ActiveStorage local file service [SCI-4360] 2020-02-24 16:04:35 +01:00
aignatov-bio a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
aignatov-bio 5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
aignatov-bio 0675b137ad Add team and task status for calendars scope 2020-02-22 18:15:18 +01:00
aignatov-bio b664c88819 Remove clndr from package.json 2020-02-22 13:03:51 +01:00
Oleksii Kriuchykhin 63e557ea9e Add global repositories limit [SCI-4383] 2020-02-21 14:40:17 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio 3b679bc53d
Merge pull request #2416 from aignatov-bio/ai-sci-4349-progress-bar-research 
Add progress bar for current tasks [SCI-4349]
 2020-02-21 10:01:57 +01:00
aignatov-bio 2cbac634bf Add localization 2020-02-21 10:00:32 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
aignatov-bio 01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
aignatov-bio f11b051715 Merge branch 'develop' into features/dashboard 2020-02-19 10:29:50 +01:00
Alex Kriuchykhin d73ea73b04
Merge pull request #2411 from okriuchykhin/ok_SCI_4319_v2 
Fix unfolding of the active element in sidebar [SCI-4319]
 2020-02-19 10:24:13 +01:00
aignatov-bio 47a86f2cf9 Hide tooltip if parent object disabled or hidden 2020-02-18 15:40:05 +01:00
Oleksii Kriuchykhin 9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
aignatov-bio bbd48c9e08 Add border to add column button 2020-02-18 14:40:16 +01:00
aignatov-bio 5545d7da1a Add progress bar for current tasks 2020-02-18 14:28:06 +01:00
aignatov-bio 5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
aignatov-bio 0117b577f4 Fix typo 2020-02-18 09:27:07 +01:00
aignatov-bio ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio a438f6b4f0 Finished filters 2020-02-17 10:47:10 +01:00
aignatov-bio 485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
mlorb 618aa698d5
Merge pull request #2407 from mlorb/ml-sci-4329 
Fix adding too small/big number to input... [SCI-4329]
 2020-02-14 10:40:20 +01:00
mlorb 9f23f11dca
Merge pull request #2410 from mlorb/ml-sci-4309 
Hide pencil for shared inventory [SCI-4309]
 2020-02-13 15:12:17 +01:00
aignatov-bio 95c9479f54 Add page title 2020-02-13 14:54:58 +01:00
aignatov-bio a6186fba67 Change break limit 2020-02-13 14:44:59 +01:00
aignatov-bio 8e8f21969a Fix markup 2020-02-13 13:55:25 +01:00
aignatov-bio 5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
Oleksii Kriuchykhin 3959f880eb Fix unfolding of the active element in sidebar [SCI-4319] 2020-02-13 12:16:35 +01:00
aignatov-bio bdf4394d5f Clean notifications partial from layouts 2020-02-13 09:52:45 +01:00
Mojca Lorber 6fbecf3e88 Hide pencil for shared inventory 2020-02-12 20:28:15 +01:00
aignatov-bio 0381fef05b Move notifications to top navbar 2020-02-12 14:58:48 +01:00
aignatov-bio d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number 
Fix error in number column in repository [SCI-4347]
 2020-02-12 14:16:46 +01:00
aignatov-bio 59f52c6cc5
Merge pull request #2405 from aignatov-bio/ai-sci-4002-remove-shared-inventories-with-view-permissions 
Remove shared inventories with view permission from dropdown list [SCI-4002]
 2020-02-12 14:16:33 +01:00
aignatov-bio ddadc073d4
Merge pull request #2404 from aignatov-bio/ai-sci-4307-add-indetermined-state-for-share-inventory 
Add "indetermined" state for the "select all" checkbox in the Share Inventories [SCI-4307]
 2020-02-12 14:16:19 +01:00
aignatov-bio 5200096f69
Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown 
Improve search input field in the flyouts [SCI-4312]
 2020-02-12 14:16:06 +01:00
Mojca Lorber 0f67ce78c0 Fix adding too small/big number to input for decimals for number repo column type 2020-02-12 12:14:58 +01:00
aignatov-bio 00531066f8 Fix error in number column in repository 2020-02-12 11:55:10 +01:00
aignatov-bio 463b99195c Remove shared inventories with view permission from dropdown list 2020-02-12 11:16:55 +01:00
aignatov-bio 4e4a2cf5ad Add "indetermined" state for the "select all" checkbox in the Share Inventory modal 2020-02-12 10:37:29 +01:00
mlorb a472eda699
Merge pull request #2403 from okriuchykhin/ok_SCI_4346 
Fix multiple file result creation [SCI-4346]
 2020-02-12 09:27:47 +01:00
mlorb 399f5411fc
Merge pull request #2401 from mlorb/ml-sci-4342 
Fix console error at deleting inventory column [SCI-4342]
 2020-02-12 09:26:15 +01:00
Miha Mencin efe89a3e46
Merge pull request #2399 from okriuchykhin/ok_SCI_4336 
Improve speed of inventory import [SCI-4336]
 2020-02-12 09:23:22 +01:00
Oleksii Kriuchykhin 5be4ffb139 Fix multiple file result creation [SCI-4346] 2020-02-11 20:08:36 +01:00
mlorb 8a9d495b77
Merge pull request #2398 from mlorb/ml-sci-4147 
Change repository name and team name to h2 [SCI-4147]
 2020-02-11 16:27:03 +01:00
aignatov-bio 05f2fa8199
Merge pull request #2402 from aignatov-bio/ai-sci-4343-misaligned-filter 
Fix protocols table CSS [SCI-4343]
 2020-02-11 16:26:41 +01:00
Alex Kriuchykhin de219688cc
Merge pull request #2397 from okriuchykhin/ok_SCI_4331 
Fix edit button behavior in repository table [SCI-4331]
 2020-02-11 16:13:39 +01:00
Oleksii Kriuchykhin 3310d79c4c Fix failing tests [SCI-4336] 2020-02-11 16:12:53 +01:00
aignatov-bio 26783e64da Fix protocols table CSS 2020-02-11 15:58:17 +01:00
Mojca Lorber 4c81e4b087 Fix console error at deleting inventory column 2020-02-11 15:27:11 +01:00
aignatov-bio eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +01:00
Oleksii Kriuchykhin 0fec8f4d95 Improve speed of inventory import [SCI-4336] 2020-02-11 13:51:34 +01:00
Mojca Lorber 509e197f64 Change repository name and team name to h2 2020-02-11 13:18:33 +01:00
Oleksii Kriuchykhin fe0ebae383 Fix edit button behaviour in repository table [SCI-4331] 2020-02-11 11:07:03 +01:00
Mojca Lorber 232209e64a Set timeout for loading manage column index modal to load after datatable redraw 2020-02-10 15:29:34 +01:00
Mojca Lorber 7bcdc52de2 Fix share inventory button position 2020-02-10 13:13:18 +01:00
Alex Kriuchykhin 9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220 
Extend inventory import to support new data types [SCI-4220]
 2020-02-10 11:04:34 +01:00
Alex Kriuchykhin 446280a2e4 Merge pull request #2391 from okriuchykhin/ok_SCI_4330 
Improve speed of global activities fetching query [SCI-4330]
 2020-02-10 10:44:52 +01:00
Oleksii Kriuchykhin f97577ec12 Remove byebug entry [SCI-4220] 2020-02-10 10:40:38 +01:00
mlorb c1aa269afc Merge pull request #2392 from mlorb/ml-sci-4313 
Add empty option in dropdown selector [SCI-4313]
 2020-02-10 10:32:03 +01:00
Alex Kriuchykhin 08140f23e5 Merge pull request #2393 from okriuchykhin/ok_SCI_4321 
Fix file result only name update [SCI-4321]
 2020-02-10 10:30:54 +01:00
Oleksii Kriuchykhin 4547e4d61a Fix DateTime picker for repositories edit mode [SCI-4331] 2020-02-07 16:42:04 +01:00
Oleksii Kriuchykhin 49e1e67231 Fix JS condition [SCI-4321] 2020-02-07 15:54:57 +01:00
Oleksii Kriuchykhin 5470bb9b9b Fix file result only name update [SCI-4321] 2020-02-07 15:21:50 +01:00
Mojca Lorber e9e7b85e0b Add empty option in dropdown selector 2020-02-07 14:57:07 +01:00
Alex Kriuchykhin 913f599b9f
Merge pull request #2389 from okriuchykhin/ok_SCI_4301 
Add unsaved data notification when navigating away from the inventory [SCI-4301]
 2020-02-07 13:58:20 +01:00
Alex Kriuchykhin edaf7adbbb
Merge pull request #2387 from okriuchykhin/ok_SCI_4319 
Fix sidebar current project expanding [SCI-4319]
 2020-02-07 13:55:15 +01:00
Oleksii Kriuchykhin 6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
mlorb f26ea42cc5
Merge pull request #2390 from mlorb/ml-sci-4265-v2 
Redesign clear buttons on global activities page [SCI-4265]
 2020-02-07 13:49:00 +01:00
mlorb e05b2c9ce2
Merge pull request #2368 from mlorb/ml-sci-4217 
Fix css for icons for repository file type [SCI-4217]
 2020-02-07 13:25:22 +01:00
Mojca Lorber e41df37a2e Small css fix after merging 2020-02-07 12:20:09 +01:00
Mojca Lorber 9068c20588 Redesign clear buttons on global activities page 2020-02-07 11:33:25 +01:00
mlorb ba597acf8d
Merge branch 'develop' into ml-sci-4217 2020-02-07 09:43:53 +01:00
Oleksii Kriuchykhin 21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46:16 +01:00
Mojca Lorber 769089b555 Fix hound 2020-02-06 14:44:58 +01:00
Mojca Lorber a22fe28d24 Refactor new and edit renderer for file cell 2020-02-06 14:43:17 +01:00
Mojca Lorber ef241150f6 Fix edit tag on task page 2020-02-06 12:57:03 +01:00
Oleksii Kriuchykhin b7455f6b85 Fix sidebar current project expanding [SCI-4319] 2020-02-05 21:29:12 +01:00
aignatov-bio 665c178d79
Merge pull request #2386 from biosistemika/ai-sci-4325-add-css-for-connected-accounts 
Add connected account styling [SCI-4325]
 2020-02-05 14:07:06 +01:00
aignatov-bio f2539b052f Add connected account styling 2020-02-05 13:25:45 +01:00
Oleksii Kriuchykhin 7d107bf45b Fix tests [SCI-4317] 2020-02-05 11:58:27 +01:00
Oleksii Kriuchykhin 8c5637a19c Add explicit ordering of items for repository columns [SCI-4317] 2020-02-05 11:11:06 +01:00
mlorb 49bfb603c8
Merge pull request #2357 from mlorb/ml-sci-4130 
Sidebar redesign [SCI-4130]
 2020-02-04 09:55:00 +01:00
mlorb 415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283 
Implement missing style guide changes [SCI-4283]
 2020-02-04 09:37:48 +01:00
Oleksii Kriuchykhin 632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin d9cf2b57fd Fix failing tests [SCI-4220] 2020-02-03 15:48:49 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00