Commit graph

4714 commits

Author SHA1 Message Date
aignatov-bio
8d5a666b57
Merge pull request #6646 from scinote-eln/features/datetime-picker
Features/datetime picker
2023-11-15 14:50:55 +01:00
Anton
8d2187815b Fix turbolinks cache settings [SCI-9700][SCI-9701] 2023-11-15 11:02:50 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Martin Artnik
9db6fb2ef5
Revert "Fix result settings for reports [SCI-9693]" 2023-11-15 09:23:38 +01:00
Anton
6abc643aec Merge branch 'develop' into features/datetime-picker 2023-11-14 18:08:03 +01:00
Martin Artnik
3ff7e69109 Fix result settings for reports [SCI-9693] 2023-11-14 16:57:57 +01:00
Soufiane
12006bc286
Add relationships section to the items sidebar [SCI-9668] (#6623) 2023-11-14 14:04:46 +01:00
Anton
b7f876aa37 Date time picker improvments [SCI-9678][SCI-9688] 2023-11-14 11:26:27 +01:00
Oleksii Kriuchykhin
29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin
0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton
9abdc8698a Refactor label templates backend [SCI-9676] 2023-11-09 17:12:18 +01:00
Anton
3211fa7cce Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2023-11-09 11:36:44 +01:00
Anton
dcf206368e Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker 2023-11-08 14:57:29 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Anton
b09bd8a3c5 Add style styling to datetime pixker [SCI-9627] 2023-11-08 13:55:08 +01:00
Giga Chubinidze
39ce9c1781 Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625] 2023-11-08 12:22:34 +04:00
Anton
a6b22b958c Fix datetime picker css 2023-11-07 16:10:17 +01:00
Anton
2ab479950a Replace datetime picker in activties and create task 2023-11-07 15:15:37 +01:00
Anton
d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
ivanscinote
e6e7805c29
Apply layout for Grover PDF library [SCI-9566] (#6547) 2023-11-03 13:19:46 +01:00
Anton
9cb9680c55 Replace datetime picker in canvas [SCI-9630] 2023-11-02 13:36:47 +01:00
Anton
04fc356175 Replace datepicker in task table [SCI-9631] 2023-11-02 13:11:06 +01:00
Anton
70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
wandji
a16de72611
Mange stock modal improvements [SCI-9591] (#6545)
* Mange stock modlla improvements [SCI-9591]

* Fix manage stock modal close button [SCI-9591]

* Update manage stock url after update stock value [SCI-9591]
2023-10-30 09:47:10 +01:00
sboursen-scinote
b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
Oleksii Kriuchykhin
ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
wandji
c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474)
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
2023-10-27 10:31:38 +02:00
Oleksii Kriuchykhin
6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +02:00
Anton
226d189789 Add new datetime pciker [SCI-9127] 2023-10-26 15:01:26 +02:00
ajugo
7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize
Features/navigator resize
2023-10-25 14:05:14 +02:00
Soufiane
e8cb940665
Fix 500 error when clicking on another item [SCI-9595] (#6527) 2023-10-25 13:47:06 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Soufiane
809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421)
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
2023-10-24 15:49:37 +02:00
Martin Artnik
2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik
1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik
ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Martin Artnik
d74cd77e41
Merge pull request #6516 from scinote-eln/develop
Merge develop
2023-10-23 11:14:50 +02:00
Martin Vražič
0f1ec8eada added e2e tag on create button - inventory dialog 2023-10-23 11:11:06 +02:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
mvrazic
77b3e7a44f
Merge branch 'e2e' into mv_SCI_9581 2023-10-20 15:06:30 +02:00
Martin Vražič
c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Oleksii Kriuchykhin
ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Martin Artnik
4e76fbe087
Merge pull request #6436 from okriuchykhin/ok_SCI_9372
Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372]
2023-10-19 11:44:02 +02:00
Soufiane
e0a1a62bd5
Fix zebra print progress modal close button and padding [SCI-9536] (#6487) 2023-10-19 10:59:56 +02:00
Martin Artnik
fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
ajugo
965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00