Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Upgrade strophe #385

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Upgrade strophe #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39fa9be
Use upstream strophejs-plugins
benlangfeld Apr 7, 2015
80e058f
Upgrade to latest Strophe.js release
benlangfeld Apr 15, 2015
d977990
Released StropheJS has a bug in AMD definition
benlangfeld Apr 15, 2015
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
9 changes: 6 additions & 3 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@
"tests"
],
"dependencies": {
"jquery": "~1.10.2",
"strophe": "1.1.3",
"strophejs-plugins": "benlangfeld/strophejs-plugins#30fb089457addc37e01d69c3536dee868a90a9ad",
"jquery": "~1.11.0",
"strophe": "strophe/strophejs#72914b87f56cf12e5e6a40c293cb9c6397bc7d16",
"strophejs-plugins": "strophe/strophejs-plugins#39d67d66e900bce8b990d9214bffe6593a96ddf7",
"mustache": "0.3.0",
"jquery-i18n": "1.1.1"
},
"resolutions": {
"strophe": "72914b87f56cf12e5e6a40c293cb9c6397bc7d16"
}
}
2 changes: 1 addition & 1 deletion tests/intern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ define({
// Packages that should be registered with the loader in each testing environment
packages: [
{ name: 'candy', location: '.' }
, { name: 'jquery', location: 'bower_components/jquery', main: 'jquery' }
, { name: 'jquery', location: 'bower_components/jquery/dist', main: 'jquery' }
, { name: 'sinon', location: 'node_modules/sinon/lib', main: 'sinon' }
, { name: 'sinon-chai', location: 'node_modules/sinon-chai/lib', main: 'sinon-chai' }
, { name: 'lolex', location: 'node_modules/lolex', main: 'lolex' }
Expand Down