Oleksandr Zhurbenko
|
b52738be8e
|
Ran linter and autofixed most of the warnings in the new React code
|
2016-04-22 16:19:17 -07:00 |
|
Oleksandr Zhurbenko
|
8a97afb89e
|
Removed code and files which are not used anymore
|
2016-04-22 15:09:46 -07:00 |
|
Oleksandr Zhurbenko
|
046c9d376b
|
Partially adopted Meteor's recommended file structure
|
2016-04-22 14:19:20 -07:00 |
|
Oleksandr Zhurbenko
|
5b5f06d714
|
Upgraded Meteor to 1.3.2.4
|
2016-04-21 14:30:54 -07:00 |
|
Oleksandr Zhurbenko
|
6cd0de19f9
|
Added necessary imports and temporary styling to make it all work after the merge
|
2016-04-21 12:21:01 -07:00 |
|
Oleksandr Zhurbenko
|
92d262a104
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
Conflicts:
bigbluebutton-html5/.meteor/packages
bigbluebutton-html5/app/.meteor/versions
bigbluebutton-html5/app/client/main.js
bigbluebutton-html5/app/client/main.jsx
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/client/main.jsx
bigbluebutton-html5/client/views/chat/chat_bar.html
bigbluebutton-html5/client/views/chat/chat_bar.js
bigbluebutton-html5/client/views/whiteboard/slide.js
bigbluebutton-html5/client/views/whiteboard/whiteboard.js
bigbluebutton-html5/server/collection_methods/shapes.js
bigbluebutton-html5/server/redispubsub.js
bigbluebutton-html5/server/server.js
|
2016-04-20 16:09:47 -07:00 |
|
gcampes
|
a39a2cfac1
|
Fix user-list fade-in animation on mobile
|
2016-04-06 10:09:10 -03:00 |
|
gcampes
|
0777bc7cb6
|
Fix an issue with the emoji status resulted from the last merge
|
2016-04-06 10:09:04 -03:00 |
|
gcampes
|
126b28d432
|
Adds emoji status icons to the react user list component
|
2016-04-06 10:08:52 -03:00 |
|
Maxim Khlobystov
|
76aa113dda
|
Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.
Conflicts:
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/client/views/whiteboard/whiteboard.js
bigbluebutton-html5/server/collection_methods/users.js
bigbluebutton-html5/server/server.js
|
2016-04-06 10:08:08 -03:00 |
|
Maxim Khlobystov
|
1c311fb9cf
|
Combined two npm configuration files together and put it into the root directory of HTML5 client (required by Meteor to recognize the location of packages installed).
|
2016-04-06 10:05:52 -03:00 |
|