Skip to content
Snippets Groups Projects

Documentation: get rid of jailbreak, document alternatives [MANUAL MERGE]

Closed q3k requested to merge q3k/firmware:q3k/delet-jailbreak into master
All threads resolved!

We update the documentaiton and CI tooling to remove references to the jailbreak firmware.

We also slightly update the docs to mention USB mode in a separate page, for unification purposes.

Edited by dx

Merge request reports

Merge request pipeline #3903 passed

Merge request pipeline passed for 089cd334

Approval is optional

Closed by dxdx 5 years ago (Oct 4, 2019 6:19pm UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • dx
  • dx
  • dx
  • dx
  • rahix changed milestone to %v1.11

    changed milestone to %v1.11

  • dx mentioned in merge request !303 (closed)

    mentioned in merge request !303 (closed)

  • q3k added 1 commit

    added 1 commit

    • 71654d72 - Documentation: get rid of jailbreak, document alternatives

    Compare with previous version

  • Author Guest

    @dx PTAL

  • q3k added 1 commit

    added 1 commit

    • 8bb6b7b5 - Documentation: get rid of jailbreak, document alternatives

    Compare with previous version

  • q3k added 1 commit

    added 1 commit

    • b003ddcd - Documentation: get rid of jailbreak, document alternatives

    Compare with previous version

  • Looks good to me! Thanks for keeping our codebase clean.

    However, I'm only a bot - so a human will still have to approve this request.

  • q3k added 1 commit

    added 1 commit

    • f846cafa - Documentation: get rid of jailbreak, document alternatives

    Compare with previous version

  • q3k added 1 commit

    added 1 commit

    • 089cd334 - Documentation: get rid of jailbreak, document alternatives

    Compare with previous version

  • Maintainer

    LGTM

  • Maintainer

    Sooo the part of this documentation that addresses reset button press timings changed in master with the deep sleep merge.

    As of https://git.card10.badge.events.ccc.de/card10/firmware/commit/d98cabbf54ac579c1dd85a1cc34bf5af2baee3f9 you can hold the top left button for 1s to show the sleep/reset UI, which is pretty self explanatory, but you can:

    • Release top left to sleep
    • Press top right button to reset
    • Keep holding for 7s to power off
  • rahix assigned to @dx

    assigned to @dx

  • rahix changed milestone to %v1.12

    changed milestone to %v1.12

  • dx resolved all threads

    resolved all threads

  • dx mentioned in commit 8a2de29e

    mentioned in commit 8a2de29e

  • dx changed title from Documentation: get rid of jailbreak, document alternatives to Documentation: get rid of jailbreak, document alternatives [MANUAL MERGE]

    changed title from Documentation: get rid of jailbreak, document alternatives to Documentation: get rid of jailbreak, document alternatives [MANUAL MERGE]

  • dx changed the description

    changed the description

  • Maintainer

    Updated that section and merged manually, sorry for the hassle and thanks!

  • dx closed

    closed

  • Please register or sign in to reply
    Loading