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.

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
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
996445f
Move data storage to /var
ocdtrekkie Jul 29, 2014
1302911
Make document ID predictable.
ocdtrekkie Jul 29, 2014
fcc695f
Update _start
ocdtrekkie Jul 29, 2014
2e8f57a
Revert "Update _start"
ocdtrekkie Jul 29, 2014
702bfdf
Load directly to document
ocdtrekkie Jul 29, 2014
3bfaf29
Sandstorm files
ocdtrekkie Jul 30, 2014
a1a4a4d
Merge pull request #1 from audreyt/master
ocdtrekkie Jul 30, 2014
661e881
Merge pull request #2 from ocdtrekkie/master
ocdtrekkie Jul 30, 2014
f6de780
Merge pull request #3 from audreyt/master
ocdtrekkie Aug 1, 2014
866b5b4
Merge pull request #4 from ocdtrekkie/master
ocdtrekkie Aug 1, 2014
ffcd716
Merge pull request #5 from audreyt/master
ocdtrekkie Aug 4, 2014
7e6220b
Merge pull request #6 from ocdtrekkie/master
ocdtrekkie Aug 4, 2014
7079e0e
Various fixes to get sandstorm working
jparyani Sep 4, 2014
f48ee4d
Change packageId
jparyani Sep 4, 2014
14df617
Add sandstorm run/install scripts
jparyani Sep 4, 2014
9736f70
Merge remote-tracking branch 'upstream/master' into sandstorm
jparyani Sep 4, 2014
e75873d
Remove unnecessary install command
jparyani Sep 4, 2014
6a463b5
Update sandstorm-files.list
jparyani Sep 4, 2014
2418196
Merge branch 'master' into sandstorm
audreyt Oct 19, 2014
c5c322e
* Update file list
audreyt Oct 19, 2014
481b4e4
* 201410190 spk
audreyt Oct 19, 2014
13bacc9
Merge remote-tracking branch 'origin/master' into sandstorm
audreyt Nov 20, 2014
e2eae40
* 201411200 spk
audreyt Nov 20, 2014
d3effb4
* 201412050; use --vm to try to resolve #117
audreyt Dec 5, 2014
ab4bcba
Merge branch 'master' into sandstorm
audreyt Dec 8, 2014
af6cdf0
* Build 201412092 for sandstorm
audreyt Dec 8, 2014
d9ce0c2
Merge branch 'master' into sandstorm
audreyt Jan 29, 2015
0dde810
* Bump release to 201501301
audreyt Jan 29, 2015
3d6e29f
* Bundle new node deps
audreyt Jan 29, 2015
170d55e
* Add multi/
audreyt Jan 29, 2015
8f76f7b
* More missing files
audreyt Jan 29, 2015
8f049fd
Merge branch 'master' into sandstorm
audreyt Jan 29, 2015
e8af97f
* 201501305
audreyt Jan 29, 2015
62ed9a9
* Restore multi-sheet Excel XML export for sandstorm
audreyt Jan 29, 2015
78f7bd2
Merge branch 'master' into sandstorm
audreyt May 17, 2015
7204c42
* Starting to work on #188
audreyt May 17, 2015
ea24a75
* First sketch of #188
audreyt May 18, 2015
d7892dd
* Bump version
audreyt May 18, 2015
fc32287
* Regen manifest
audreyt May 18, 2015
99bc3c0
* 2015.05.18.3
audreyt May 18, 2015
653faeb
* Sandstorm: Skip manifest appcache
audreyt May 18, 2015
4298880
* Include FramaCalc's French Localization.
audreyt Jun 7, 2015
6c258f5
Merge branch 'master' into sandstorm
audreyt Aug 22, 2015
da10aa0
* Regen multi.js
audreyt Aug 22, 2015
57560c8
* Metadata for Sandstorm App Market
audreyt Aug 22, 2015
8b85790
* Implement #240 for sandstorm
audreyt Aug 29, 2015
f967cf0
* Add PGP keyring and signature
audreyt Aug 29, 2015
a8ed609
* 2015.08.29.1
audreyt Aug 29, 2015
eb2154c
Merge branch 'sandstorm' of github.com:audreyt/ethercalc into sandstorm
audreyt Aug 29, 2015
a1b9238
* Update signature
audreyt Aug 29, 2015
a154ca1
* Add shortDescription
audreyt Aug 29, 2015
c41eb42
git pushMerge branch 'sandstorm' of github.com:audreyt/ethercalc into…
audreyt Aug 29, 2015
8a3cacb
* Shorten shortDescription
audreyt Aug 29, 2015
c8365b6
* Add DESCRIPTION.mkdn
audreyt Sep 1, 2015
7306557
* 2015.09.01.1
audreyt Sep 1, 2015
695b011
Merge branch 'master' into sandstorm
audreyt Oct 28, 2015
e7597fe
Merge branch 'master' into sandstorm
audreyt Nov 17, 2015
f5020e8
* Bump version
audreyt Nov 17, 2015
c1d418e
* Strip makefile
audreyt Nov 17, 2015
8e04e33
* Fix #292.
audreyt Jan 13, 2016
aab33c6
Merge branch 'master' into sandstorm
audreyt Jan 21, 2016
04811d0
* Try moving socket.io.js to static/
audreyt Jan 21, 2016
ed6f32d
* Try multi sheet export
audreyt Jan 21, 2016
88fa8d8
* 20160122.5
audreyt Jan 21, 2016
9d7db34
* 201601226
audreyt Jan 21, 2016
895ad1d
Merge branch 'master' into sandstorm for #339
audreyt Apr 30, 2016
e3af473
* 20160501.0
audreyt May 1, 2016
b5389ac
Merge branch 'sandstorm' of github.com:audreyt/ethercalc into sandstorm
audreyt May 1, 2016
6af0380
* 2016.05.01.1
audreyt May 1, 2016
10e7771
* Fix #335 - use /sheet1 /sheet2 not /sheet1 /sheet12
audreyt May 18, 2016
ee0feda
Merge branch 'master' into sandstorm
audreyt Jun 11, 2016
750cdea
* 0.20160612.0 on sandstorm
audreyt Jun 11, 2016
6bbfba3
Merge branch 'master' into sandstorm
audreyt Dec 19, 2016
19556c1
* Check sandstorm permissions on websockets and on /edit
audreyt Feb 20, 2017
a537c36
* 2017.02.20.0
audreyt Feb 20, 2017
0de94ea
Merge branch 'master' into sandstorm
audreyt Feb 20, 2017
c97052a
* Readd sc_commentbg.gif
audreyt Feb 20, 2017
0b0f048
* Add back ask.recalc
audreyt Feb 21, 2017
327521d
* Bump version
audreyt Feb 21, 2017
a39e82e
* Get header from .handshake not .request
audreyt Feb 21, 2017
124e048
Merge branch 'master' into sandstorm
audreyt Feb 21, 2017
3356733
* appcache not working on sandstorm
audreyt Feb 21, 2017
d1e8a8c
* Change the default branch too
audreyt Feb 21, 2017
c2dc1f3
* OK, bump app version
audreyt Feb 21, 2017
409985e
Merge branch 'master' into sandstorm
audreyt Mar 7, 2017
72d0de0
Merge branch 'master' into sandstorm
audreyt Aug 7, 2017
bfff09f
* Switch to xlsx.core.min.js
audreyt Aug 7, 2017
92bdd27
Merge branch 'master' into sandstorm
ocdtrekkie Jul 4, 2018
831b686
Fix Sandstorm build
ocdtrekkie Jul 4, 2018
e56cc04
Add import and export dependencies to file list
ocdtrekkie Jul 4, 2018
5bfcddd
Merge pull request #629 from ocdtrekkie/sandstorm
audreyt May 27, 2019
4eb3c44
Merge branch 'master' into sandstorm
audreyt Oct 8, 2019
acbf6ab
* fix xlsx dependency for now before we fix #694
audreyt Dec 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.mkdn
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 20160501.1

- Fixed charting in Graph tab.
- Add F2 for input mode toggle.
- Add Russian translation; updated other translations.

# 20160122.5

- Fixed Excel multi-spreadsheet export.
- Allow selecting entire rows and columns.

# 20150901.1

- Updated "Description" metadata as per Kenton.

# 20150822.1

- Initial release to Sandstorm App Market.
9 changes: 9 additions & 0 deletions DESCRIPTION.mkdn
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
**EtherCalc is a web spreadsheet.**

Your data is saved on the web, and people can edit the same document at the
same time. Everybody's changes are instantly reflected on all screens.

Work together on inventories, survey forms, list management, brainstorming
sessions and more!

Read more about EtherCalc at: <http://ethercalc.net/>
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ifdef DEBUG
UGLIFYJS_ARGS += -b
endif

run: all
run:
node app.js --cors $(ETHERCALC_ARGS)

vm: all
Expand Down
1 change: 1 addition & 0 deletions dump.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"log-yl5ynejszh":["set sheet defaulttextvalueformat text-wiki","set A1 text t test"],"chat-yl5ynejszh":[],"audit-yl5ynejszh":["set sheet defaulttextvalueformat text-wiki","set A1 text t test"],"snapshot-yl5ynejszh":"socialcalc:version:1.0\nMIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=SocialCalcSpreadsheetControlSave\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n# SocialCalc Spreadsheet Control Save\nversion:1.0\npart:sheet\npart:edit\npart:audit\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\nversion:1.5\ncell:A1:t:test\nsheet:c:1:r:1:tvf:1\nvalueformat:1:text-wiki\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n--SocialCalcSpreadsheetControlSave--\n","log-sheet1":["set sheet defaulttextvalueformat text-wiki"],"chat-sheet1":[],"audit-sheet1":["set sheet defaulttextvalueformat text-wiki"],"snapshot-sheet1":"socialcalc:version:1.0\nMIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=SocialCalcSpreadsheetControlSave\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n# SocialCalc Spreadsheet Control Save\nversion:1.0\npart:sheet\npart:edit\npart:audit\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\nversion:1.5\nsheet:c:1:r:1:tvf:1\nvalueformat:1:text-wiki\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n--SocialCalcSpreadsheetControlSave\nContent-type: text/plain; charset=UTF-8\n\n--SocialCalcSpreadsheetControlSave--\n"}
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
document.title = SocialCalc._room + " – EtherCalc";
}
else {
window.location = './_start';
window.location = './=sheet';
}
}
window.addEventListener("message", function(it){
Expand All @@ -31,7 +31,7 @@
}, false);
</script>
<script src="./static/ethercalc.js"></script>
<script src="./socket.io/socket.io.js"></script>
<script src="./static/socket.io.js"></script>
<script src="./zappa/zappa.js"></script>
<script src="./player/broadcast.js"></script>
<script src="./player/graph.js"></script>
Expand Down
4 changes: 4 additions & 0 deletions install_grain.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
cp /opt/app/dump.json /var/dump.json
export PORT=33411
make
52 changes: 26 additions & 26 deletions main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 0 additions & 96 deletions manifest.appcache
Original file line number Diff line number Diff line change
@@ -1,103 +1,7 @@
CACHE MANIFEST
# Thu, Jul 14, 2016 1:58:57 PM

CACHE:

# initial page
_start
static/start.css
static/img/davy/bg/home2.png
static/img/davy/bg/product.png
static/img/davy/gfx/screenshot.png
static/img/davy/gfx/home-logo2.png
static/img/davy/btn/createpad-home.png
static/img/[email protected]
static/jszip.js
static/shim.js
static/xlsx.js
static/xlsxworker.js
static/jquery.js
static/dist/ods.js
static/multi.js

# pad page
static/ethercalc.js
socket.io/socket.io.js
zappa/zappa.js
player/broadcast.js
player/graph.js
player/main.js
static/socialcalc.css
static/index.css
static/export.png

images/sc_1x1.gif
images/sc_aligncenter.png
images/sc_alignleft.png
images/sc_alignright.png
images/sc_autosum.png
images/sc_bordersoff.png
images/sc_borderson.png
images/sc_copy.png
images/sc_cut.png
images/sc_defaultcolor.gif
images/sc_delete.png
images/sc_deletecolumns.png
images/sc_deleterows.png
images/sc_divider1.png
images/sc_drag-handles.gif
images/sc_drag-handles.png
images/sc_endcap-h.gif
images/sc_endcap-v.gif
images/sc_filldown.png
images/sc_fillright.png
images/sc_formatpaintbrush.png
images/sc_hidecol.png
images/sc_hiderow.png
images/sc_insertcolumns.png
images/sc_insertformula.png
images/sc_inserthyperlink.png
images/sc_insertrows.png
images/sc_less-hh.gif
images/sc_less-hn.gif
images/sc_less-vn.gif
images/sc_listbox.png
images/sc_lock.png
images/sc_logo.gif
images/sc_main-h.gif
images/sc_main-v.gif
images/sc_mergecells.png
images/sc_more-hh.gif
images/sc_more-hn.gif
images/sc_more-vd.gif
images/sc_more-vn.gif
images/sc_more-vh.gif
images/sc_movefrom.gif
images/sc_movefromoff.gif
images/sc_moveinsert.gif
images/sc_moveinsertoff.gif
images/sc_movepaste.gif
images/sc_movepasteoff.gif
images/sc_paneslider-h.gif
images/sc_paneslider-v.gif
images/sc_paste.png
images/sc_recalc.png
images/sc_redo.png
images/sc_scrollarea-h.gif
images/sc_scrollarea-v.gif
images/sc_swapcolors.png
images/sc_thumb-hd.gif
images/sc_thumb-hh.gif
images/sc_thumb-hn.gif
images/sc_thumb-vn.gif
images/sc_undo.png
images/sc_unhidebottom.gif
images/sc_unhideleft.gif
images/sc_unhideright.gif
images/sc_unhidetop.gif
images/sc_unlock.png


FALLBACK:

NETWORK:
Expand Down
11 changes: 6 additions & 5 deletions multi/foldr.ls
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$ = require \superagent
const one = "1"

export class HackFoldr
(@base) -> @base -= /\/+$/
Expand All @@ -11,7 +12,7 @@ export class HackFoldr
@was-non-existent = true
if !@rows?length
@was-empty = true
return cb? @rows = [] , @.push({link: "/#{ @id }.1", title: \Sheet1 }) , cb(@)
return cb? @rows = [] , @.push({link: "/#{ @id }#one", title: \Sheet1 }) , cb(@)
cb? @rows
size: -> @rows.length
lastIndex: -> @rows.length - 1
Expand Down Expand Up @@ -43,13 +44,13 @@ export class HackFoldr
row?row = 2
@was-non-existent = false
@was-empty = false
return @post-raw-csv '#url', '#title', "/#{ @id }.1", "Sheet1", cb unless row
return @post-init-csv '#url', '#title', "/#{ @id }.1", "Sheet1", row.link, row.title, cb
return @post-raw-csv '#url', '#title', "/#{ @id }#one", "Sheet1", cb unless row
return @post-init-csv '#url', '#title', "/#{ @id }#one", "Sheet1", row.link, row.title, cb
else if @was-empty
row?row = 2
@was-empty = false
return @post-csv "/#{ @id }.1", "Sheet1", cb unless row
return @post-raw-csv "/#{ @id }.1", "Sheet1", row.link, row.title, cb
return @post-csv "/#{ @id }#one", "Sheet1", cb unless row
return @post-raw-csv "/#{ @id }#one", "Sheet1", row.link, row.title, cb
cb!
post-csv: (a="", b="", cb) ->
$.post("#{ @base }/_/#{ @id }").type(\text/csv).accept(\application/json).send("""
Expand Down
Loading