Martin Artnik f015c8c56e Create a copy of the synced file in case of conflict [SCI-9640]		2023-11-03 09:46:05 +01:00
..
assets	Merge branch 'develop' into features/asset-sync	2023-11-02 11:28:17 +01:00
components	Remove bootstrap form	2023-07-03 12:59:13 +02:00
controllers	Create a copy of the synced file in case of conflict [SCI-9640]	2023-11-03 09:46:05 +01:00
datatables	Show team members counter in team table [SCI-5589] (#6073)	2023-08-24 15:15:06 +02:00
helpers	Fix user smart annotations [SCI-9574]	2023-10-23 11:50:24 +02:00
javascript	Merge branch 'develop' into features/asset-sync	2023-11-02 11:28:17 +01:00
jobs	Fix file previews in project exports [SCI-9619] (#6548)	2023-10-30 17:28:53 +01:00
mailers	Merge branch 'hotfix/1.28.0.1' into develop	2023-08-24 12:14:30 +02:00
middlewares
models	Create a copy of the synced file in case of conflict [SCI-9640]	2023-11-03 09:46:05 +01:00
permissions	Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503]	2023-10-10 17:54:45 +02:00
serializers	Fix initialization and add download endpoint [SCI-9465]	2023-10-25 09:30:42 +02:00
services	Revert "Fixed Item card smart annotation link [SCI-9583]"	2023-10-24 13:14:23 +02:00
utilities	Fix issue with text name when importting protocol eln file [SCI-9490]	2023-10-06 14:19:42 +01:00
views	Replace Scinote Icons [SCI-9557]	2023-10-28 12:51:11 +02:00