Anton Georgiev
|
eddef1e1b6
|
incorrectly merged these
|
2016-05-04 22:19:41 +00:00 |
|
Anton Georgiev
|
0deaadfd87
|
Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/client/MainContainer.jsx
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/client/lib/bbb_api_bridge.js
bigbluebutton-html5/client/whiteboard_models/whiteboard_paper.js
bigbluebutton-html5/imports/ui/chat/Chat.jsx
bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
bigbluebutton-html5/imports/ui/userlist/UserListService.js
bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
bigbluebutton-html5/imports/ui/whiteboard/Slide.jsx
bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
|
2016-05-04 22:04:08 +00:00 |
|
Anton Georgiev
|
fcadb61545
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/Gruntfile.js
bigbluebutton-html5/imports/ui/chat/Chat.jsx
bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
|
2016-05-04 21:58:35 +00:00 |
|
Anton Georgiev
|
fe8f73d592
|
linting
|
2016-05-04 21:49:01 +00:00 |
|
Anton Georgiev
|
0c6c73f891
|
extract event handlers from redispubsub. rename to camelCase
|
2016-05-04 20:25:34 +00:00 |
|
Anton Georgiev
|
7b0b3eb177
|
move files to imports
|
2016-05-04 18:29:43 +00:00 |
|
Anton Georgiev
|
863fcef7f6
|
extract logger, redispubsub; export all
|
2016-05-04 17:00:57 +00:00 |
|
Oswaldo Acauan
|
2d57d7cbed
|
Rename Actionsbar and Navbar to ActionsBar and NavBar
|
2016-05-04 11:48:53 -03:00 |
|
perroned
|
0abc1fde91
|
Fixes whitespace issue
|
2016-05-03 15:02:59 -05:00 |
|
gcampes
|
86d97b59da
|
Fixes infinited tabbed line in html5 chat input controls
|
2016-05-03 16:06:59 -03: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 |
|
Maxim Khlobystov
|
88542275d8
|
Cleanup.
|
2016-04-28 18:42:04 -04:00 |
|
Anton Georgiev
|
e299281a0a
|
move collections out of Meteor
|
2016-04-28 21:10:43 +00:00 |
|
Oswaldo Acauan
|
7d31eb43f9
|
Switch from ion-router to react-router
|
2016-04-28 15:57:14 -04:00 |
|
Maxim Khlobystov
|
7504f51543
|
Cleaning up.
|
2016-04-28 14:03:18 -04:00 |
|
Maxim Khlobystov
|
4efdc5d361
|
Fixed the userlist styling.
|
2016-04-28 13:58:54 -04:00 |
|
Maxim Khlobystov
|
fad6330d39
|
Fixed the global Sass file and got back some of the missing userlist styles.
|
2016-04-28 11:44:24 -04:00 |
|
Maxim Khlobystov
|
ae26f850bc
|
Translated the main stylesheet to Sass.
|
2016-04-27 16:33:34 -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
|
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
|
22eb834d95
|
Returned tooltips
|
2016-04-22 14:57:06 -07:00 |
|
Oleksandr Zhurbenko
|
046c9d376b
|
Partially adopted Meteor's recommended file structure
|
2016-04-22 14:19:20 -07:00 |
|