Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: countnazgul/QS-backup-and-restore-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.3
Choose a base ref
...
head repository: countnazgul/QS-backup-and-restore-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 19 commits
  • 44 files changed
  • 2 contributors

Commits on Mar 9, 2016

  1. Update backup-and-restore.js

    if ticket is present in the url - pass it to qSocks
    countnazgul committed Mar 9, 2016
    Copy the full SHA
    30b4d0d View commit details
  2. Update backup-and-restore.qext

    version changed to 0.9.4
    countnazgul committed Mar 9, 2016
    Copy the full SHA
    8caa258 View commit details
  3. zip updated

    countnazgul committed Mar 9, 2016
    Copy the full SHA
    de44610 View commit details

Commits on Mar 11, 2016

  1. v0.9.5

    Closes #3
    countnazgul committed Mar 11, 2016
    Copy the full SHA
    5bea3b4 View commit details

Commits on Jul 25, 2016

  1. Copy the full SHA
    faf25c6 View commit details

Commits on Jul 26, 2016

  1. v0.9.6

    * add - data connectors will be updated, deleted and inserted
    * add - error count indicator + mark the error rows
    countnazgul committed Jul 26, 2016
    Copy the full SHA
    799a49d View commit details

Commits on Sep 4, 2016

  1. 0.9.7

    * fix - multiple apps can be open without reload
    * fix - possible fix to work in QS server
    countnazgul committed Sep 4, 2016
    Copy the full SHA
    5a06a95 View commit details

Commits on Sep 5, 2016

  1. 0.9.8

    * fix - auto port
    * dataconnectors are never deleted
    * checkbox option to restore dataconnectos (false by default)
    countnazgul committed Sep 5, 2016
    Copy the full SHA
    0d004be View commit details

Commits on Sep 7, 2016

  1. 0.9.9

    * fix - restore option is working
    countnazgul committed Sep 7, 2016
    Copy the full SHA
    4782fc2 View commit details
  2. change readAsBinary to readAsText

    tcabel committed Sep 7, 2016
    Copy the full SHA
    55322bd View commit details
  3. Copy the full SHA
    edecb25 View commit details
  4. Merge pull request #6 from tristancabel/development

    Development
    countnazgul authored Sep 7, 2016
    Copy the full SHA
    a94fe36 View commit details

Commits on Sep 27, 2016

  1. multiple restores

    its possible to restore multiple file in the same session (no need to
    reload th page)
    countnazgul committed Sep 27, 2016
    Copy the full SHA
    1d27261 View commit details
  2. doc on change

    chaging document from the dropdown force the connection to close and put
    the main objects in clear state
    countnazgul committed Sep 27, 2016
    Copy the full SHA
    7cb78a8 View commit details
  3. Copy the full SHA
    54aedfc View commit details
  4. Copy the full SHA
    710e348 View commit details

Commits on Nov 14, 2016

  1. Create LICENSE

    countnazgul authored Nov 14, 2016
    Copy the full SHA
    85c4e39 View commit details
  2. Merge pull request #10 from countnazgul/development

    Development
    countnazgul authored Nov 14, 2016
    Copy the full SHA
    2f62a5c View commit details

Commits on Nov 16, 2016

  1. v0.10.1

    * code ogranize
    * fix encoding in export file
    closes #9
    countnazgul committed Nov 16, 2016
    Copy the full SHA
    e231626 View commit details
Showing with 28,211 additions and 1,020 deletions.
  1. +1 −0 .gitignore
  2. +21 −0 LICENSE
  3. +8 −1 README.md
  4. +0 −469 backup-and-restore.js
  5. BIN backup-and-restore.zip
  6. +3 −2 { → build/code}/backup-and-restore.html
  7. +596 −0 build/code/backup-and-restore.js
  8. +1 −1 { → build/code}/backup-and-restore.qext
  9. +15 −0 { → build/code}/css/backup-and-restore.css
  10. +1 −1 { → build/code}/css/jquery.dataTables.min.css
  11. BIN { → build/code}/images/backup_and_restore.png
  12. BIN { → build/code}/images/loading.gif
  13. BIN { → build/code}/images/preview.png
  14. BIN { → build/code}/images/sort_asc.png
  15. BIN { → build/code}/images/sort_asc_disabled.png
  16. BIN { → build/code}/images/sort_both.png
  17. BIN { → build/code}/images/sort_desc.png
  18. BIN { → build/code}/images/sort_desc_disabled.png
  19. 0 { → build/code}/js/jquery.dataTables.js
  20. +3,557 −0 build/code/js/qsocks.bundle.js
  21. 0 js/qsocks.bundle.js → build/code/js/qsocks.bundle_old.js
  22. +550 −546 { → build/code}/js/serialize.bundle.js
  23. 0 { → build/code}/wbfolder.wbl
  24. BIN build/zip/QS-backup-and-restore-app.zip
  25. +17 −0 package.json
  26. +66 −0 src/backup-and-restore.html
  27. +596 −0 src/backup-and-restore.js
  28. +16 −0 src/backup-and-restore.qext
  29. +33 −0 src/css/backup-and-restore.css
  30. +1 −0 src/css/jquery.dataTables.min.css
  31. +35 −0 src/gulpfile.js
  32. BIN src/images/backup_and_restore.png
  33. BIN src/images/loading.gif
  34. BIN src/images/preview.png
  35. BIN src/images/sort_asc.png
  36. BIN src/images/sort_asc_disabled.png
  37. BIN src/images/sort_both.png
  38. BIN src/images/sort_desc.png
  39. BIN src/images/sort_desc_disabled.png
  40. +15,212 −0 src/js/jquery.dataTables.js
  41. +3,557 −0 src/js/qsocks.bundle.js
  42. +2,748 −0 src/js/qsocks.bundle_old.js
  43. +1,169 −0 src/js/serialize.bundle.js
  44. +8 −0 src/wbfolder.wbl
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
js/qsocks.bundle_old.js
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2016 Stefan Stoichev

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -38,12 +38,12 @@ The restore process will read the existing app objects and will compare them wit
* existing objects - the objects which are present in the current app and in the json file will be updated with the properties from the json file
* missing objects - objects that are present in the current app and not present in the json file will be deleted from the app (see exclusions below)
* new objects - objects which are present in the json file and not present in the current app will be created in the app
* data connectors - existing data connectors will be updated but if data connector need to be inserted QS Engine will assign new id even if id is provided from the json file (this is how the engine works)

Few exclusions:
Some objects are excluded from the overall process ( for now )

* embedded media - the actual media files will not be deleted ( if needed ) and they will stay in the content library. At the current moment I haven't found a method that can include these files in the backup process.
* data connectors - connectors will not be deleted or inserted. I'm facing a bug with the method in the Engine API that when updating a connector new ID is assigned instead using the ID from the json file

After the restore process is finished the app will be saved to preserve the changes. It's highly recommended to reload the app after the restore process ( my plan is to add this as an option in the following releases )

@@ -62,6 +62,13 @@ After the restore process is finished the app will be saved to preserve the chan
If the file is unable to download in IE please make sure that your "File download" option is set to "Enabled" in IE Security Settings for Internet

#### Change log
v0.9.6 (26/07/2016)
* add - data connectors will be updated, deleted and inserted
* add - error count indicator + mark the error rows

v0.9.5 (11/03/2016)
* fix - downloading the serialized app file works in Firefox

v0.9.3 (18/01/2016)
* fix - downloading the serialized app file works in IE 11+

Loading