Commit graph

23 commits

Author SHA1 Message Date
Martin Artnik
3d4ec2e28b Fix asset sync conflict handling for results [SCI-10770] 2024-06-05 14:51:00 +02:00
Martin Artnik
83477a461a Properly set warden session in asset syncs controller [SCI-10637] 2024-04-15 10:29:28 +02:00
Martin Artnik
bad4064288 Make sure current_user is set earlier in asset syncs controller [SCI-10592] 2024-04-04 15:10:40 +02:00
Martin Artnik
7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Ivan Kljun
aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
Ivan Kljun
c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun
c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
Ivan Kljun
5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Martin Artnik
3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
Martin Artnik
baa5a57822
Merge pull request #7002 from ivanscinote/SCI-10033-ik
Update last_modified_by for assets on edit [SCI-10033]
2024-02-01 10:19:08 +01:00
Ivan Kljun
24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Ivan Kljun
718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
Martin Artnik
37b9a2c077 Fix asset sync activity user [SCI-10018] 2024-01-16 10:39:11 +01:00
Giga Chubinidze
544611c3fa hound fix 2024-01-03 18:19:32 +04:00
G-Chubinidze
e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Giga Chubinidze
d0877de13c Add activity for updating a file via AssetSync [SCI-9710] 2023-11-23 04:12:38 +04:00
Ivan Kljun
dd2611bb82 Making asset sync feature switchable [SCI-9709] 2023-11-17 07:41:12 +01:00
Giga Chubinidze
85709d7b43 Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665] 2023-11-16 12:28:31 +04:00
Martin Artnik
f015c8c56e Create a copy of the synced file in case of conflict [SCI-9640] 2023-11-03 09:46:05 +01:00
Martin Artnik
22a130e502 Fix download endpoint to allow redirects to other hosts [SCI-9465] 2023-10-25 09:30:42 +02:00
Martin Artnik
d181465e12 Fix initialization and add download endpoint [SCI-9465] 2023-10-25 09:30:42 +02:00
Ivan Kljun
2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Martin Artnik
7376b363a8 Asset sync model and endpoints [SCI-9465] (#6399) 2023-10-25 09:30:42 +02:00