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

11541 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a72795ec98
Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step 
Fix options dropdown position on step [SCI-7387]
 2022-11-10 11:12:28 +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
G-Chubinidze f65c207e75
Merge pull request #4603 from G-Chubinidze/gc_SCI_7205 
update display of the current tasks with IDs [SCI-7205]
 2022-11-09 15:49:57 +04:00
G-Chubinidze 8e63bfb7c2
Update my_module.rb 2022-11-09 14:46:36 +04:00
G-Chubinidze 996cb68fdd
Update my_module.rb 2022-11-09 14:45:18 +04:00
artoscinote e4673f67ba
Merge pull request #4606 from scinote-eln/develop 
November 2022 cleanup release
 2022-11-09 10:49:27 +01:00
artoscinote 9d41ff4f92
Bump version to 1.26.2 2022-11-09 10:48:18 +01:00
G-Chubinidze 62b48ee59a
updated my_module rb, added searchable id attribute 2022-11-09 13:36:55 +04:00
Miha Mencin c8bd5513cf
Merge pull request #4604 from okriuchykhin/ok_SCI_7434 
Fix team export/import [SCI-7434]
 2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin be7ef8fdc0 Fix team export/import [SCI-7434] 2022-11-08 14:50:16 +01:00
G-Chubinidze 82d36ccc25
Update 20221108104529_add_my_module_code_index.rb 2022-11-08 17:10:22 +04:00
Giga Chubinidze 18fe2cd207 update display of the current tasks with IDs [SCI-7205] 2022-11-08 16:06:48 +04:00
Alex Kriuchykhin e13cfa2c74
Merge pull request #4598 from okriuchykhin/ok_SCI_7435 
Fix Fluics templates sync scheduler [SCI-7435]
 2022-11-08 13:03:41 +01:00
Alex Kriuchykhin fc56cc4197
Merge pull request #4599 from okriuchykhin/ok_SCI_7402 
Fix global activities user selection dropdown [SCI-7402]
 2022-11-08 11:29:10 +01:00
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
Andrej aa99c2d7c8 Enable checboxes for experiment table/card view for all roles [SCI-7376] 2022-11-07 15:51:39 +01:00
Oleksii Kriuchykhin c361dec0b6 Fix Fluics templates sync scheduler [SCI-7435] 2022-11-07 11:55:01 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
aignatov-bio 6e2224990b
Merge pull request #4594 from aignatov-bio/ai-sci-7426-fix-duplicate-activity 
Fix duplicate activities wording [SCI-7426]
 2022-11-04 11:36:45 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
aignatov-bio c32bf690ba
Merge pull request #4593 from aignatov-bio/ai-sci-7428-hide-active-reminders-checkbox 
Hide active reminders, if stock management disabled [SCI-7428]
 2022-11-04 11:08:56 +01:00
Anton 34ffcbd8e8 Fix duplicate activities wording [SCI-7426] 2022-11-04 11:07:59 +01:00
Anton 5b08ee1cc8 Hide active reminders, if stock management disabled [SCI-7428] 2022-11-03 15:48:32 +01:00
Giga Chubinidze a8b1dbfe76 archived experiments cards updates [SCI-7202] 2022-11-02 11:18:18 +04: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
ajugo 22fad95efd
Rename protocol repository to templates [SCI-7418] (#4587) 2022-10-28 11:47:54 +02:00
aignatov-bio aa1de29e60
Merge pull request #4585 from aignatov-bio/ai-sci-7410-fix-label-preview-height-limit 
Fix label preview height in print modal [SCI-7410]
 2022-10-28 10:06:44 +02: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
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
artoscinote 7fcdab7222
Merge pull request #4581 from scinote-eln/develop 
October 2022 release
 2022-10-26 13:22:59 +02:00
artoscinote 5d40e0cafa
Bump version to 1.26.1 2022-10-26 13:19:00 +02:00
artoscinote 808efec410
Merge pull request #4580 from okriuchykhin/ok_SCI_7360_v2 
Fix update of shared inventories user assignments [SCI-7360]
 2022-10-26 08:49:13 +02:00
Oleksii Kriuchykhin c16d0cb7a6 Fix update of shared inventories user assignments [SCI-7360] 2022-10-25 23:26:20 +02:00
Alex Kriuchykhin d0f604f21e
Merge pull request #4576 from okriuchykhin/ok_SCI_7375 
Fix displaying of user access for E/T [SCI-7375]
 2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin 232f58dd30 Fix displaying of user access for E/T [SCI-7375] 2022-10-25 16:07:55 +02:00
artoscinote 938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377 
Add ENV setting for max step text length [SCI-7377]
 2022-10-25 16:04:36 +02:00
artoscinote 78b3975759
Merge pull request #4575 from artoscinote/ma_SCI_7396 
Fix label preview double refresh and unit issues [SCI-7396]
 2022-10-25 15:55:57 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Martin Artnik ebe0ffa286 Add ENV setting for max step text length [SCI-7377] 2022-10-25 13:08:33 +02:00
ajugo ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
artoscinote eec5fd9ab3
Merge pull request #4570 from artoscinote/ma_SCI_7357 
Only render last label in ZPL [SCI-7357]
 2022-10-25 11:53:52 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00