Skip to content

Commit ed20512

Browse files
cesinecesine
authored
Merge pull request #69 from cesine/fix/travis
fielddb @ 5.121.19-rc0
2 parents f4ebbbb + b14d498 commit ed20512

10 files changed

Lines changed: 27169 additions & 16502 deletions

File tree

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"tests"
2323
],
2424
"dependencies": {
25-
"fielddb": "^5.5.29"
25+
"fielddb": "5.121.19-rc0"
2626
}
2727
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"debug": "^2.6.3",
4141
"express": "^4.13.3",
4242
"express-session": "^1.11.3",
43-
"fielddb": "https://github.com/FieldDB/FieldDB.git",
43+
"fielddb": "5.121.19-rc0",
4444
"forever": "^0.15.1",
4545
"handlebars": "^4.0.2",
4646
"history": "^1.17.0",
@@ -67,7 +67,7 @@
6767
"fielddb-web": "./bin/fielddb-web-server"
6868
},
6969
"engines": {
70-
"node": "~4.0 || ~6.0"
70+
"node": "^4.0 || ^6.0"
7171
},
7272
"scripts": {
7373
"build": "npm run webpack && gulp build",

‎public/components/fielddb/.bower.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fielddb",
3-
"version": "5.5.29",
3+
"version": "5.121.19-rc0",
44
"homepage": "http://fielddb.github.io/FieldDB/",
55
"bugs": {
66
"url": "https://github.com/FieldDB/FieldDB/issues"
@@ -68,13 +68,13 @@
6868
"dependencies": {},
6969
"main": "fielddb.js",
7070
"devDependencies": {},
71-
"_release": "5.5.29",
71+
"_release": "5.121.19-rc0",
7272
"_resolution": {
7373
"type": "version",
74-
"tag": "v5.5.29",
75-
"commit": "6d248da3ef96a0faa7b64cee550a14a167db6f7b"
74+
"tag": "v5.121.19-rc0",
75+
"commit": "be23290812ef88c0648186517a0e66ca246c2c98"
7676
},
7777
"_source": "https://github.com/OpenSourceFieldlinguistics/bower-fielddb.git",
78-
"_target": "^5.5.29",
78+
"_target": "5.121.19-rc0",
7979
"_originalSource": "fielddb"
8080
}

‎public/components/fielddb/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fielddb",
3-
"version": "5.5.29",
3+
"version": "5.121.19-rc0",
44
"homepage": "http://fielddb.github.io/FieldDB/",
55
"bugs": {
66
"url": "https://github.com/FieldDB/FieldDB/issues"

‎public/components/fielddb/fielddb.js‎

Lines changed: 27131 additions & 16466 deletions
Large diffs are not rendered by default.

‎test/integration/activity-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var supertest = require("supertest");
44

55
var api = require("../../server");
66
var specIsRunningTooLong = 5000;
7-
var LINGLLAMA_ACTIVITY_SIZE = 94;
7+
var LINGLLAMA_ACTIVITY_SIZE = 103;
88
var COMMUNITY_GEORGIAN_ACTIVITY_SIZE = 218;
99

1010
var acceptSelfSignedCertificates = {

‎test/lib/activity-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var config = require("config");
22
var expect = require("chai").expect;
33
var activityHeatMap = require("./../../lib/activity").activityHeatMap;
44
var specIsRunningTooLong = 5000;
5-
var LINGLLAMA_ACTIVITY_SIZE = 94;
5+
var LINGLLAMA_ACTIVITY_SIZE = 103;
66
var COMMUNITY_GEORGIAN_ACTIVITY_SIZE = 218;
77

88
var acceptSelfSignedCertificates = {

‎test/lib/corpora-spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var config = require("config");
22
var expect = require("chai").expect;
33
var getAllCorpora = require("./../../lib/corpora").getAllCorpora;
44
var specIsRunningTooLong = 15000;
5-
var TOTAL_CORPORA_COUNT = 236;
5+
var TOTAL_CORPORA_COUNT = 249;
66

77
if (process.env.OFFLINE) {
88
TOTAL_CORPORA_COUNT = 2;

‎test/lib/corpus-spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ describe("corpus lib", function() {
9393

9494
getCorpusMask("lingllama-communitycorpus", done).then(function(mask) {
9595
expect(mask).to.be.defined;
96-
expect(mask._rev).to.deep.equal("50-652a20322e696773482b140780fd6a99");
96+
expect(mask._rev).to.deep.equal("64-9f86db77de4d7dc204a9fa65259e7f2c");
9797
expect(mask.fieldDBtype).to.deep.equal("CorpusMask");
9898
expect(mask.dbname).to.deep.equal("lingllama-communitycorpus");
9999
expect(mask.url).to.not.contain(corpusConfig.auth);
100100
expect(mask.title).to.deep.equal("Community Corpus");
101101
expect(mask.titleAsUrl).to.deep.equal("community_corpus");
102102
expect(mask.description).to.deep.equal("This is a corpus which is editable by anyone in the LingSync community. Anyone can add comments to data, import data, experiment and help suggestions for other community members.");
103103
expect(mask.copyright).to.deep.equal("lingllama");
104-
expect(mask.fields.length).to.equal(18);
104+
expect(mask.fields.length).to.equal(29);
105105
// console.log(JSON.stringify(mask, null, 2));
106106
expect(mask.termsOfUse).to.be.defined;
107107
expect(mask.termsOfUse).to.contain("Sample: The materials included in this corpus are available");

‎yarn.lock‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,12 @@ asynckit@^0.4.0:
258258
version "0.4.0"
259259
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
260260

261-
atob@^1.1.2, atob@~1.1.0:
261+
atob@^2.1.2:
262+
version "2.1.2"
263+
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
264+
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
265+
266+
atob@~1.1.0:
262267
version "1.1.3"
263268
resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
264269

@@ -1231,12 +1236,6 @@ code-point-at@^1.0.0:
12311236
version "1.1.0"
12321237
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
12331238

1234-
collections@~0.2.2:
1235-
version "0.2.2"
1236-
resolved "https://registry.yarnpkg.com/collections/-/collections-0.2.2.tgz#1f23026b2ef36f927eecc901e99c5f0d48fa334e"
1237-
dependencies:
1238-
weak-map "1.0.0"
1239-
12401239
colors@0.6.x, colors@0.x.x, "colors@>= 0.6.0-1", colors@~0.6.2:
12411240
version "0.6.2"
12421241
resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
@@ -2305,21 +2304,22 @@ fbjs@^0.8.4, fbjs@^0.8.9:
23052304
setimmediate "^1.0.5"
23062305
ua-parser-js "^0.7.9"
23072306

2308-
"fielddb@https://github.com/FieldDB/FieldDB.git":
2309-
version "5.5.29"
2310-
resolved "https://github.com/FieldDB/FieldDB.git#aecbdbc31af188777b8e313eba81cc2b9b13b359"
2307+
fielddb@5.121.19-rc0:
2308+
version "5.121.19-rc0"
2309+
resolved "https://registry.yarnpkg.com/fielddb/-/fielddb-5.121.19-rc0.tgz#b9cddb3dbd8eafb16c63f85f06cd605f2bc3198c"
2310+
integrity sha512-14kciRrjmRICFdoHBq3Ws8x2N/uaogA+l2h94lDQ+7xd3y9lE2WIl/EhWhCCz8+bNIVHIcAiiyuxb5KxX05m5g==
23112311
dependencies:
2312-
atob "^1.1.2"
2312+
atob "^2.1.2"
23132313
bcryptjs "^2.4.3"
23142314
browserify-mime "^1.2.9"
23152315
btoa "^1.1.2"
23162316
diacritics "^1.2.3"
23172317
directory-tree "^1.1.0"
2318-
frb "git://github.com/cesine/frb.git#contenteditable"
23192318
md5 "^2.0.0"
23202319
q "^1.4.1"
23212320
recordmp3js "^0.5.0"
23222321
textgrid "^2.2.0"
2322+
x2js "^3.1.1"
23232323

23242324
figures@^1.3.5:
23252325
version "1.7.0"
@@ -2505,12 +2505,6 @@ forwarded@~0.1.0:
25052505
version "0.1.0"
25062506
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
25072507

2508-
"frb@git://github.com/cesine/frb.git#contenteditable":
2509-
version "0.2.17"
2510-
resolved "git://github.com/cesine/frb.git#ec454ce9bf646cba2313eaf9e64bf1379d9dda27"
2511-
dependencies:
2512-
collections "~0.2.2"
2513-
25142508
fresh@0.5.0:
25152509
version "0.5.0"
25162510
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
@@ -6451,10 +6445,6 @@ wbuf@^1.1.0, wbuf@^1.7.2:
64516445
dependencies:
64526446
minimalistic-assert "^1.0.0"
64536447

6454-
weak-map@1.0.0:
6455-
version "1.0.0"
6456-
resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.0.tgz#b66e56a9df0bd25a76bbf1b514db129080614a37"
6457-
64586448
webidl-conversions@^2.0.0:
64596449
version "2.0.1"
64606450
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -6650,6 +6640,13 @@ write@^0.2.1:
66506640
dependencies:
66516641
mkdirp "^0.5.1"
66526642

6643+
x2js@^3.1.1:
6644+
version "3.4.0"
6645+
resolved "https://registry.yarnpkg.com/x2js/-/x2js-3.4.0.tgz#1414ad99062705086a4838e8dde4ecd06e8bd3a9"
6646+
integrity sha512-1tozn7D51ghz2DAiy5U6R55qn9x2F3lHUxusOD0QtYlLSDGxyXjHfn0c508eXG1D7s8qqj54SiU5HsPEfhDIpg==
6647+
dependencies:
6648+
xmldom "^0.1.19"
6649+
66536650
xdg-basedir@^2.0.0:
66546651
version "2.0.0"
66556652
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2"
@@ -6660,6 +6657,11 @@ xdg-basedir@^2.0.0:
66606657
version "2.0.1"
66616658
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
66626659

6660+
xmldom@^0.1.19:
6661+
version "0.1.31"
6662+
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
6663+
integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
6664+
66636665
"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
66646666
version "4.0.1"
66656667
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

0 commit comments

Comments
 (0)