KDSBrowne
|
7e718d0a75
|
changed functions to start with lowercase
|
2016-10-07 10:12:18 -07:00 |
|
KDSBrowne
|
720c16f3ac
|
Moved over the previous solution to the server side and cleaned up the code
|
2016-10-07 09:36:27 -07:00 |
|
KDSBrowne
|
b811f01ad1
|
Fixed lint issues
|
2016-10-03 08:10:20 -07:00 |
|
KDSBrowne
|
d2cc6e1b18
|
Localization update
|
2016-10-02 08:46:15 -07:00 |
|
Oleksandr Zhurbenko
|
f64ed1fd4a
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
|
2016-08-20 16:37:11 -07:00 |
|
Richard Alam
|
dcd226dc9f
|
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
|
2016-08-09 14:26:40 +00:00 |
|
Lajellu
|
219078f49d
|
adds slide controls and new bbb icons
|
2016-08-02 15:55:20 -07:00 |
|
Oleksandr Zhurbenko
|
d510907179
|
Upgraded Meteor to 1.4
|
2016-07-27 14:50:35 -07:00 |
|
Lajellu
|
bd46e8c2ff
|
adds new icons
|
2016-07-26 14:28:58 -07:00 |
|
perroned
|
2a23778ea9
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
|
2016-07-22 19:20:00 +00:00 |
|
Oleksandr Zhurbenko
|
8c37e10ee0
|
Set a viewport
|
2016-07-11 12:10:30 -07:00 |
|
perroned
|
0ab36e8ec3
|
Cleaning up
|
2016-06-20 15:59:48 +00:00 |
|
perroned
|
86035fce39
|
Adds verto manager window functions
|
2016-06-17 17:47:24 +00:00 |
|
perroned
|
a95ed82293
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
|
2016-06-15 20:07:42 +00:00 |
|
perroned
|
c2702522ca
|
Upgrades html5 client for new verto code
|
2016-06-08 20:09:43 +00:00 |
|
Oswaldo Acauan
|
c7225d9738
|
Add i18n to chat form
|
2016-06-02 17:32:42 -03:00 |
|
Oswaldo Acauan
|
378c94ce7b
|
Resolve merge conflicts
|
2016-06-01 13:45:01 -03:00 |
|
Oswaldo Acauan
|
1d8a36564d
|
Add base components and style for Chat
|
2016-06-01 13:33:19 -03:00 |
|
gcampes
|
ce32ae5b20
|
Merge branch 'html5-new-userlist' into html-userlist
|
2016-05-31 08:37:14 -03:00 |
|
perroned
|
c8fdf66099
|
Lints
|
2016-05-27 16:34:03 +00:00 |
|
perroned
|
393b49fdbe
|
Cleans up duplicate code
|
2016-05-27 16:17:16 +00:00 |
|
perroned
|
8fc4c98090
|
Fixes race condition while loading verto libs
|
2016-05-26 20:46:11 +00:00 |
|
perroned
|
53fdb67652
|
Loads jquery json lib
|
2016-05-26 19:58:30 +00:00 |
|
perroned
|
c1adc40315
|
Fix library loading callback
|
2016-05-26 19:57:44 +00:00 |
|
perroned
|
d57fc2ed44
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
|
2016-05-24 14:02:25 +00:00 |
|
Oswaldo Acauan
|
a69d7faab9
|
Add iconRight option to Button component
|
2016-05-20 11:49:28 -03:00 |
|
Oswaldo Acauan
|
d81cb28f35
|
Add new component button and some basic styles
|
2016-05-20 10:37:19 -03:00 |
|
perroned
|
2d0ea2a15d
|
Load verto libs
|
2016-05-19 20:18:05 +00:00 |
|
gcampes
|
18e4f98f1d
|
Adds html5 new userlist, WIP
|
2016-05-19 15:22:56 -03:00 |
|
perroned
|
dc3dd43f1a
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/api/polls/polls.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
|
2016-05-12 13:58:06 -05:00 |
|
Anton Georgiev
|
783f150442
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/imports/startup/client/routes.js
|
2016-05-12 18:08:44 +00:00 |
|
perroned
|
3971bdb548
|
Lints
|
2016-05-12 11:10:43 -05:00 |
|
perroned
|
38d2bff789
|
Loads sip li. Adds audio tag
|
2016-05-11 15:43:07 -05:00 |
|
Anton Georgiev
|
1c50be53a3
|
fix fonts path
|
2016-05-11 18:30:24 +00:00 |
|
perroned
|
587627562c
|
Fixes some api structure
|
2016-05-10 10:23:22 -05:00 |
|
perroned
|
4a7938e1c0
|
Adds settings and styling
|
2016-05-06 12:46:14 -05:00 |
|
Maxim Khlobystov
|
67bb61c975
|
Code style cleanup.
|
2016-05-05 18:30:57 -04:00 |
|
Oswaldo Acauan
|
ddd38c57ac
|
Add i18n, modular layouts and basic styles
|
2016-05-03 17:40:46 -03:00 |
|
Oswaldo Acauan
|
01860a8804
|
Add basic styles for new design
|
2016-05-02 19:42:54 -03:00 |
|
Oswaldo Acauan
|
7d31eb43f9
|
Switch from ion-router to react-router
|
2016-04-28 15:57:14 -04:00 |
|
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 |
|