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

1932 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Soufiane a37d4ead47
Improve wording in Protocol templates and Inventory [SCI-9685] (#6789) 2023-12-11 13:58:04 +01:00
Martin Artnik 5ce927ce37
Merge pull request #6763 from ivanscinote/SCI-9775-ik 
Fix wording for my_module_due_date_reminder [SCI-9775]
 2023-12-05 13:23:17 +01:00
Ivan Kljun 2ddcbe9824 Fix wording for my_module_due_date_reminder [SCI-9775] 2023-12-05 13:19:35 +01:00
Ivan Kljun 472a095a6a Remove 'There is a change on assigned task' notification category [SCI-9767] 2023-12-05 10:55:54 +01:00
Ivan Kljun dde7c512a9 Fix translations for notif (Due date, Date/Date&Time, Low stock) [SCI-9775] 2023-12-04 14:13:16 +01:00
Giga Chubinidze 1415044054 Wording of subgroups of notifications in UI [SCI-9798] 2023-12-01 12:35:16 +04:00
Martin Artnik f3ee9a854f Merge branch 'develop' into features/notification-revamp 2023-11-28 10:26:51 +01:00
Martin Artnik 54fe02d289
Merge pull request #6718 from G-Chubinidze/gc_SCI_9390 
Smaller changes in activity grouping [SCI-9390]
 2023-11-27 14:11:04 +01:00
Martin Artnik 5aff062a76 Copy changes for report wizard [SCI-9693] 2023-11-27 12:56:33 +01:00
Giga Chubinidze cc48087beb Smaller changes in activity grouping [SCI-9390] 2023-11-27 15:54:14 +04:00
Oleksii Kriuchykhin 9adad3139c Merge branch 'features/inventory-item-card-edit' into develop 2023-11-23 11:39:08 +01:00
Anton 0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
Gregor Lasnibat 6db47192fd
Merge pull request #6686 from lasniscinote/gl_SCI_9683 
(fix) Item card behavior in cases of error states [SCI-9683]
 2023-11-22 16:16:10 +01:00
Martin Artnik 18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Gregor Lasnibat 1ff3e43171 (fix) Item card behavior in cases of error states [SCI-9683] 2023-11-22 14:15:24 +01:00
Martin Artnik 720eceb59f
Merge pull request #6557 from artoscinote/ma_SCI_9608 
Implement general notification mailer [SCI-9608]
 2023-11-21 14:49:06 +01:00
Martin Artnik e0cd9cf9fd Implement general notification mailer [SCI-9608] 2023-11-21 14:21:55 +01:00
Anton 25048ddd4e Fix filters and missing barcode icon [SCI-9748] 2023-11-21 13:51:16 +01:00
wandji 7a916b7d11
Add activities to inventories [SCI-5578] (#6588) 
* Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578]

* Improve check for creating inventory item asset activity [5578]

* Improve query for inventory items in consumption export [SCI-5578]
 2023-11-20 13:37:57 +01:00
Alex Kriuchykhin 43b8f97126
Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] (#6565) 2023-11-20 13:24:31 +01:00
Anton 13eca7e035 Fix time format and picker position [SCI-9706] 2023-11-15 16:18:00 +01:00
wandji 94a2f2e6fd
Update placeholder text for date time field item card [SCI-9615] (#6627) 2023-11-13 17:07:51 +01:00
Gregor Lasnibat 68dc671f06 Fixed Translation error for Error message on item card [SCI-9601] 2023-11-03 11:17:55 +01:00
wandji 4fd3933bdb
Fix wrong placeholders for item card fields in edit mode [SCI-9615] (#6553) 
* Fix wrong placeholders for item card fields in edit mode [SCI-9615]

* Refactor date time range className [SCI-9615]
 2023-10-30 17:30:23 +01: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
Martin Artnik 5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Anton fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
ajugo 7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
Anton 0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Anton da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
ajugo a98d86e9b8
Add activities for cell editing on the new item card [SCI-9423] (#6465) 2023-10-24 16:22:10 +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
Anton 3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
Oleksii Kriuchykhin ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Martin Artnik a952f3ba70 Implement low stock notification [SCI-9522] 2023-10-19 11:33:40 +02:00
sboursen-scinote 885b66504b FIX no custom columns placeholder [SCI-9529] 2023-10-19 10:53:18 +02:00
Martin Artnik fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
Giga Chubinidze f268a0cab0 Attachments renamed to Files [SCI-9505] 2023-10-17 11:33:29 +04:00
wandji c8359cdf3a
Add controller action to update inventory item cell data [SCI-9478] (#6379) 2023-10-16 17:43:53 +02:00
Gregor Lasnibat 3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +02:00
Gregor Lasnibat 57bfe0036b
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444) 2023-10-16 10:12:21 +02:00
Anton 225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Martin Artnik 1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
Gregor Lasnibat b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +02:00
ajugo 04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
wandji 45cfe77ef7
Add qr code and print label to item card [SCI-9471 (#6364) 
* Add qr acode and print label to item card [SCI-9471

* Remove jQuery handler for setting barcode image src [SCI-9471]
 2023-10-12 15:10:54 +02:00
Anton c2b85d8981 Add new general notifications structure [SCI-9511] 2023-10-12 11:51:01 +02:00