Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Submitting this for revision/consideration. Gonna try some CriticMarkup. #9

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open

Submitting this for revision/consideration. Gonna try some CriticMarkup. #9

wants to merge 39 commits into from

Commits on Sep 26, 2017

  1. Submitting this for revision/consideration. Gonna try some CriticMarkup.

    @RMBLRX
    RMBLRX committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    18b50bb View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2017

  1. trying something, as footnotes seem to be broken

    @RMBLRX
    RMBLRX committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    6735408 View commit details
    Browse the repository at this point in the history

  2. reverting back, as the behavior seems to be exactly the same

    @RMBLRX
    RMBLRX committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    631de48 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. amending Lanyon template license 

    Trying to fix our licensing so that we don't have two separate licenses on the site but both licenses together in the same file.  I'd much rather try and separate the template out from the content, and while I've got some ideas rolling around, any attempt at implementation is a long way off and not even particularly likely while still using this template.
    @RMBLRX
    RMBLRX committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    479a1de View commit details
    Browse the repository at this point in the history

  2. merged the two licenses into one 

    getting rid of the leftovers
    @RMBLRX
    RMBLRX committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    70ceba5 View commit details
    Browse the repository at this point in the history

  3. getting prepped for rebase

    @RMBLRX
    RMBLRX committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    1177153 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2017

  1. wrapping up a number of mostly cosmetic, partly functional changes; t… 

    …his may be ready to merge, already
    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    e9e9733 View commit details
    Browse the repository at this point in the history

  2. getting this up-to-date for an attempt at merging from wikiTransclusion

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    c31e172 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'project/wikiTransclusion'

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    a5cb2c2 View commit details
    Browse the repository at this point in the history

  4. trimming the extra bits

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    135e4f5 View commit details
    Browse the repository at this point in the history

  5. Rename LICENSE.md to LICENSE

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    bc05dea View commit details
    Browse the repository at this point in the history

  6. Update LICENSE

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    e65ef3b View commit details
    Browse the repository at this point in the history

  7. getting some minor details back on track

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    8c2a174 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:rapidExpedition/theExpeditionarium

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    4b5c56f View commit details
    Browse the repository at this point in the history

  9. just about there

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    b40aa8f View commit details
    Browse the repository at this point in the history

  10. some final bits of cleanup before calling this the current release

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    d90e7b6 View commit details
    Browse the repository at this point in the history

  11. this just doesn't work right unless the license is the exact text 

    I'll have to add the template license to the end of the readme.
    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    1499223 View commit details
    Browse the repository at this point in the history

  12. Appending the template license

    @RMBLRX
    RMBLRX committed Dec 27, 2017
    Configuration menu
    Copy the full SHA
    8bfa3cc View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2017

  1. Update README.md

    @RMBLRX
    RMBLRX committed Dec 28, 2017
    Configuration menu
    Copy the full SHA
    0ed8044 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2018

  1. minor update

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    ad75519 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:rapidExpedition/theExpeditionarium

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    3db55bc View commit details
    Browse the repository at this point in the history

  3. Submitting this for revision/consideration. Gonna try some CriticMarkup.

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    cfb1a75 View commit details
    Browse the repository at this point in the history

  4. new revisions to be reviewed

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    054ea70 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'the-road-to-decentralization-pt-1' of github.com:rapidE… 

    …xpedition/theExpeditionarium into the-road-to-decentralization-pt-1
    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    dc9e80e View commit details
    Browse the repository at this point in the history

  6. correction: new revisions for review, here

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    cdb789b View commit details
    Browse the repository at this point in the history

  7. TODO comments updated by @imdoneio [ci skip] [imdone skip]

    @imdone-test
    imdone-test committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    5830de7 View commit details
    Browse the repository at this point in the history

  8. Automatically merged TODO updates by imdone.io [ci skip] [imdone skip] 

    TODO updates by @imdone
    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    38a4638 View commit details
    Browse the repository at this point in the history

  9. ugh, correction: new revisions for review, *here*

    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    2bec28a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'the-road-to-decentralization-pt-1' of github.com:rapidE… 

    …xpedition/theExpeditionarium into the-road-to-decentralization-pt-1
    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    740bb13 View commit details
    Browse the repository at this point in the history

  11. TODO comments updated by @imdoneio [ci skip] [imdone skip]

    @imdone-test
    imdone-test committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    bcc494c View commit details
    Browse the repository at this point in the history

  12. Automatically merged TODO updates by imdone.io [ci skip] [imdone skip] 

    TODO updates by @imdone
    @RMBLRX
    RMBLRX committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    16ce6c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. just correcting the directory

    @RMBLRX
    RMBLRX committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    ec578a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'the-road-to-decentralization-pt-1' of github.com:rapidE… 

    …xpedition/theExpeditionarium into the-road-to-decentralization-pt-1
    @RMBLRX
    RMBLRX committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    550a0b9 View commit details
    Browse the repository at this point in the history

  3. TODO comments updated by @imdoneio [ci skip] [imdone skip]

    @imdone-test
    imdone-test committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    7885eea View commit details
    Browse the repository at this point in the history

  4. Automatically merged TODO updates by imdone.io [ci skip] [imdone skip] 

    TODO updates by @imdone
    @RMBLRX
    RMBLRX committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    1dbea72 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. still want to give this another look, but I think these changes shoul… 

    …d do, apart from needing fix the order on the footnotes (also thinking about switching to Kramdown's footnote syntax, though I think this could be handled broadly across all of the site's content)
    @RMBLRX
    RMBLRX committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    1283fcd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'the-road-to-decentralization-pt-1' of github.com:rapidE… 

    …xpedition/theExpeditionarium into the-road-to-decentralization-pt-1
    @RMBLRX
    RMBLRX committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    873e93c View commit details
    Browse the repository at this point in the history

  3. TODO comments updated by @imdoneio [ci skip] [imdone skip]

    @imdone-test
    imdone-test committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    8477895 View commit details
    Browse the repository at this point in the history

  4. Automatically merged TODO updates by imdone.io [ci skip] [imdone skip] 

    TODO updates by @imdone
    @RMBLRX
    RMBLRX committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    4aed4c6 View commit details
    Browse the repository at this point in the history