From 1158753a7f4ff4b9172d06cb2f2e203071b5bafb Mon Sep 17 00:00:00 2001 From: Atif Aziz Date: Wed, 27 Jul 2016 16:45:45 +0200 Subject: [PATCH 1/8] loadclipboard via api hijack fix; closes #411 --- main.js | 2 +- src/main.ls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 8e2ec40c..9860fa75 100644 --- a/main.js +++ b/main.js @@ -603,7 +603,7 @@ return SC._get(room, IO, function(arg$){ var log, snapshot, row, cmdstr; log = arg$.log, snapshot = arg$.snapshot; - if (/^loadclipboard\s*/.exec(command)) { + if (!this$.request.is('application/json') && /^loadclipboard\s*/.exec(command)) { row = 1; if (/\nsheet:c:\d+:r:(\d+):/.exec(snapshot)) { row += Number(RegExp.$1); diff --git a/src/main.ls b/src/main.ls index 5d639cf1..885f685c 100755 --- a/src/main.ls +++ b/src/main.ls @@ -367,7 +367,7 @@ @response.type Text return @response.send 400 'Please send command' {log, snapshot} <~ SC._get room, IO - if command is /^loadclipboard\s*/ + if not (@request.is \application/json) and command is /^loadclipboard\s*/ row = 1 if snapshot is /\nsheet:c:\d+:r:(\d+):/ row += Number(RegExp.$1) From 55c84ff0469988a5fbf08b3e5dd25c91067d7b24 Mon Sep 17 00:00:00 2001 From: Audrey Tang Date: Tue, 2 Aug 2016 22:50:32 +0800 Subject: [PATCH 2/8] * fr.json: Switch to euro as per @PPCM (#227) --- l10n/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/l10n/fr.json b/l10n/fr.json index 90b5f136..adc8c421 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -164,7 +164,7 @@ "SCFormulabarheight": 30, "SCStatuslineheight": 20, "SCStatuslineCSS": "font-size:10px;padding:3px 0px;", - "SCFormatNumberFormats": "[cancel]:|[break]:|%loc!Default!:|[custom]:|%loc!Automatic!:general|%loc!Auto w/ commas!:[,]General|[break]:|00:00|000:000|0000:0000|00000:00000|[break]:|%loc!Formula!:formula|%loc!Hidden!:hidden|[newcol]:1234:0|1,234:#,##0|1,234.5:#,##0.0|1,234.56:#,##0.00|1,234.567:#,##0.000|1,234.5678:#,##0.0000|[break]:|1,234%:#,##0%|1,234.5%:#,##0.0%|1,234.56%:#,##0.00%|[newcol]:|$1,234:$#,##0|$1,234.5:$#,##0.0|$1,234.56:$#,##0.00|[break]:|(1,234):#,##0_);(#,##0)|(1,234.5):#,##0.0_);(#,##0.0)|(1,234.56):#,##0.00_);(#,##0.00)|[break]:|($1,234):#,##0_);($#,##0)|($1,234.5):$#,##0.0_);($#,##0.0)|($1,234.56):$#,##0.00_);($#,##0.00)|[newcol]:|1/4/06:m/d/yy|01/04/2006:mm/dd/yyyy|2006-01-04:yyyy-mm-dd|4-Jan-06:d-mmm-yy|04-Jan-2006:dd-mmm-yyyy|Janvier 4, 2006:mmmm d, yyyy|[break]:|1\\c23:h:mm|1\\c23 PM:h:mm AM/PM|1\\c23\\c45:h:mm:ss|01\\c23\\c45:hh:mm:ss|26\\c23 (h\\cm):[hh]:mm|69\\c45 (m\\cs):[mm]:ss|69 (s):[ss]|[newcol]:|2006-01-04 01\\c23\\c45:yyyy-mm-dd hh:mm:ss|Janvier 4, 2006:mmmm d, yyyy hh:mm:ss|Mer:ddd|Mercredi:dddd|", + "SCFormatNumberFormats": "[cancel]:|[break]:|%loc!Default!:|[custom]:|%loc!Automatic!:general|%loc!Auto w/ commas!:[,]General|[break]:|00:00|000:000|0000:0000|00000:00000|[break]:|%loc!Formula!:formula|%loc!Hidden!:hidden|[newcol]:1234:0|1 234:#,##0|1 234.5:#,##0.0|1 234,56:#,##0.00|1 234,567:#,##0.000|1 23,.5678:#,##0.0000|[break]:|1 234%:#,##0%|1 234,5%:#,##0.0%|1 234,56%:#,##0.00%|[newcol]:|1 234 €:#,##0 €|1 234,5 €:#,##0.0 €|1 234,56 €:#,##0.00 €|[break]:|(1 234):#,##0_);(#,##0)|(1 234,5):#,##0.0_);(#,##0.0)|(1 234,56):#,##0.00_);(#,##0.00)|[break]:|(1 234€):#,##0_)€;(#,##0€)|(1 234,5€):#,##0.0_)€;(#,##0.0€)|(1 234,56€):#,##0.00_)€;(#,##0.00€)|[newcol]:|1/4/06:m/d/yy|01/04/2006:mm/dd/yyyy|2006-01-04:yyyy-mm-dd|4-Jan-06:d-mmm-yy|04-Jan-2006:dd-mmm-yyyy|Janvier 4, 2006:mmmm d, yyyy|[break]:|1\\c23:h:mm|1\\c23 PM:h:mm AM/PM|1\\c23\\c45:h:mm:ss|01\\c23\\c45:hh:mm:ss|26\\c23 (h\\cm):[hh]:mm|69\\c45 (m\\cs):[mm]:ss|69 (s):[ss]|[newcol]:|2006-01-04 01\\c23\\c45:yyyy-mm-dd hh:mm:ss|Janvier 4, 2006:mmmm d, yyyy hh:mm:ss|Mer:ddd|Mercredi:dddd|", "SCFormatTextFormats": "[cancel]:|[break]:|%loc!Default!:|[custom]:|%loc!Automatic!:general|%loc!Plain Text!:text-plain|HTML:text-html|%loc!Wikitext!:text-wiki|%loc!Link!:text-link|%loc!Formula!:formula|%loc!Hidden!:hidden|", "SCFormatPadsizes": "[cancel]:|[break]:|%loc!Default!:|[custom]:|%loc!No padding!:0px|[newcol]:|1 pixel:1px|2 pixels:2px|3 pixels:3px|4 pixels:4px|5 pixels:5px|6 pixels:6px|7 pixels:7px|8 pixels:8px|[newcol]:|9 pixels:9px|10 pixels:10px|11 pixels:11px|12 pixels:12px|13 pixels:13px|14 pixels:14px|16 pixels:16px|18 pixels:18px|[newcol]:|20 pixels:20px|22 pixels:22px|24 pixels:24px|28 pixels:28px|36 pixels:36px|", "SCFormatFontsizes": "[cancel]:|[break]:|%loc!Default!:|[custom]:|X-Small:x-small|Small:small|Medium:medium|Large:large|X-Large:x-large|[newcol]:|6pt:6pt|7pt:7pt|8pt:8pt|9pt:9pt|10pt:10pt|11pt:11pt|12pt:12pt|14pt:14pt|16pt:16pt|[newcol]:|18pt:18pt|20pt:20pt|22pt:22pt|24pt:24pt|28pt:28pt|36pt:36pt|48pt:48pt|72pt:72pt|[newcol]:|8 pixels:8px|9 pixels:9px|10 pixels:10px|11 pixels:11px|12 pixels:12px|13 pixels:13px|14 pixels:14px|[newcol]:|16 pixels:16px|18 pixels:18px|20 pixels:20px|22 pixels:22px|24 pixels:24px|28 pixels:28px|36 pixels:36px|", @@ -319,9 +319,9 @@ "s_loc_Xselect_rangeX": "[faites une sélection]", "SVStatuslineheight": 20, "SVStatuslineCSS": "font-size:10px;padding:3px 0px;", - "FormatNumber_separatorchar": ",", - "FormatNumber_decimalchar": ".", - "FormatNumber_defaultCurrency": "$", + "FormatNumber_separatorchar": " ", + "FormatNumber_decimalchar": ",", + "FormatNumber_defaultCurrency": "€", "s_FormatNumber_daynames": [ "Dimanche", "Lundi", From 141fa2d1748961eebd76b633a03455796182f977 Mon Sep 17 00:00:00 2001 From: Atif Aziz Date: Thu, 18 Aug 2016 14:23:36 +0200 Subject: [PATCH 3/8] Update zappajs to 5.x; closes #420 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1606815..aae5864a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "socialcalc": "2.x", "uuid-pure": "*", "xoauth2": "*", - "zappajs": "0.5.x" + "zappajs": "5.x" }, "optionalDependencies": { "webworker-threads": "^0.7.1" From b6cfa0053d9c246fa39c351b9b6a8363439778ef Mon Sep 17 00:00:00 2001 From: Audrey Tang Date: Thu, 18 Aug 2016 23:53:18 +0800 Subject: [PATCH 4/8] Revert "Update zappajs to 5.x; closes #420" This reverts commit 141fa2d1748961eebd76b633a03455796182f977. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aae5864a..f1606815 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "socialcalc": "2.x", "uuid-pure": "*", "xoauth2": "*", - "zappajs": "5.x" + "zappajs": "0.5.x" }, "optionalDependencies": { "webworker-threads": "^0.7.1" From 937c0a72def995133a48ec12e3a581d352661dfa Mon Sep 17 00:00:00 2001 From: Qin Shulei <527072230@qq.com> Date: Wed, 31 Aug 2016 16:05:58 +0800 Subject: [PATCH 5/8] Add redis alias Dockerfile uses $REDIS_PORT_6379_TCP_ADDR and $REDIS_PORT_6379_TCP_PORT. The redis's container name maybe not redis. So add an alias in links. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 52ad861b..ccceee23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ ethercalc: ports: - "80:8000" links: - - redis + - redis:redis restart: always redis: image: redis:latest From 39003c711a62faf6eed4f558a089408599f876a4 Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Tue, 13 Sep 2016 14:29:44 +0200 Subject: [PATCH 6/8] add snapcraft.yaml file --- snapcraft.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 snapcraft.yaml diff --git a/snapcraft.yaml b/snapcraft.yaml new file mode 100644 index 00000000..c243b642 --- /dev/null +++ b/snapcraft.yaml @@ -0,0 +1,23 @@ +name: ethercalc +version: 0.20151108.1+ +summary: EtherCalc is a web spreadsheet. +description: | + 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! +confinement: strict +grade: devel # use "stable" to assert the snap quality + +apps: + ethercald: + daemon: simple + command: bin/ethercalc + plugs: [network, network-bind] + + +parts: + ethercalc: + source: . + plugin: nodejs From 2e96fe6a8dac08a9327ed9d5b2f95aedf432290e Mon Sep 17 00:00:00 2001 From: Audrey Tang Date: Fri, 16 Sep 2016 11:50:24 +0800 Subject: [PATCH 7/8] * Add robots.txt that prevents crawling --- nginx/conf/ethercalc.org.conf | 2 +- robots.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 robots.txt diff --git a/nginx/conf/ethercalc.org.conf b/nginx/conf/ethercalc.org.conf index 03a2d0bf..a3affc1b 100644 --- a/nginx/conf/ethercalc.org.conf +++ b/nginx/conf/ethercalc.org.conf @@ -29,7 +29,7 @@ server { ssl_certificate_key /var/www/ethercalc.org.pem; server_name ethercalc.org www.ethercalc.org localhost; - location ~* (\.(css|png|gif|svg|ico)|static/.*\.js(on)?|manifest\.(appcache|webapp|json)|browserconfig\.xml)$ { + location ~* (\.(css|png|gif|svg|ico|txt)|static/.*\.js(on)?|manifest\.(appcache|webapp|json)|browserconfig\.xml)$ { root /var/www/ethercalc/; expires 24h; add_header Cache-Control public; diff --git a/robots.txt b/robots.txt new file mode 100644 index 00000000..1f53798b --- /dev/null +++ b/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / From 850bc981e6cf80dc0a76f49ebd851c8f4c4871ee Mon Sep 17 00:00:00 2001 From: SJ Chou Date: Fri, 7 Oct 2016 19:57:50 +0800 Subject: [PATCH 8/8] Improve the resize-bar UX of head on mouse hover it. --- src/player-graph.ls | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) mode change 100755 => 100644 src/player-graph.ls diff --git a/src/player-graph.ls b/src/player-graph.ls old mode 100755 new mode 100644 index 4641552b..2c3b71bd --- a/src/player-graph.ls +++ b/src/player-graph.ls @@ -715,9 +715,8 @@ scc.defaultImagePrefix = 'images/sc_' SocialCalc.Popup.LocalizeString = SocialCalc.LocalizeString #row and col header colours - scc.defaultColnameStyle = 'font-size:small;text-align:center;color:#' + hightLightForegoundColour + ';background-color:#' + unselectedbg + ';cursor:e-resize;' - scc.defaultSelectedColnameStyle = 'font-size:small;text-align:center;color:#' + hightLightForegoundColour + ';background-color:#' + selectedbg + ';cursor:e-resize;' - scc.defaultRownameStyle = 'font-size:small;text-align:right;color:#' + hightLightForegoundColour + ';background-color:#' + unselectedbg + ';direction:rtl;' - scc.defaultSelectedRownameStyle = 'font-size:small;text-align:right;color:#' + hightLightForegoundColour + ';background-color:#' + selectedbg + ';' + scc.defaultColnameStyle = 'overflow:visible;font-size:small;text-align:center;color:#' + hightLightForegoundColour + ';background-color:#' + unselectedbg + scc.defaultSelectedColnameStyle = 'overflow:visible;font-size:small;text-align:center;color:#' + hightLightForegoundColour + ';background-color:#' + selectedbg + scc.defaultRownameStyle = 'position:relative;overflow:visible;font-size:small;text-align:center;vertical-align:middle;color:#' + hightLightForegoundColour + ';background-color:#' + unselectedbg + ';direction:rtl;' + scc.defaultSelectedRownameStyle = 'position:relative;overflow:visible;font-size:small;text-align:center;vertical-align:middle;color:#' + hightLightForegoundColour + ';background-color:#' + selectedbg + ';' scc.defaultHighlightTypeCursorStyle = 'color:#' + hightLightForegoundColour + ';backgroundColor:#' + cursorbg + ';' -