-
Notifications
You must be signed in to change notification settings - Fork 539
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.
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
Sandstorm #561
Open
albertusgeyser
wants to merge
93
commits into
master
Choose a base branch
from
sandstorm
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sandstorm #561
Conversation
This file contains 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
We only need one document per EtherCalc, so let's get rid of the random number generator.
This reverts commit fcc695f.
Update with 20140730 from audreyt
Update with 20140730 from audreyt
Update with 20140801.1 from audreyt
Update with 20140801.1 from audreyt
Update with 20140804.1 from audreyt
Update with 20140804.1 from audreyt
Conflicts: db.js
Conflicts: db.js manifest.appcache src/db.ls
We now default to /=sheet which opens up /sheet1 with the title "Sheet1" for migration purposes. Thanks @paulproteus for the suggestion.
Conflicts: src/main.ls
Conflicts: sandstorm-pkgdef.capnp
Conflicts: package.json src/main.ls
Conflicts: multi/main.ls package.json static/multi.js
This looks like an accidental attempt to merge the Sandstorm branch into Master? |
Update Sandstorm build (WIP)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Open File icon to open already created spreadsheets.