Merge branch 'master' into improve_coverage_test_server
Complete curl commands for user authentication and delete
Merge branch 'pending_user_integration' of https://github.com/Roxana28/share-system-team2 into pending_user_integration
Added test for SYNC: New file on server, server_timestamp > client_timestamp
but file_timestamp < client_timestamp, local directory MODIFIED
Added test for SYNC: server_timestamp == client_timestamp,
local_directory MODIFIED
Added test for SYNC copy on client
Issue46 fix
Test SYNC: same file in client and server is moved on server
and local dir modified
Test SYNC: same file in server and client is copied on server and local dir is modified
hash file function need abs path
Needed otherwise the modified and uploaded files will be empty
Merge remote-tracking branch 'origin' into fix_sync
Added user authentication and delete curl command
Test SYNC: server_timestamp > client_timestamp directory MODIFIED
test same file MODIFIED in server and client, expected filepath.conflicted
Test SYNC: server_timestamp == local_timestamp local_dir NOT modified
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team2
Modified USER_ACTIVATION_TIMEOUT to USER_ACTIVATION_TIMEOUT_SECS for issue46 fix
Merge branch 'issue46'
Test DAEMON: test for build_client_snapshot with regex
Typo fix