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

Sandstorm #561

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

Sandstorm #561

wants to merge 93 commits into from

Commits on Jul 29, 2014

  1. Move data storage to /var

    @ocdtrekkie
    ocdtrekkie committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    996445f View commit details
    Browse the repository at this point in the history

  2. Make document ID predictable. 

    We only need one document per EtherCalc, so let's get rid of the random number generator.
    @ocdtrekkie
    ocdtrekkie committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    1302911 View commit details
    Browse the repository at this point in the history

  3. Update _start

    @ocdtrekkie
    ocdtrekkie committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    fcc695f View commit details
    Browse the repository at this point in the history

  4. Revert "Update _start" 

    This reverts commit fcc695f.
    @ocdtrekkie
    ocdtrekkie committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    2e8f57a View commit details
    Browse the repository at this point in the history

  5. Load directly to document

    @ocdtrekkie
    ocdtrekkie committed Jul 29, 2014
    Configuration menu
    Copy the full SHA
    702bfdf View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Sandstorm files

    @ocdtrekkie
    ocdtrekkie committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    3bfaf29 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from audreyt/master 

    Update with 20140730 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    a1a4a4d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from ocdtrekkie/master 

    Update with 20140730 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    661e881 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2014

  1. Merge pull request #3 from audreyt/master 

    Update with 20140801.1 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    f6de780 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from ocdtrekkie/master 

    Update with 20140801.1 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Aug 1, 2014
    Configuration menu
    Copy the full SHA
    866b5b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2014

  1. Merge pull request #5 from audreyt/master 

    Update with 20140804.1 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    ffcd716 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from ocdtrekkie/master 

    Update with 20140804.1 from audreyt
    @ocdtrekkie
    ocdtrekkie committed Aug 4, 2014
    Configuration menu
    Copy the full SHA
    7e6220b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2014

  1. Various fixes to get sandstorm working

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    7079e0e View commit details
    Browse the repository at this point in the history

  2. Change packageId

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    f48ee4d View commit details
    Browse the repository at this point in the history

  3. Add sandstorm run/install scripts

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    14df617 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into sandstorm

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    9736f70 View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary install command

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    e75873d View commit details
    Browse the repository at this point in the history

  6. Update sandstorm-files.list

    @jparyani
    jparyani committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    6a463b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2014

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	db.js
    @audreyt
    audreyt committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    2418196 View commit details
    Browse the repository at this point in the history

  2. * Update file list

    @audreyt
    audreyt committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    c5c322e View commit details
    Browse the repository at this point in the history

  3. * 201410190 spk

    @audreyt
    audreyt committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    481b4e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2014

  1. Merge remote-tracking branch 'origin/master' into sandstorm

    @audreyt
    audreyt committed Nov 20, 2014
    Configuration menu
    Copy the full SHA
    13bacc9 View commit details
    Browse the repository at this point in the history

  2. * 201411200 spk

    @audreyt
    audreyt committed Nov 20, 2014
    Configuration menu
    Copy the full SHA
    e2eae40 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2014

  1. * 201412050; use --vm to try to resolve #117

    @audreyt
    audreyt committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    d3effb4 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	db.js
	manifest.appcache
	src/db.ls
    @audreyt
    audreyt committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    ab4bcba View commit details
    Browse the repository at this point in the history

  2. * Build 201412092 for sandstorm

    @audreyt
    audreyt committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    af6cdf0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2015

  1. Merge branch 'master' into sandstorm 

    We now default to /=sheet which opens up /sheet1 with
the title "Sheet1" for migration purposes.

Thanks @paulproteus for the suggestion.
    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    d9ce0c2 View commit details
    Browse the repository at this point in the history

  2. * Bump release to 201501301

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    0dde810 View commit details
    Browse the repository at this point in the history

  3. * Bundle new node deps

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    3d6e29f View commit details
    Browse the repository at this point in the history

  4. * Add multi/

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    170d55e View commit details
    Browse the repository at this point in the history

  5. * More missing files

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    8f76f7b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into sandstorm 

    Conflicts:
	manifest.appcache
    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    8f049fd View commit details
    Browse the repository at this point in the history

  7. * 201501305

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    e8af97f View commit details
    Browse the repository at this point in the history

  8. * Restore multi-sheet Excel XML export for sandstorm

    @audreyt
    audreyt committed Jan 29, 2015
    Configuration menu
    Copy the full SHA
    62ed9a9 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2015

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	Makefile
	static/multi.js
    @audreyt
    audreyt committed May 17, 2015
    Configuration menu
    Copy the full SHA
    78f7bd2 View commit details
    Browse the repository at this point in the history

  2. * Starting to work on #188

    @audreyt
    audreyt committed May 17, 2015
    Configuration menu
    Copy the full SHA
    7204c42 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. * First sketch of #188

    @audreyt
    audreyt committed May 18, 2015
    Configuration menu
    Copy the full SHA
    ea24a75 View commit details
    Browse the repository at this point in the history

  2. * Bump version

    @audreyt
    audreyt committed May 18, 2015
    Configuration menu
    Copy the full SHA
    d7892dd View commit details
    Browse the repository at this point in the history

  3. * Regen manifest

    @audreyt
    audreyt committed May 18, 2015
    Configuration menu
    Copy the full SHA
    fc32287 View commit details
    Browse the repository at this point in the history

  4. * 2015.05.18.3

    @audreyt
    audreyt committed May 18, 2015
    Configuration menu
    Copy the full SHA
    99bc3c0 View commit details
    Browse the repository at this point in the history

  5. * Sandstorm: Skip manifest appcache

    @audreyt
    audreyt committed May 18, 2015
    Configuration menu
    Copy the full SHA
    653faeb View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2015

  1. * Include FramaCalc's French Localization. 

      /cc @framasoft - please let me know if it's reasonable to
  credit your derivative work under Artistic License 2.0,
  i.e. same as socialcalcconstants.js.

  Closes #227
    @audreyt
    audreyt committed Jun 7, 2015
    Configuration menu
    Copy the full SHA
    4298880 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2015

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	package.json
	static/multi.js
    @audreyt
    audreyt committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    6c258f5 View commit details
    Browse the repository at this point in the history

  2. * Regen multi.js

    @audreyt
    audreyt committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    da10aa0 View commit details
    Browse the repository at this point in the history

  3. * Metadata for Sandstorm App Market

    @audreyt
    audreyt committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    57560c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2015

  1. * Implement #240 for sandstorm

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    8b85790 View commit details
    Browse the repository at this point in the history

  2. * Add PGP keyring and signature

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    f967cf0 View commit details
    Browse the repository at this point in the history

  3. * 2015.08.29.1

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    a8ed609 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'sandstorm' of github.com:audreyt/ethercalc into sandstorm

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    eb2154c View commit details
    Browse the repository at this point in the history

  5. * Update signature

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    a1b9238 View commit details
    Browse the repository at this point in the history

  6. * Add shortDescription

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    a154ca1 View commit details
    Browse the repository at this point in the history

  7. git pushMerge branch 'sandstorm' of github.com:audreyt/ethercalc into… 

    … sandstorm
    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    c41eb42 View commit details
    Browse the repository at this point in the history

  8. * Shorten shortDescription

    @audreyt
    audreyt committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    8a3cacb View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. * Add DESCRIPTION.mkdn

    @audreyt
    audreyt committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    c8365b6 View commit details
    Browse the repository at this point in the history

  2. * 2015.09.01.1

    @audreyt
    audreyt committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    7306557 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2015

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	Makefile
	package.json
    @audreyt
    audreyt committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    695b011 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2015

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	Makefile
    @audreyt
    audreyt committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    e7597fe View commit details
    Browse the repository at this point in the history

  2. * Bump version

    @audreyt
    audreyt committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    f5020e8 View commit details
    Browse the repository at this point in the history

  3. * Strip makefile

    @audreyt
    audreyt committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    c1d418e View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2016

  1. * Fix #292.

    @audreyt
    audreyt committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    8e04e33 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	Makefile
	main.js
	player.js
	src/main.ls
	src/player.ls
    @audreyt
    audreyt committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    aab33c6 View commit details
    Browse the repository at this point in the history

  2. * Try moving socket.io.js to static/

    @audreyt
    audreyt committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    04811d0 View commit details
    Browse the repository at this point in the history

  3. * Try multi sheet export

    @audreyt
    audreyt committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    ed6f32d View commit details
    Browse the repository at this point in the history

  4. * 20160122.5

    @audreyt
    audreyt committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    88fa8d8 View commit details
    Browse the repository at this point in the history

  5. * 201601226

    @audreyt
    audreyt committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    9d7db34 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2016

  1. Merge branch 'master' into sandstorm for #339 

    Conflicts:
	src/main.ls
    @audreyt
    audreyt committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    895ad1d View commit details
    Browse the repository at this point in the history

Commits on May 1, 2016

  1. * 20160501.0

    @audreyt
    audreyt committed May 1, 2016
    Configuration menu
    Copy the full SHA
    e3af473 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sandstorm' of github.com:audreyt/ethercalc into sandstorm 

    Conflicts:
	sandstorm-pkgdef.capnp
    @audreyt
    audreyt committed May 1, 2016
    Configuration menu
    Copy the full SHA
    b5389ac View commit details
    Browse the repository at this point in the history

  3. * 2016.05.01.1

    @audreyt
    audreyt committed May 1, 2016
    Configuration menu
    Copy the full SHA
    6af0380 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. * Fix #335 - use /sheet1 /sheet2 not /sheet1 /sheet12

    @audreyt
    audreyt committed May 18, 2016
    Configuration menu
    Copy the full SHA
    10e7771 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2016

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	package.json
	src/main.ls
    @audreyt
    audreyt committed Jun 11, 2016
    Configuration menu
    Copy the full SHA
    ee0feda View commit details
    Browse the repository at this point in the history

  2. * 0.20160612.0 on sandstorm

    @audreyt
    audreyt committed Jun 11, 2016
    Configuration menu
    Copy the full SHA
    750cdea View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2016

  1. Merge branch 'master' into sandstorm 

    Conflicts:
	multi/main.ls
	package.json
	static/multi.js
    @audreyt
    audreyt committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    6bbfba3 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. * Check sandstorm permissions on websockets and on /edit

    @audreyt
    audreyt committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    19556c1 View commit details
    Browse the repository at this point in the history

  2. * 2017.02.20.0

    @audreyt
    audreyt committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    a537c36 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into sandstorm

    @audreyt
    audreyt committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    0de94ea View commit details
    Browse the repository at this point in the history

  4. * Readd sc_commentbg.gif

    @audreyt
    audreyt committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    c97052a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. * Add back ask.recalc

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    0b0f048 View commit details
    Browse the repository at this point in the history

  2. * Bump version

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    327521d View commit details
    Browse the repository at this point in the history

  3. * Get header from .handshake not .request

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    a39e82e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into sandstorm

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    124e048 View commit details
    Browse the repository at this point in the history

  5. * appcache not working on sandstorm

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    3356733 View commit details
    Browse the repository at this point in the history

  6. * Change the default branch too

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    d1e8a8c View commit details
    Browse the repository at this point in the history

  7. * OK, bump app version

    @audreyt
    audreyt committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    c2dc1f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2017

  1. Merge branch 'master' into sandstorm

    @audreyt
    audreyt committed Mar 7, 2017
    Configuration menu
    Copy the full SHA
    409985e View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Merge branch 'master' into sandstorm

    @audreyt
    audreyt committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    72d0de0 View commit details
    Browse the repository at this point in the history

  2. * Switch to xlsx.core.min.js

    @audreyt
    audreyt committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    bfff09f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. Merge branch 'master' into sandstorm

    @ocdtrekkie
    ocdtrekkie committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    92bdd27 View commit details
    Browse the repository at this point in the history

  2. Fix Sandstorm build

    @ocdtrekkie
    ocdtrekkie committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    831b686 View commit details
    Browse the repository at this point in the history

  3. Add import and export dependencies to file list

    @ocdtrekkie
    ocdtrekkie committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    e56cc04 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2019

  1. Merge pull request #629 from ocdtrekkie/sandstorm 

    Update Sandstorm build (WIP)
    @audreyt
    audreyt authored May 27, 2019
    Configuration menu
    Copy the full SHA
    5bfcddd View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Merge branch 'master' into sandstorm

    @audreyt
    audreyt committed Oct 8, 2019
    Configuration menu
    Copy the full SHA
    4eb3c44 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. * fix xlsx dependency for now before we fix #694

    @audreyt
    audreyt committed Dec 12, 2019
    3 Configuration menu
    Copy the full SHA
    acbf6ab View commit details
    Browse the repository at this point in the history