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

605 commits

Author SHA1 Message Date
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Anton 248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Giga Chubinidze b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
artoscinote bc6afa5efa
Merge pull request #5114 from artoscinote/ma_SCI_8109 
Fix protocol link and step delete modal styling [SCI-8109]
 2023-03-09 14:53:21 +01:00
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Martin Artnik 69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
Alex Kriuchykhin f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
sboursen-scinote 5e89f1f829 Update my_module protocol status dropdown [SCI-7991] 2023-03-07 05:48:20 +01:00
ajugo b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042) 
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
 2023-03-01 11:33:32 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
ajugo 96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009) 
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
 2023-02-28 14:17:34 +01:00
Martin Artnik c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Anton a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo 166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
ajugo cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870) 
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
 2023-02-14 13:19:24 +01:00
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
ajugo d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
aignatov-bio 5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation 
Fix user designation on task creation [SCI-7758]
 2023-01-17 15:12:46 +01:00
aignatov-bio 8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling 
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
 2023-01-17 13:34:13 +01:00
Anton 3b6590b8c7 Fix user designation on task creation [SCI-7758] 2023-01-17 13:33:04 +01:00
Anton 3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +01:00
artoscinote 80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6 
Features/tiny mce 6
 2023-01-13 13:53:03 +01:00
ajugo d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
aignatov-bio 9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments 
Experiment table - add new task modal improvements [SCI-7722]
 2023-01-13 10:13:22 +01:00
Anton 7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
Giga Chubinidze 1dc636a49c Manage tags modal improvements [SCI-7724] 2023-01-12 16:01:39 +04:00
Martin Artnik 19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Anton 031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton 0736a02741 Fix protocol id on task page [SCI-7583] 2022-12-09 12:56:24 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +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
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +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
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Anton bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Andrej 5752401a29 Move loading label print modal on task [SCI-7326] 2022-10-13 13:16:18 +02:00
ajugo e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
G-Chubinidze 47e4244d9e
Update _manage_due_date_modal.html.erb 2022-10-07 14:38:59 +04:00
Giga Chubinidze 8b5ff3955b fixed can not set due date on task card issue [SCI-7251] 2022-10-07 14:14:29 +04:00
Andrej 884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Andrej e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Andrej e8528e6120 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270 2022-09-29 16:36:44 +02:00
Andrej eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Andrej c60ca19c62 Fix archived task button [SCI-7250] 2022-09-23 12:42:17 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
artoscinote cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
artoscinote 500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115 
added scrollbar to task paper dropdown [SCI-7115]
 2022-09-15 15:29:25 +02:00
Giga Chubinidze 7c0407af7a refactored scrollbar to fit style guides 2022-09-15 16:44:40 +04:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Martin Artnik 3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Anton 73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
artoscinote 44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) 
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
 2022-09-05 11:29:19 +02:00
Oleksii Kriuchykhin e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00
ajugo 12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343) 
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
 2022-08-10 15:39:45 +02:00
ajugo 899ab608f8
Prefill protocol name at save to protocol repository modal [SCI-7065] (#4314) 2022-08-05 10:46:54 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
Alex Kriuchykhin effd75a71a
Add ordering for tags on protocols page [SCI-6943] (#4214) 2022-07-12 09:49:24 +02:00
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Oleksii Kriuchykhin 6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
ajugo ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
artoscinote 5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
artoscinote 2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
aignatov-bio 31f4b35186
Merge branch 'develop' into ai-sci-6731-fix-edit-title-for-stock-consumption-modal 2022-04-15 14:43:51 +02:00
Anton 2481ba566a Add edit title for stock consumption modal [SCI-6731] 2022-04-15 11:47:49 +02:00
Anton 441f6b977d Fix decimals in stock consumption modal [SCI-6732] 2022-04-15 11:40:47 +02:00
artoscinote 83ac50c57d
Add repository snapshot error modal [SCI-6613] (#3993) 2022-04-12 13:29:11 +02:00
artoscinote 2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
ajugo a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005) 
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
 2022-04-11 10:47:24 +02:00
artoscinote 352ec031ce
Fix repository full view tables without stock management [SCI-6703] (#3994) 2022-04-06 15:36:26 +02:00
artoscinote 73757c4820
Added styling for failed snapshots in sidebar [SCI-6636] (#3990) 
* Added styling for failed snapshots in sidebar [SCI-6636]

* Simplify markup for failed icon [SCI-6636]
 2022-04-05 15:45:49 +02:00
artoscinote 401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) 
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
 2022-04-04 11:04:03 +02:00
Alex Kriuchykhin ae97bd64f7
Fix assigned items fullview modal [SCI-6664] (#3968) 2022-03-30 10:14:04 +02:00
aignatov-bio 116dfa9247
Fix assign view for task repository [SCI-6648] (#3954) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-23 15:33:19 +01:00
aignatov-bio e6ddefe63b
Add microtransactions to stock consumptions [SCI-6626] (#3948) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-22 13:33:12 +01:00
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
ajugo 959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830) 
* Add task inventory activity [SCI-6453]
 2022-03-09 18:43:38 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878) 
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
 2022-03-08 14:52:45 +01:00
Alex Kriuchykhin 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
aignatov-bio 8604319c1b
Add front-end validation for comments field [SCI-6464] (#3829) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-10 10:55:58 +01:00