Oswaldo Acauan
|
1c0132ed5b
|
Merge after git conflict/lost object
|
2016-07-11 12:34:58 +00:00 |
|
Oleksandr Zhurbenko
|
e39963d4de
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
Conflicts:
bigbluebutton-html5/package.json
|
2016-06-02 15:20:41 -07: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 |
|
Oleksandr Zhurbenko
|
ba7cdca648
|
Added fade in for the slides and a default content
|
2016-05-30 11:12:02 -07:00 |
|
Oleksandr Zhurbenko
|
50597726d9
|
Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure
|
2016-05-26 09:37:54 -07:00 |
|
Oleksandr Zhurbenko
|
1c4c2befb3
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
Conflicts:
bigbluebutton-html5/Gruntfile.js
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/imports/ui/chat/Chat.jsx
bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
bigbluebutton-html5/imports/ui/shared/Button.jsx
bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
bigbluebutton-html5/package.json
bigbluebutton-html5/server/collection_methods/shapes.js
bigbluebutton-html5/server/collection_methods/slides.js
bigbluebutton-html5/server/server.js
|
2016-05-25 15:04:20 -07:00 |
|
Oswaldo Acauan
|
216bfd2ac2
|
Fix nav-bar userlist toggle icon
|
2016-05-20 13:39:58 -03:00 |
|
Anton Georgiev
|
dd075faa2e
|
config updates
|
2016-05-27 14:30:16 -04:00 |
|
Oleksandr Zhurbenko
|
0bfc8ceede
|
Retrieving slide dimensions on the server side
|
2016-05-13 11:01:29 -07: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 |
|
Anton Georgiev
|
699fde7344
|
accommodate for poll and deskshare
|
2016-05-10 20:25:24 +00:00 |
|
Anton Georgiev
|
bfd4afd07d
|
Users collection now available on client side
|
2016-05-09 21:19:45 +00:00 |
|
Maxim Khlobystov
|
726015d172
|
Made sure JSCS only reruns on modified files.
|
2016-05-05 18:09:13 -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 |
|
Maxim Khlobystov
|
2831e3d414
|
Added CSS modules support and adjusted the userlist to work with encapsulated Sass.
|
2016-04-27 14:30:45 -04:00 |
|
Oleksandr Zhurbenko
|
5b5f06d714
|
Upgraded Meteor to 1.3.2.4
|
2016-04-21 14:30:54 -07:00 |
|
Maxim Khlobystov
|
f675681ce4
|
Set Grunt to rerun the syntax check on any JS/JSX file change.
|
2016-04-06 10:08:42 -03:00 |
|
Maxim Khlobystov
|
f2dcb7b96c
|
Got rid of unused Grunt plugins.
|
2016-04-06 10:08:29 -03:00 |
|
Maxim Khlobystov
|
69df37265d
|
Incorporated linting into the build process.
|
2016-04-06 10:06:08 -03:00 |
|
Maxim Khlobystov
|
30b6a3c5b7
|
Added lint checking to the HTML5 client.
|
2016-04-06 10:06:02 -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 |
|
Maxim Khlobystov
|
65d2c56f8f
|
Added the ability to run Jasmine tests with a single command.
|
2015-11-21 22:34:58 -08:00 |
|
Maxim Khlobystov
|
5a91abe468
|
Made Grunt work without additional step of making grunt command recognizable (added grunt-cli to the default installation).
|
2015-11-21 22:18:33 -08:00 |
|
Anton Georgiev
|
d830e3358d
|
move the HTML5 client code outside of labs
|
2015-03-05 17:55:23 +00:00 |
|