Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
331 commits
Select commit Hold shift + click to select a range
4b7bd90
Merge pull request #858 from pindexis/develop
ianb Oct 11, 2013
70cc914
replace TogetherJSConfig with inteded TowTruckConfig
pindexis Oct 12, 2013
b8cf5a6
Merge pull request #859 from pindexis/develop
ianb Oct 14, 2013
bd16aee
Fix scrolling to peer (no idea why it broke)
ianb Oct 15, 2013
f9ca2c7
bug fix for cloneCLicks and dontShowClicks conflict when you want to …
de-husk Oct 15, 2013
7647128
Remove msg argument from hideOtherUrl as it is unused
Oct 17, 2013
2df34f5
Use strict equality to compare with `true`
Oct 17, 2013
e504fdb
Fixing indentation
Oct 17, 2013
51bacc4
Removing unnecessary semi-colons and adding some where needed
Oct 17, 2013
537faaf
Removing some unused variables/assignments
Oct 17, 2013
a3531e6
Merge pull request #871 from AnSavvides/develop
ianb Oct 17, 2013
04fbb1b
change the /load info
ianb Oct 17, 2013
45ceabf
force global eval()
ianb Oct 17, 2013
f250cfb
include on/off button
ianb Oct 17, 2013
b2d7ee3
merge
ianb Oct 17, 2013
a576328
Clean up to make recent pull request lint
de-husk Oct 17, 2013
54b708d
Merge pull request #874 from Samangan/develop
ianb Oct 17, 2013
938e540
adding content to the FAQ #848 #873
aarondruck Oct 17, 2013
82d1968
fix up form test
ianb Oct 17, 2013
e1023c4
Adding copy to contribute to IE
aarondruck Oct 17, 2013
3ec93f8
updating the IE copy again
aarondruck Oct 17, 2013
c9d2668
Suppress sync of password fields
ianb Oct 17, 2013
bcbcbc3
Fix warning related to scope of variable
ianb Oct 18, 2013
3fe4bc2
Week 42 changes
igoryen Oct 18, 2013
f6c7ab6
merge
ianb Oct 18, 2013
78bd147
Added strings in ru_RU and en_EN
igoryen Oct 18, 2013
687dfff
Fix substitution of localized files into templates-X.js
ianb Oct 18, 2013
1507394
fix some gettext syntax
ianb Oct 18, 2013
ac12431
Make an indirect template loader that loads the localized template. …
ianb Oct 18, 2013
35bd6f6
Merge branch 'l10n' of github.com:igoryen/togetherjs into l10n
ianb Oct 18, 2013
7c73e7d
Lang changes
igoryen Oct 18, 2013
afe7c92
Fix #855, add disableWebRTC setting to disable the audio chat button
ianb Oct 18, 2013
36f2b05
Allow modules, in tests, to be imported with an alias
ianb Oct 19, 2013
88b1c54
For #772, add a console module (though nothing is yet consuming that …
ianb Oct 19, 2013
dd65f19
Remove superfluous !!
pindexis Oct 22, 2013
4b915b3
Merge pull request #881 from pindexis/develop
ianb Oct 22, 2013
c080392
Created CONTRIBUTING.md, moved hosting section out of contributing in…
ianb Oct 22, 2013
9456d29
Add test for console
ianb Oct 22, 2013
c75902c
Fix #758, note how to set --port/etc
ianb Oct 22, 2013
67bfd3a
Fix: update togetherjs urls in the firefox addon preference
rpl Oct 23, 2013
17bf3c0
Merge pull request #883 from rpl/fix/firefox-addon-default-preferences
ianb Oct 23, 2013
d77eb4f
clear chat input before submitting message
pindexis Oct 25, 2013
47c08a5
Merge pull request #886 from pindexis/develop
ianb Oct 25, 2013
59bef41
Add Contributing file
ianb Oct 25, 2013
07c6439
Add (restore) bookmarklet (though not yet linked in)
ianb Oct 25, 2013
6b134a8
automatically made whitespace changes
ianb Oct 25, 2013
e0bbc44
Add XPI build and copy to the publish task
ianb Oct 25, 2013
148ab99
Fix condition for sending cursor-click
pindexis Oct 26, 2013
f1e520e
Merge pull request #889 from pindexis/develop
ianb Oct 26, 2013
bb6449e
fix asynchronous issue with storage module
pindexis Oct 26, 2013
4723484
added an empty youtube-videos module and its name into features variable
Oct 26, 2013
0aa9ea5
play and pause for youtube videos are synchronized
Oct 27, 2013
4d11b16
multiple issues fixed: a) videos are placed in the array in the right…
Oct 27, 2013
4637bfc
automatically detects youtube iframes
Oct 27, 2013
3db05e4
formatting storage.js
pindexis Oct 27, 2013
e226c00
add matchElement function
pindexis Oct 27, 2013
c7b6fe7
Add console.js description to the JSON module description file
ianb Oct 25, 2013
a53c17f
Templatize the less building, make it write to --dest directories pro…
ianb Oct 28, 2013
b826842
code formatting
pindexis Oct 28, 2013
d80e0e2
update index.md
pindexis Oct 28, 2013
374381a
update matchElement function
pindexis Oct 28, 2013
5d6532b
added in examples for #810
aarondruck Oct 28, 2013
6b40815
updating the images
aarondruck Oct 28, 2013
3a93e8a
deleted unncessary console logs
Oct 28, 2013
a90ad0b
module name changed from youtube-videos to youtubeVideos
Oct 29, 2013
753af5a
youtube config added
Oct 29, 2013
0cc1da9
took care of reinitialize() and replaced player and donPublish arrays…
Oct 29, 2013
4eee1c3
videos of a late guest are synchronized
Oct 29, 2013
1b213b4
synchronize when new videos are loaded in existing iframes
Oct 29, 2013
187d902
Fix recorder URL
ianb Oct 29, 2013
3ef526d
fix link from recorder.html being moved
ianb Oct 29, 2013
d3527d0
fix another link
ianb Oct 29, 2013
2314d06
save/restore chat history locally
pindexis Oct 29, 2013
3ee278f
Merge pull request #892 from pindexis/develop
ianb Oct 29, 2013
2a6e9b3
Note optimist requirement for server
ianb Oct 29, 2013
0d67ee8
add docs on how to deploy to heroku
ivarvong Oct 29, 2013
ea14d01
procfile for heroku
ivarvong Oct 29, 2013
a9fb3ef
Move defaultConfiguration to the top of togetherjs.js, because it is …
ianb Oct 29, 2013
3cc2e03
manually call onYouTubeAPIReady function if the apiwas already loaded…
Oct 29, 2013
41f3ef4
deleted unnecessary alert
Oct 29, 2013
911da6a
need optimist as a dep.
ivarvong Oct 29, 2013
a37c0a2
Merge pull request #897 from ivarvong/deploy-hub-heroku
ianb Oct 29, 2013
d1b2119
Merge branch 'develop' of github.com:mozilla/togetherjs into develop
ianb Oct 29, 2013
d53aae9
bug fixed
Oct 30, 2013
a7d077c
videos are less liekly go out of sync when they are advanced
Oct 30, 2013
d012708
Fix #856. Refactor config system to be easier to track and validate.…
ianb Oct 30, 2013
8228d1a
a new "seek" flag is introduced to prevent publishing unwanted state …
Oct 30, 2013
e96bb56
merge
ianb Oct 30, 2013
0a85a6a
Use new config system
ianb Oct 30, 2013
ccfbd7d
add/copy manual test page for youtube support
ianb Oct 30, 2013
13e6a34
Tear down YouTube listeners on close #898
Oct 31, 2013
b0ed201
a simple application that showcases youtube sync with togetherjs #899
Oct 31, 2013
6067b34
removed unnecessary files
Oct 31, 2013
3d9d02c
add a new line at the end of each file
Oct 31, 2013
3f0ff52
note new youtube option
ianb Oct 31, 2013
bd60ca4
baseUrl autodetects togetherjs-min.js too. Fix #888
Nov 1, 2013
0908969
changed the example a little bit but it needs comments before getting…
Nov 1, 2013
5d5d985
fixed fonts for #824
aarondruck Nov 1, 2013
5ead44a
updating hte dismiss button font color
aarondruck Nov 1, 2013
43ae871
Note findRoom requires a fresh tab to test
ianb Nov 4, 2013
86945c9
first step at tinymce integration
Nov 6, 2013
977609b
tinymce is synchronized, but it still needs major style fixes
Nov 7, 2013
c0739d0
More lang changes
igoryen Nov 7, 2013
ae1895f
listen to keyup and input instead of keypress
Nov 11, 2013
a09449a
Merge pull request #902 from maxsong1002/develop
ianb Nov 11, 2013
0013929
Clear youTubeIframes list on close, don't reset ids we didn't set
ianb Nov 11, 2013
6a03707
Stuff done by today
igoryen Nov 12, 2013
a7fa2e8
Remove unused leftover from a removed import
ianb Nov 13, 2013
8ecc3e9
Handle a load order case
ianb Nov 13, 2013
0040b85
declare variable
ianb Nov 13, 2013
bcd386b
Load the localized templates during test loading procedure
ianb Nov 13, 2013
1df7539
Normalize the lang setting
ianb Nov 13, 2013
fa0374d
Merge pull request #1 from ianb/l10n
igoryen Nov 14, 2013
29cfda1
remove duplicate guard
pindexis Nov 19, 2013
77dc7cb
Merge pull request #911 from pindexis/develop
ianb Nov 19, 2013
5be666d
Changes as of 131119
igoryen Nov 19, 2013
5ad3676
Typo/fix missing words in sentence.
jimt Nov 20, 2013
511ac97
Changes as of 131120
igoryen Nov 20, 2013
6adc8d5
Merge pull request #912 from jimt/patch-2
ianb Nov 20, 2013
9b5e404
Merge branch 'develop' of github.com:mozilla/togetherjs into l10n
igoryen Nov 20, 2013
a7e4911
Handle iframes with no id
ianb Nov 20, 2013
f2d857c
Handle case of iframe with no src
ianb Nov 20, 2013
fc57440
Merge on 131120 16:28
igoryen Nov 20, 2013
40205bc
prevent configuration loading when closing TogetherJS
pindexis Nov 21, 2013
762b917
add forgotten require
pindexis Nov 21, 2013
18edb6d
Merge pull request #913 from pindexis/develop
ianb Nov 21, 2013
9b50020
fix typo/spelling
jimt Nov 22, 2013
8f454ba
Merge pull request #916 from jimt/patch-2
ianb Nov 22, 2013
200172b
remove TogetherJS module session variable
pindexis Nov 22, 2013
2098c76
Merge pull request #917 from pindexis/develop
ianb Nov 22, 2013
c175eff
missing ;
ianb Nov 24, 2013
28814f3
Add self-updated session event
ianb Nov 24, 2013
7df2c68
Suppress console message about findRoom when continuing the session t…
ianb Nov 24, 2013
a4e4a6d
Fix case where element was misidentified as jQuery, and optimize a loop
ianb Nov 24, 2013
5cbb88c
Add elementType to init messages. Allow CodeMirror and AceEditor to …
ianb Nov 24, 2013
ea27001
fix issue with saving input selection
pindexis Nov 25, 2013
87620c7
Merge pull request #919 from pindexis/develop
ianb Nov 25, 2013
511361a
Tweaking - Nov 18-22
igoryen Nov 25, 2013
3f16840
Merge
igoryen Nov 25, 2013
69e1418
l10n - Changes 131125-26
igoryen Nov 26, 2013
33bf576
Cleanup
igoryen Nov 26, 2013
ce39c49
Fixed incorrect YouTube attribute
samuelmaddock Nov 27, 2013
a6d0574
Merge pull request #925 from samuelmaddock/develop
ianb Nov 27, 2013
3b30c49
youtube module fix: onStateChange event target is not a complete play…
Dec 5, 2013
f6ae69f
youtube example is fixed and included in main page; uncomment the blo…
Dec 5, 2013
9da6382
added a new line
Dec 5, 2013
c6f0970
Merge pull request #929 from maxsong1002/develop
ianb Dec 5, 2013
7ce8c8e
enable ot for rich text editors
pindexis Dec 5, 2013
51080bb
Merge pull request #930 from maxsong1002/youtubedocument
aarondruck Dec 6, 2013
d450853
updating the site wih examples, and tweaking the Youtube example
aarondruck Dec 6, 2013
f248ed5
udpating the Youtube example
aarondruck Dec 6, 2013
c9fc278
updating front page with examples
aarondruck Dec 6, 2013
5d756a2
updated the video on the site
aarondruck Dec 6, 2013
e83e919
Check for non-requirejs require
ianb Dec 6, 2013
4c73d78
Initial commit, update file structure
ekmartin Dec 8, 2013
533ed3b
Add button css
ekmartin Dec 9, 2013
6503ed8
Update jsfiddle link and fix indentation
ekmartin Dec 9, 2013
34725db
Add newline to sketch.js
ekmartin Dec 9, 2013
8613622
Readd the TGJS-button
ekmartin Dec 9, 2013
2253c16
Update eraser code
ekmartin Dec 9, 2013
16a7891
"->'
ekmartin Dec 9, 2013
964293f
Forgot to remove font-awesome locally after changing to CDN
ekmartin Dec 9, 2013
9e5cd5e
Add indentation, remove argument
ekmartin Dec 9, 2013
84b6904
Brush color now taken from background-color of the buttons itself
ekmartin Dec 9, 2013
062d69a
Sets canvas width and height to 1140x400
ekmartin Dec 9, 2013
11a4b37
Merge pull request #933 from ekmartin/improve_drawing
ianb Dec 9, 2013
608ce0f
Merge pull request #931 from pindexis/develop
ianb Dec 9, 2013
37b9aed
Merge remote-tracking branch 'upstream/develop' into tinymce
Dec 9, 2013
fb93795
check for undefined before calling $.each
pindexis Dec 10, 2013
3e935a1
Make the canvas responsive, improve init
ekmartin Dec 10, 2013
6a0a5d4
Add clear-button and update JSFiddle-link
ekmartin Dec 10, 2013
fe204ac
Minor fixes
ekmartin Dec 11, 2013
38db553
tinymce sync is integrated into forms.js
Dec 9, 2013
6b55e17
fix tracker attr when sending
pindexis Dec 13, 2013
e63c0e9
Merge pull request #936 from ekmartin/improve_drawing
ianb Dec 16, 2013
5d8e0df
Merge pull request #935 from pindexis/develop
ianb Dec 16, 2013
5f7affb
youtube currentTime error fixed
Dec 17, 2013
df92cab
Fixed bug for "Cannot read property 'trackerName' of undefined"
electricg Dec 19, 2013
fec3a4d
Merge pull request #939 from electricg/develop
ianb Dec 19, 2013
438b2a2
Merge pull request #938 from maxsong1002/develop
ianb Dec 19, 2013
c855605
Fix Issue #582 - Chat wrapping feels inefficient
Dec 22, 2013
846bba5
Add debugMessages and ignoreMessages configuration variables, handles…
ekmartin Jan 9, 2014
7ebf35d
Include debugMessages and ignoreMessages in the docs
ekmartin Jan 9, 2014
668d461
Add ignoreForms configuration setting
ekmartin Jan 9, 2014
e8ae60d
Update docs to include ignoreForms
ekmartin Jan 9, 2014
397f29a
Change to one configuration variable that handles debugging of consol…
ekmartin Jan 9, 2014
9d24948
Update docs, remove debugMessages-config
ekmartin Jan 9, 2014
3afc8f2
Merge pull request #943 from ekmartin/debugMessages
ianb Jan 10, 2014
7e2cb6b
Merge pull request #940 from Joshua-S/issue-582
ianb Jan 10, 2014
0c1da42
Update URL to https://togetherjs.com/
marclaporte Feb 26, 2014
3fc1f7d
Explain how to set up a server for development
divergentdave Feb 27, 2014
c540fcd
Handle Windows slashes in paths
divergentdave Feb 27, 2014
0c5950d
Add support for touch events to the drawing demo
divergentdave Feb 27, 2014
3533b95
#963 peers.url should be peer.url
Mar 6, 2014
6e7fc1b
Merge pull request #955 from marclaporte/patch-1
simonwex Mar 25, 2014
65be8a4
Merge pull request #964 from OnVelocity/develop
ianb Mar 26, 2014
8fd8efd
Merge pull request #961 from divergentdave/windows-paths
ianb Mar 26, 2014
c6a686c
Merge pull request #962 from divergentdave/drawing-touch
ianb Mar 26, 2014
5db08d8
Merge pull request #958 from divergentdave/docs
ianb Mar 26, 2014
f898cb3
Merge pull request #918 from maxsong1002/tinymce
ianb Mar 26, 2014
aabd258
merge
ianb Mar 26, 2014
ba5ec65
tinymce example page is added
Apr 11, 2014
6c07cd5
Fix locale problems
alicoding Apr 21, 2014
a6e9b03
Merge pull request #984 from alicoding/fixLangProblem
simonwex Apr 21, 2014
6ef5121
Update doc for localization support
alicoding Apr 22, 2014
7fea352
Fix $LOG_LEVEL env var, and add $LOG_FILE env var
ianb May 6, 2014
87ad1f8
Merge pull request #988 from alicoding/updateLangDoc
simonwex May 7, 2014
2b78fc0
Compatability with marked 0.2.10 and docco 0.6.3.
cscott Jul 1, 2014
445cbb3
Merge pull request #1006 from cscott/grunt-fixes
ianb Jul 1, 2014
aab280f
Fix grunt builds to non-default destinations.
cscott Jul 1, 2014
15b8705
Merge pull request #1007 from cscott/more-grunt-fixes
ianb Jul 1, 2014
e95e533
updated privacy policy link
swarnava Aug 3, 2014
473df7b
The "List of HTML" link is broken.
udeepak Aug 11, 2014
475071f
Fix jshint warnings
cscott Aug 19, 2014
57b6b24
Allow end-user configuration of baseUrl.
cscott Jul 7, 2014
896f562
Suppress 'Unknown configuration value' warning for 'lang'.
cscott Jul 7, 2014
c6c2cf3
Allow cache-busting to be disabled.
cscott Aug 14, 2014
f97bb02
Gracefully handle missing peers in old chat log history.
cscott Aug 20, 2014
7c4fab5
Fix youtube support.
cscott Aug 20, 2014
1b06a0d
Update jquery from 1.8.3 to 1.11.1.
cscott Aug 20, 2014
bb4eb7d
Update test suite; make all tests pass once more.
cscott Aug 20, 2014
52f7031
Send form-init before form-focus; make form test case more reliable.
cscott Aug 26, 2014
782332f
Hook up doctest.js to phantomjs and travis for CI testing.
cscott Aug 26, 2014
4376732
Add hixie-76 websocket support; turn on additional phantomjs tests.
cscott Aug 26, 2014
33297c9
Fixing IE 11 background-color: inherit issue
Abbe98 Aug 11, 2014
380298b
do not update form focus when urls differ
schuyler1d Aug 15, 2014
b7ae985
The `fallbackLang` configuration parameter contains an underscore.
cscott Aug 25, 2014
4429029
Create es-BO.
Jul 8, 2014
5435128
Merge pull request #1019 from udeepak/develop
Aug 28, 2014
b4835a1
Merge pull request #976 from woniesong92/tinymce
Aug 28, 2014
09f165a
Merge pull request #1016 from swarnava/patch-1
Aug 28, 2014
3499615
Language localization: fall back from en-UK to en, etc.
cscott Aug 29, 2014
8421828
The YouTube API seems to want the URL to start with https://.
cscott Aug 29, 2014
0deb84c
Replace old towtruck slogan
cscott Aug 26, 2014
febd213
Merge pull request #1026 from cscott/test-suite
Aug 30, 2014
5e8ad66
Merge pull request #1028 from cscott/misc-github-patches
Sep 6, 2014
9562ddf
#1033 - Instead of changing youtube src and reinitializing, just load…
Sep 6, 2014
ce4ef25
Merge pull request #1034 from woniesong92/develop
Sep 6, 2014
20ef9ab
#1035 - fix synchronizeVideosOfLateGuest
Sep 6, 2014
13c8360
Merge pull request #1036 from woniesong92/develop
Sep 6, 2014
da90b02
base: Fix spelling of "GitHub"
kevinji Sep 17, 2014
1147035
Update index.html
Projjol Oct 5, 2014
7777f12
Add polish locale file
leriel Nov 5, 2014
6227852
Update the URI of sessionStorage
xfq Dec 13, 2014
fac45c8
Merge pull request #1040 from mc10/patch-1
simonwex Mar 20, 2015
d9cae42
Merge pull request #1048 from xfq/patch-1
simonwex Mar 20, 2015
ec1f5ab
Merge pull request #1045 from leriel/polish-locale
simonwex Mar 22, 2015
82cc4fc
Merge pull request #1042 from Projjol/patch-1
Apr 7, 2015
b9bbf02
session.isClient fix
May 5, 2015
66e5f58
clean code and change variable declaration
May 6, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ addon/Profile
dump.rdb
app/http/public/recorder.css
build
test-build
togetherjs.mozillalabs.com
addon/togetherjs.xpi
togetherjs/togetherjs.css
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: node_js
node_js:
- "0.10"
before_install:
- npm install -g npm
- npm install -g grunt-cli
39 changes: 39 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Thanks for your interest in contributing to TogetherJS!

If you found a bug, if at all possible give us a URL where we can try
TogetherJS. Don't worry about tags or milestones or assigning the
ticket. But a URL is extremely helpful!

## Contributing

The [Contributing](https://togetherjs.com/docs/contributing.html)
document on the site gives some more information. Some relevant
points:

* [Javascript style guide](https://github.com/ianb/javascript)

* If you want to work on a ticket, please leave a comment to that
effect. It gives us a chance to suggest where you'd look in the
code to implement the feature or fix the bug, and makes it less
likely that people's contributions will conflict.

* Anything in the
[Blue Sky](https://github.com/mozilla/togetherjs/issues?milestone=23&page=1&state=open)
you are likely to find something that we're interested in having in
TogetherJS, but that we aren't working on.

* If you have an idea of your own you'd like to implement, please open
a ticket describing it. That will let other people know you are
working on it, and give other people an opportunity to give feedback
or implementation notes.

## Where to start?

You should look at the
[Contribution Wanted](https://github.com/mozilla/togetherjs/issues?labels=contribution-wanted&milestone=&page=1&state=open)
tag to see tickets that fall into two categories:

1. A good introductory task to get started on.

2. Something that requires particular skills (that the core team does
not have) that would make a contribution particular valuable.
Loading