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

11668 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 41a7609c3e
Merge pull request #4608 from G-Chubinidze/gc_SCI_7162 
empty repository view archived button logic fix [SCI-7162]
 2022-11-11 11:26:47 +01:00
Anton 0a87513458 Add edit modal to experiment table [SCI-7383] 2022-11-11 11:24:23 +01:00
Giga Chubinidze e9d9f613fb updated old code version in empty_index 2022-11-11 14:22:26 +04:00
G-Chubinidze 0dcc3e3c7f
Merge pull request #4610 from G-Chubinidze/gc_SCI_7203 
archived tasks updates [SCI-7203]
 2022-11-11 14:02:56 +04: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 c5466771ff
Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue 
Fix merge issue [SCI-7471]
 2022-11-10 11:47:54 +01:00
Anton c0141137eb Fix merge issue [SCI-7471] 2022-11-10 11:46:14 +01: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 de7f2e4294
Merge pull request #4607 from aignatov-bio/ai-sci-7215-add-filters-to-experiment-view 
Add basic filters for experiment table [SCI-7215]
 2022-11-10 11:13:34 +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
Anton 63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +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
aignatov-bio f39f799e7e
Merge pull request #4605 from aignatov-bio/ai-sci-7386-add-view-switcher 
Add view dropdown to experiment screen
 2022-11-09 10:54:50 +01: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
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01: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
aignatov-bio 46ebeeb558
Merge pull request #4602 from aignatov-bio/ai-sci-7379-add-toolbar-layout 
Add toolbar to experiment table [SCI-7379]
 2022-11-08 13:18:56 +01: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
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +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
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 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
aignatov-bio def8b6b0bc
Merge pull request #4590 from aignatov-bio/ai-sci-7368-add-tag-manager-to-experiment-table 
Add tags manager to experiment table view [SCI-7368]
 2022-11-04 11:36:57 +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
Anton bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +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