Ryan Huffman
efb2473fcf
Updaet createManualBackup to defer response until creation is done
2018-02-15 11:02:55 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Ryan Huffman
df809f5a3e
Cleanup logging for backup cleanup
2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada
Update entities recover backup to reset id and version
2018-02-15 11:02:14 -08:00
Brad Hefta-Gaub
e367af6cd8
Merge pull request #12385 from birarda/bug/cve-update-marked
...
updates to electron-packager and node-notifier for CVEs
2018-02-15 10:49:25 -08:00
Alexander Ivash
beb595266d
fix 4x 'fromQml' slots execution
...
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
2018-02-15 21:45:35 +03:00
Stephen Birarda
c56c249a4b
Merge pull request #12406 from huffman/feat/ds-backup-apis
...
Backup APIs
2018-02-15 11:34:59 -07:00
Ryan Huffman
1aba89b908
Fix style of init list
2018-02-15 10:22:35 -08:00
Ryan Huffman
145a8b385b
Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http response
2018-02-15 10:22:35 -08:00
Ryan Huffman
b832e118cc
Add 'override' to BackupHandler methods
2018-02-15 10:22:35 -08:00
Ryan Huffman
2cfa91be06
Add memory include to HTTPConnection
2018-02-15 10:22:35 -08:00
Ryan Huffman
f2b6823748
Fix initializer in EntitiesBackupHandler
2018-02-15 10:22:35 -08:00
Ryan Huffman
b6240e8622
Move backup recover API to POST
2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec
CR
2018-02-15 10:22:35 -08:00
Ryan Huffman
80b03b9046
Make backup directory in content manager const
2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0
Update DS to use promises for backup APIs
2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f
Add backup DS APIs
...
Add backup apis
2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80
Add BackupHandler for entity file backups
2018-02-15 10:22:35 -08:00
Atlante45
69298246c4
CR
2018-02-15 10:09:21 -08:00
Atlante45
d4b4c55673
Remove unecessary debug
2018-02-15 10:09:21 -08:00
Atlante45
c41ad1a699
Add consolidate
2018-02-15 10:09:21 -08:00
Atlante45
272f95efa2
Specify wich packet can ignore verification at DS level
2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c
More Asset Backup work
2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9
Integrate new backup systems
2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd
Fix replacement octree data not working
2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50
Fix entity data not being gzipped when adding id+version
2018-02-15 10:09:20 -08:00
Ryan Huffman
ff5be2d690
Fix entity data ID sometimes being reset
2018-02-15 10:09:20 -08:00
Ryan Huffman
fc8e7a0841
Add target_zlib to DS CMakeLists.txt
2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings
...
initial separation of DS into domain settings and content settings
2018-02-15 10:04:36 -08:00
John Conklin II
29b50ed711
Merge pull request #12376 from dback2/avatarInRange
...
get Avatars In Range
2018-02-15 09:49:17 -08:00
Sam Gondelman
09645c8b48
Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split
...
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
2018-02-15 09:34:59 -08:00
Sam Gateau
982e0b3e6c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-02-14 20:37:34 -08:00
samcake
246ac25d0a
Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight
2018-02-14 17:36:46 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
MiladNazeri
258133f1db
Merge pull request #12335 from ctrlaltdavid/21736
...
Update Overlays circle3d JSDoc per recent code changes
2018-02-14 17:17:04 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8
Lots of changes
2018-02-14 16:44:02 -08:00
David Back
e4263100b4
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange
2018-02-14 16:40:11 -08:00
Stephen Birarda
4d4b42848b
add alert for moved content settings
2018-02-14 16:31:28 -08:00
Seth Alves
93d8a6f00d
Merge pull request #12402 from druiz17/fix-tablet-create-rotation
...
Fix tablet rotation when going into and out of create mode
2018-02-14 16:10:10 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
Dante Ruiz
8a95920c31
Merge branch 'master' of github.com:highfidelity/hifi
2018-02-14 15:15:46 -08:00
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping
...
add control button mapping for controller API
2018-02-14 15:02:28 -08:00
LaShonda Hopper
d466c079a4
Simple fix for 801 Uncaught TypeError (details below).
...
entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined
This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
2018-02-14 17:00:52 -05:00
Dante Ruiz
e14f46101b
fix tablet rotation when switching into and out of create mode
2018-02-14 13:49:43 -08:00
John Conklin II
9ba29028e3
Merge pull request #12398 from jherico/fix/spectator_cam
...
Fix spectator camera crash
2018-02-14 13:15:42 -08:00
Stephen Birarda
37b8fa2c0c
put back default values in settings response
2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a
flag settings in description as being excluded from backups
2018-02-14 12:09:57 -08:00
