Created
September 6, 2012 21:08
-
-
Save egoens/3660383 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| (courseload)erik%git status ~/Sites/chrome-app 5:04PM | |
| # On branch uxing | |
| # Changes not staged for commit: | |
| # (use "git add <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # modified: dev/media/css/main.css | |
| # modified: dev/media/img/checkin-example.jpg | |
| # modified: dev/media/img/checkout-example.jpg | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # dev/templates/spellcheck.txt | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| (courseload)erik%git stash ~/Sites/chrome-app 5:04PM | |
| Saved working directory and index state WIP on uxing: bd4d15f fixed typo | |
| HEAD is now at bd4d15f fixed typo | |
| (courseload)erik%git checkout master ~/Sites/chrome-app 5:05PM | |
| Switched to branch 'master' | |
| Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded. | |
| (courseload)erik%git merge --ff-only origin/master ~/Sites/chrome-app 5:05PM | |
| Updating 0bae7bb..82953b0 | |
| Fast-forward | |
| .gitignore | 2 +- | |
| 1280-800.png | Bin 0 -> 750600 bytes | |
| 440-280.png | Bin 0 -> 35708 bytes | |
| README.rst | 9 +- | |
| dev/media/css/global.css | 4 +- | |
| dev/media/css/main.css | 43 ++- | |
| dev/media/img/checkin-example.jpg | Bin 0 -> 14435 bytes | |
| dev/media/img/icon-no-connection.png | Bin 0 -> 8741 bytes | |
| dev/media/img/icon-no-materials.png | Bin 0 -> 7801 bytes | |
| dev/media/js/lib/coffee-script-1.3.3.min.js | 8 + | |
| dev/media/js/main.coffee | 91 +++-- | |
| dev/media/js/main.js | 93 +++-- | |
| dev/media/tests/qunit/qunit.css | 231 ++++++++++++ | |
| dev/media/tests/qunit/qunit.js | 1932 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| dev/media/tests/test_urlIsValid.coffee | 16 + | |
| dev/picker.py | 4 + | |
| dev/templates/base.html | 39 +- | |
| dev/templates/cl.appcache | 22 +- | |
| dev/templates/demo.html | 53 +++ | |
| dev/templates/tests.html | 24 ++ | |
| zipapp.sh | 2 +- | |
| 21 files changed, 2474 insertions(+), 99 deletions(-) | |
| create mode 100644 1280-800.png | |
| create mode 100644 440-280.png | |
| create mode 100644 dev/media/img/checkin-example.jpg | |
| create mode 100644 dev/media/img/icon-no-connection.png | |
| create mode 100644 dev/media/img/icon-no-materials.png | |
| create mode 100755 dev/media/js/lib/coffee-script-1.3.3.min.js | |
| create mode 100644 dev/media/tests/qunit/qunit.css | |
| create mode 100644 dev/media/tests/qunit/qunit.js | |
| create mode 100644 dev/media/tests/test_urlIsValid.coffee | |
| create mode 100644 dev/templates/demo.html | |
| create mode 100644 dev/templates/tests.html | |
| (courseload)erik%git checkout uxing ~/Sites/chrome-app 5:05PM | |
| Switched to branch 'uxing' | |
| (courseload)erik%git rebase master ~/Sites/chrome-app 5:05PM | |
| First, rewinding head to replay your work on top of it... | |
| Applying: fixed typo | |
| (courseload)erik%git stash pop ~/Sites/chrome-app 5:05PM | |
| # On branch uxing | |
| # Changes not staged for commit: | |
| # (use "git add <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # modified: dev/media/css/main.css | |
| # modified: dev/media/img/checkin-example.jpg | |
| # modified: dev/media/img/checkout-example.jpg | |
| # | |
| # Untracked files: | |
| # (use "git add <file>..." to include in what will be committed) | |
| # | |
| # dev/templates/spellcheck.txt | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| Dropped refs/stash@{0} (42a12370c431ed969aad9e33a1e94ff41a882f31) | |
| (courseload)erik%git commit -a -m $'adjusted imagery to reflect latest app changes' ~/Sites/chrome-app 5:05PM | |
| [uxing ca3cec6] adjusted imagery to reflect latest app changes | |
| 3 files changed, 5 insertions(+), 1 deletion(-) | |
| rewrite dev/media/img/checkin-example.jpg (93%) | |
| rewrite dev/media/img/checkout-example.jpg (93%) | |
| (courseload)erik%git push origin uxing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment