scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 19:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
12045 commits 69 branches 179 tags 165 MiB
Commit graph

1867 commits

Author SHA1 Message Date
Anton c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton 7aad22b138 Fix assigned users icons allignment [SCI-7692] 2023-01-06 11:51:32 +01:00
aignatov-bio fe58a7a206
Merge pull request #4766 from aignatov-bio/ai-sci-7699-fix-z-index-for-experiment-table-header 
Fix zIndex for experiment table header [SCI-7699]
 2023-01-06 11:25:10 +01:00
aignatov-bio 7e08c62ce9
Merge pull request #4762 from aignatov-bio/ai-sci-7678-experiment-table-small-css-fixes 
Experiment table small css fixes [SCI-7678]
 2023-01-06 11:24:30 +01:00
Anton 0dd7702786 Fix zIndex for experiment table header [SCI-7699] 2023-01-06 11:18:44 +01:00
Anton f73d2496b8 Experiment table small css fixes [SCI-7678] 2023-01-06 10:54:38 +01:00
artoscinote 9914f19634
Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state, fix breadcrumbs [SCI-7651]
 2023-01-06 10:51:34 +01:00
Giga Chubinidze 79c7e6f0a2 Missing experiment table empty state, fix breadcrumbs [SCI-7651] 2023-01-06 11:40:41 +04:00
aignatov-bio 478269d579
Merge pull request #4759 from aignatov-bio/ai-sci-7680-fix-zoom-option-button-icon-color 
Fix color of zoom option button [SCI-7680]
 2023-01-05 17:27:36 +01:00
aignatov-bio d995019efa
Merge pull request #4758 from aignatov-bio/ai-sci-7687-fix-columns-during-sorting 
Fix placeholder columns during sorting [SCI-7687]
 2023-01-05 17:27:26 +01:00
aignatov-bio 78299b64f4
Merge pull request #4756 from aignatov-bio/ai-sci-7646-fix-archived-tasks-logn-experiment-name 
Fix long experiment name on archived tasks card view [SCI-7646]
 2023-01-05 17:27:03 +01:00
Anton 79209054c4 Fix color of zoom option button [SCI-7680] 2023-01-05 13:29:13 +01:00
Anton 00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
ajugo 32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Anton ca30c6a094 Fix long experiment name on archived tasks card view [SCI-7646] 2023-01-05 11:54:38 +01:00
ajugo 194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730) 
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
 2023-01-05 11:14:34 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
aignatov-bio 9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen 
CSS update for protocol import screen [SCI-7394]
 2023-01-04 10:07:19 +01:00
ajugo 4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
Anton 30606428e9 Fix experiment table title width [SCI-7646] 2022-12-23 10:35:17 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
Anton 250a4b4602 CSS fixes for project/experiments cards [SCI-7628] 2022-12-20 12:51:44 +01:00
G-Chubinidze f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton 2fd2d7300e Revert modified date on experiment card 2022-12-19 11:32:32 +01:00
Anton 66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +01:00
aignatov-bio 66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Anton de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
Anton a3045a79a9 Fix expose ids css fixes [SCI-7578] 2022-12-09 09:59:51 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
ajugo add6554732
Connect experiment options to the table view [SCI-7554] (#4692) 2022-12-07 14:51:48 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"" 
This reverts commit 50e7531ffa.
 2022-12-06 12:43:30 +01:00
ajugo 4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] (#4670) 
* Add new task modal field for Assign users for experiment views [SCI-7450]

* Fix loading users assigned to the experiment [SCI-7450]

* Fix task creation on experiment if none exists [SCI-7450]
 2022-12-05 12:55:57 +01:00
ajugo 02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659) 
* Implement experiment table sort flyout [SCI-7451]

* Implement archive sort options for experiment table [SCI-7497]

* Fix hound [SCI-7451]

* Clean code for experiment table view sorting [SCI-7497]

* Fix hound [SCI-7451]
 2022-12-05 10:30:20 +01:00
G-Chubinidze 756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176 
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
 2022-12-02 20:16:40 +04:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172 
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
 2022-12-02 20:16:05 +04:00
Giga Chubinidze eff5d12253 removed last-page class by default 2022-12-02 20:10:03 +04:00
aignatov-bio cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu 
Experiment table connect task action in dropdown [SCI-7525]
 2022-12-02 13:36:01 +01:00
Giga Chubinidze 76884bafc1 code cleanup 2022-12-02 15:53:22 +04:00
Giga Chubinidze 36b99fa2cb code cleanup 2022-12-02 14:51:22 +04:00
ajugo 7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] (#4666) 2022-12-02 11:40:57 +01:00
ajugo 8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646) 
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
 2022-12-02 11:01:40 +01:00
Anton 12f141b82e Experiment table connect task action in dropdown [SCI-7525] 2022-12-02 10:03:01 +01:00
artoscinote 4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653) 
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

* Add readable scope to batch clone action [SCI-7382]

* Move 'Clone' to translations, simplify JS [SCI-7382]
 2022-12-01 15:08:59 +01:00
Anton 234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Anton 393bc03d47 CSS update for protocol import screen [SCI-7394] 2022-11-29 15:41:57 +01:00
aignatov-bio 7ea57d9ffe
Merge pull request #4630 from aignatov-bio/ai-sci-7440-add-dropdown-for-assigned-user-experiment-table 
Add user assignments dropdown for experiment table [SCI-7440]
 2022-11-29 15:32:00 +01:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
aignatov-bio 887b1b062a
Merge pull request #4652 from aignatov-bio/ai-sci-7493-update-archived-my-modules-card-screen 
Update archive module cards header [SCI-7493]
 2022-11-29 14:04:30 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
ajugo 9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] (#4651) 2022-11-28 10:35:42 +01:00
Anton e2cd0dfd91 Update archive module cards header [SCI-7493] 2022-11-25 15:29:15 +01:00
ajugo 80f66736b6
Add new task modal for experiment table view [SCI-7448] (#4638) 
* Add new task modal for experiment table view [SCI-7448]

* Fix placeholder and size of the icon [SCI-7448]

* Reload experiment table [SCI-7448]
 2022-11-24 14:49:42 +01:00
Anton 2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +01:00
aignatov-bio c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout 
Fix time picket CSS [SCI-7359]
 2022-11-24 09:44:12 +01:00
artoscinote 5605c3dfed
Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu 
Add menu to experiment table row [SCI-7446]
 2022-11-23 16:48:20 +01:00
Anton 440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
Anton e940bf8c0e Small canvas edit mode changes [SCI-7387] 2022-11-22 13:08:56 +01:00
Anton 98e87a2f4b Fix markup [SCI-7359] 2022-11-22 11:29:57 +01:00
Alex Kriuchykhin d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361 
Fixed external protocol icon out of body [SCI-7361]
 2022-11-22 10:56:55 +01:00
Alex Kriuchykhin dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181 
Remove old step code [SCI-7181]
 2022-11-22 10:52:06 +01:00
ajugo f2a680d826
Fix zebra printer print status [SCI-7474] (#4625) 2022-11-21 16:55:03 +01:00
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Giga Chubinidze 44d74b5797 refactoring projects scss 2022-11-17 22:29:15 +04:00
Giga Chubinidze 7f09fb8997 Archived projects cards and table updates [SCI-7201] 2022-11-17 22:25:54 +04:00
Anton 85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
G-Chubinidze e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04:00
Giga Chubinidze 5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04:00
aignatov-bio 4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms 
Fix css issues for login and signup forms [SCI-7233]
 2022-11-10 11:15:03 +01:00
aignatov-bio 2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982 
Implement multiline editing in repositories [SCI-6982][SCI-6983]
 2022-11-10 11:07:30 +01:00
artoscinote 0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
aignatov-bio 0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027 
Session end implementation [SCI-7027]
 2022-11-10 11:03:02 +01:00
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
ajugo dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Giga Chubinidze d1aa127b7a Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176 2022-10-28 15:30:28 +04:00
Giga Chubinidze a9287df1a0 exposed experiment ids on card view page / other styling updates [SCI-7176] 2022-10-28 15:16:49 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
Giga Chubinidze fe488ed00f fixed unstable project name and code styling in cards 2022-10-28 11:38:38 +04:00
Giga Chubinidze b1296adeb3 pitstop 2022-10-28 10:49:13 +04:00
ajugo 29ce28a1af
Implement canvas view navigator [SCI-7198] (#4577) 2022-10-27 14:43:31 +02:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Anton 8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Anton bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00