BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83ac942452
bigbluebutton-Github/bigbluebutton-html5
History
Richard Alam a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
..
.meteor Change cursor and annotation to user streams and add optimistic updates 2018-05-28 14:46:14 -03:00
client make window title configurable 2018-06-01 18:31:41 +00:00
imports Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-06 08:23:13 -07:00
private make window title configurable 2018-06-01 18:31:41 +00:00
public Merge remote-tracking branch 'upstream/v2.0.x-release' into implement-feedback-screen 2018-04-27 11:35:33 -03:00
server Fixed HTML5 video API import 2017-11-17 18:55:59 +00:00
tests/webdriverio Improved the naming of the test cases / screenshot files. 2018-01-22 18:32:29 -05:00
.babelrc Integrated babel-plugin-react-remove-properties for Selenium tests 2017-11-04 00:38:44 -07:00
.eslintignore Improve ESLint rules 2017-06-02 20:42:13 +00:00
.eslintrc.js Add missing packages and fix formating 2017-06-05 13:26:47 +00:00
.gitignore
package-lock.json add re-resizable package 2018-04-28 10:48:33 -07:00
package.json add re-resizable package 2018-04-28 10:48:33 -07:00
transifex.sh do not pull the source file en.json 2018-01-25 11:41:25 -05:00