BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,959 Commits 13 Branches 260 Tags 1.1 GiB
d2cf4f0439
Commit Graph

903 Commits

Author SHA1 Message Date
Klaus
ccf4b1ba21 Fix locales problems 2017-09-22 14:23:25 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase 
[HTML5] changed string id to camelCase
 2017-09-01 10:05:50 -04:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Oswaldo Acauan
507bb61fb2 Change user-list width 2017-07-18 10:55:19 -03:00
Anton Georgiev
bc9083c0cf Merge pull request #4109 from Klauswk/fix-sass-path 
[HTML5 - 2.0] Change relative path of the sass imports to absolute
 2017-07-17 14:58:02 -04:00
Klaus
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00
Klaus
2343ef3f1f Add missing merge file 2017-07-17 13:38:18 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Anton Georgiev
d2d6e1d029 Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics 
[HTML5] - Accessibility Contrast & Semantic Fixes
 2017-07-14 15:17:49 -04:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
KDSBrowne
efd933bf28 change $color-white to #fff 2017-07-11 07:08:49 -07:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
KDSBrowne
0dfa9ca446 Ensures aria-hidden='true' is not present on the document body 2017-07-06 08:30:50 -07:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
KDSBrowne
33da4d391e add missing lang attribute 2017-07-04 07:32:22 -07:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
JaeeunCho
607a3f4e5d HTML5 - put the order at media class 2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -07:00
JaeeunCho
8b6f8e857c HTML5 - removed unused media query 2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
Anton Georgiev
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title 
Tested, seems fine
 2017-05-12 11:53:42 -04:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6 Fix auth and user kick, HTML5 closes #3844 #3828 2017-04-25 14:04:17 -03:00
Anton Georgiev
d7a61a8a7e Merge pull request #3801 from JaeeunCho/userlist_truncate 
HTML5 - Truncate user name and chat name
 2017-04-24 15:02:16 -04:00
Anton Georgiev
40d0417b9d resolve lint warnings on modified files 2017-04-19 16:52:50 -04:00
Anton Georgiev
67700f605b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-19 11:22:48 -04:00
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
KDSBrowne
2b8c9812ee fix merge conflict 2017-04-17 06:34:11 -07:00
Anton Georgiev
47f1ad0ed5 fix missing import causing breakouts to not work 2017-04-12 15:29:47 -04:00
KDSBrowne
e316f38cda fix merge conflicts 2017-04-11 07:07:49 -07:00
Jaeeun Cho
f9ead27954 Update styles.scss 2017-04-10 15:40:41 -04:00
JaeeunCho
88cccc41ee HTML5 - fixed size for userName 2017-04-10 12:32:48 -07:00
KDSBrowne
a5f1857c67 add descriptions to defined messages 2017-04-10 08:50:03 -07:00
KDSBrowne
7e96f7062f replace FormattedMessage component with definedMessages 2017-04-07 05:44:05 -07:00
Anton Georgiev
c257839e5b Merge pull request #3753 from KDSBrowne/actions-button-fix 
[HTML5] - Actions Button Fix
 2017-04-07 08:08:14 -04:00
KDSBrowne
8469691256 fix slide control and actionbar btn overlap 2017-04-06 08:13:28 -07:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
gcampes
f0ac39f420 Merge remote-tracking branch 'upstream/master' into settings-refactor 
* upstream/master: (63 commits)
  add styles for separator
  In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
  Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
  - escape all user passed strings
  - display length of recording in minutes instead of milliseconds
  - fix window size  - run dos2unix to remove ^M but it formatted the whole file :(
  - add dimension of screen share
  add formatted message for close chat link
  add formatted message for userlist toggle btn label
  remove unused import
  fix DropdownListSeparator to work with NVDA
  remove local storage usage and add separator
  change role from section to region
  add menu item separation NVDA fiendly
  add formatted messages and remove generic divs
  remove direct DOM manipulation
  remove span element
  add aria-label for unread messages
  add missing import to fix JoinAudio Btn
  fix lint issues
  ...
 2017-04-05 13:56:07 -03:00
gcampes
1a15f83690 adds settings service 2017-03-28 15:41:48 -03:00
Anton Georgiev
9e55ddbbe8 resolve issue with contentLabel missing in modal 2017-03-28 10:48:34 -04:00
KDSBrowne
f7cf86ddf0 change role from section to region 2017-03-27 14:57:05 -07:00
Anton Georgiev
7a45a8467b add Audio container and use for modal 2017-03-27 16:40:44 -04:00
KDSBrowne
782deb6525 add formatted messages and remove generic divs 2017-03-27 12:49:46 -07:00
Anton Georgiev
3107f3cae3 move audio-notifications under audio/ 2017-03-24 12:38:49 -04:00
Anton Georgiev
8bb1386699 moved audio-modal and audio-settings under audio/ 2017-03-24 12:01:35 -04:00
KDSBrowne
eb3ac219e9 fix merge conflicts 2017-03-24 07:25:25 -07:00
Oleksandr Zhurbenko
0120e3cfe2 Added a missing import 2017-03-23 09:19:02 -07:00
KDSBrowne
2d876550db merge with master 2017-03-23 07:16:47 -07:00
Oswaldo Acauan
72dc94ab31 Remove old Kicked screen in favor of the new error screen 2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03 Refactor Auth logout and credentials getter 2017-03-17 14:23:00 +00:00
Oswaldo Acauan
f020964c50 Fix merge conflicts 2017-03-16 20:25:14 +00:00
Oswaldo Acauan
22bb1adab2 Refactor of the chat notification for unread messages 2017-03-16 19:57:45 +00:00
Oswaldo Acauan
8d21c435b5 Refactor of the App component 2017-03-16 16:52:43 +00:00
Anton Georgiev
9315b79b6c apply recommendations from pr comments 2017-03-15 12:21:26 -04:00
KDSBrowne
c4e8dffdb7 add landmark roles and labels 2017-03-15 08:24:57 -07:00
Anton Georgiev
ae7aa7b3df don't allow kick user in breakout rooms 2017-03-14 16:57:22 -04:00
Oswaldo Acauan
528be3979e Fix merge conflicts 2017-03-13 17:19:43 +00:00
Oswaldo Acauan
d6780c3013 Refactor Authentication flow 2017-03-10 18:33:46 +00:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
gcampes
420918abe8 merge conflicts 2017-02-24 17:28:42 -03:00
gcampes
3c02848478 hide moderator settings, implement default settings 2017-02-24 17:19:53 -03:00
gcampes
f941eaea3d solve closed captions settings issue, continue settings implementation 2017-02-21 17:29:36 -03:00
Anton Georgiev
1577fbd35a Merge pull request #3591 from oswaldoacauan/refactor-api-captions 
[HTML5] Refactor API Closed Captions
 2017-02-17 13:21:20 -05:00
Anton Georgiev
ad80d31b9a instead of detecting user remove, track breakout end => close tab 2017-02-09 16:28:41 -05:00
Anton Georgiev
577809b5a3 close breakout room tab when expired 2017-02-08 14:56:29 -05:00
Anton Georgiev
7ad046d8be Merge pull request #3607 from KDSBrowne/Audio-Err-Notification 
Audio Error notification
 2017-02-02 15:37:05 -05:00
Oswaldo Acauan
b1348fbfb8 Merge remote-tracking branch 'upstream/master' into refactor-api-captions 
* upstream/master:
  bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
  Cleanup formatting of port for nginx in bbb-conf --check
  fixed userlist and chat scrolling in Firefox
  Escaping Java's properties file instructions
  In recording playback, chat links open in a new tab
  cleanup
  limit sound on unread chat via Settings and Config
 2017-02-01 15:28:45 +00:00
KDSBrowne
61de5fe393 add user notification for audio failure 2017-01-25 11:52:17 -08:00
Oleksandr Zhurbenko
86c2cced74 Fixed closed-captions view box placement 2017-01-24 22:40:39 -08:00
Anton Georgiev
1b950f5e78 limit sound on unread chat via Settings and Config 2017-01-24 17:32:25 -05:00
JaeeunCho
1ae6738cf0 HTML5 - moved the openChats() to outside of container 2017-01-20 09:50:03 -08:00
JaeeunCho
8312cee1a0 HTML5 - added openChat() in createContainer() 2017-01-17 14:09:32 -08:00
JaeeunCho
5cb5b98562 HTML5 - did lint code 2017-01-16 13:24:21 -08:00
JaeeunCho
5e2fa0fc09 HTML5 - changed componentDidUpdate() and added params 2017-01-16 10:03:02 -08:00
JaeeunCho
81a033c2fd HTML5 - added checking prevProps is undefined 2017-01-16 07:56:21 -08:00
JaeeunCho
cdea93ad80 HTML5 - added playing sound automatically when the user gets new messages 2017-01-13 15:57:29 -08:00
JaeeunCho
8ef2959ee6 HTML5 - changed file because of conflict 2017-01-13 15:04:22 -08:00
Oleksandr Zhurbenko
40b8462c52 Minor fixes 2016-12-23 10:49:17 -08:00
Oleksandr Zhurbenko
bb1a8b09b8 Display closed-captions box based on the value from the Session storage 2016-12-22 16:44:31 -08:00
JaeeunCho
e92e75564a HTML5 Client - changed sound for unreadMessages function from nav-bar to app 2016-12-22 15:34:20 -08:00
Oleksandr Zhurbenko
875023eb03 Styled the closed-captions box 2016-12-20 15:54:39 -08:00
Oswaldo Acauan
e2aaf1690d Fix navbar and actions-bar padding so titles are aligned 2016-12-06 17:17:09 -02:00
Oswaldo Acauan
644ae8eccf Update navbar/actions-bar paddings 2016-12-06 10:50:32 -02:00
Oswaldo Acauan
4c55ea5732 Match actions-bar and navbar paddings 2016-12-05 18:36:57 -02:00
Oswaldo Acauan
3da2f1c80d Add padding to the media container 2016-12-05 16:21:35 -02:00
gcampes
b3c9d60182 Redo some breakouts code 2016-11-25 14:06:36 -02:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Gabriel Carvalho de Campes
e8974fe929 Add initial file structure for breakouts api 2016-10-27 15:47:40 -02:00
Oswaldo Acauan
957d8ad125 Remove unused parameter on clearModal 2016-09-21 19:18:13 +00:00
Oswaldo Acauan
1f5b414883 Fix modal opening every route transition 2016-09-21 19:13:59 +00:00
Gabriel Carvalho de Campes
0cc29d13b1 Polish code 2016-09-14 14:48:50 -03:00
Gabriel Carvalho de Campes
5f8ce76e1e Removes white line from app service 2016-09-12 17:28:57 -03:00
Gabriel Carvalho de Campes
60d545d434 Removes comment from app service 2016-09-12 17:18:36 -03:00
Gabriel Carvalho de Campes
f4c8282ebf Changes dropdown for actions on userlist 2016-09-12 17:12:20 -03:00
Gabriel Carvalho de Campes
2b0cdfe6f9 Changes actions to use new dropdown WIP 2016-09-07 17:25:46 -03:00
Gabriel Carvalho de Campes
af4167c480 merge conflicts 2016-09-07 14:14:49 -03:00
Oswaldo Acauan
942e16951d Remove unused constructor 2016-09-06 19:29:04 +00:00
Gabriel Carvalho de Campes
a7c13c8378 positions the dropdown in the correct position for the user actions 2016-09-01 20:30:11 +00:00
Oswaldo Acauan
249dd85f92 Move old settings modal to the new component 2016-09-01 13:56:41 +00:00
Matthew Marangoni
43f7369806 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-25 11:12:40 -07:00
Gabriel Carvalho de Campes
2b81f071cd Merge branch 'userlist-compact-mode' into compact-userlist 
* userlist-compact-mode:
  finishes initial ui for the compact userlist
  adds some compact states in the userlist
 2016-08-25 17:57:30 +00:00
Gabriel Carvalho de Campes
1d8f859e74 finishes initial ui for the compact userlist 2016-08-25 17:50:37 +00:00
Matthew Marangoni
526923c59e renamed all settings modal files to match conventions 2016-08-24 16:00:38 -07:00
Gabriel Carvalho de Campes
39b4b9676a adds some compact states in the userlist 2016-08-24 18:56:06 +00:00
Jaeeun Cho
8eddccc66c HTML5 dropdown for settings menu 2016-08-24 07:17:30 -07:00
Jaeeun Cho
0eca848647 Dropdown with dropdown_v3 branch 2016-08-23 12:18:49 -07:00
Jaeeun Cho
0605c61ba7 Merge remote-tracking branch 'upstream/master' into dropdown_v3 2016-08-23 07:10:50 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -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
Oswaldo Acauan
390d00015e Add notification bar and show notification for bad connection status 2016-08-09 16:28:49 +00:00
Jaeeun Cho
2b4076493c Merge remote-tracking branch 'upstream/master' into dropdown for settings 2016-08-05 17:29:51 -04:00
Jaeeun Cho
a097afe8a0 add dropdown menu for settings 2016-08-05 17:05:15 -04:00
Oswaldo Acauan
6f9c4219ad Fix typo 2016-07-28 19:57:42 +00:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
d510907179 Upgraded Meteor to 1.4 2016-07-27 14:50:35 -07:00
Oleksandr Zhurbenko
fd0247d719 Injected initial component for the closed-captions 2016-07-22 17:12:31 -07:00
Oleksandr Zhurbenko
a3fa660bc5 Removed unused code 2016-07-22 11:47:54 -07:00
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +00:00
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oswaldo Acauan
306ef94237 Fix conflicts 2016-07-12 14:02:48 +00:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
bcfa3d41ec Linting 2016-07-08 16:13:26 -07:00
Gabriel Carvalho de Campes
537d8753fe Merge remote-tracking branch 'origin/master' into router-changes 
* origin/master:
  upgrade sip.js to 0.7.5
  Moved polling files back to components folder
  Fixed a small issue with reduce() in the poll annotation
  Made polling buttons accessible
  Updated packages and fixed some of the warnings introduced by React 15.2.0
  Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
  Centering polling buttons
  Title and calculated styling for the polling UI
  Mark open chat as active
  Remove some old code
  Changes the way user actions are rendered
  Replaced polling under the whiteboard
  Solve issues from github comments
  Remove color-generator because it is not being used
  polish code
  Updates the userlist

Conflicts:
	bigbluebutton-html5/imports/ui/components/app/container.jsx
 2016-07-08 11:59:05 +00:00
Oswaldo Acauan
03aa1aada3 Fix some chat styles 2016-07-07 18:16:08 +00:00
Gabriel Carvalho de Campes
6c4eae35bb Adds link to meteor issue on comment, remove unused import 2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes
e8f1a877c4 Remove logs, and add some removed code back 2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855 Changes Router in order for the livereloading to work again 2016-07-07 14:01:40 +00:00
Gabriel Carvalho de Campes
7f8f4417e4 try to fix the reload issue 2016-07-05 18:59:18 +00:00
Oleksandr Zhurbenko
4bd63fd79f Updated packages and fixed some of the warnings introduced by React 15.2.0 2016-07-04 17:06:18 -07:00
Oleksandr Zhurbenko
f26ab0ac52 Title and calculated styling for the polling UI 2016-06-30 15:21:46 -07:00
Oleksandr Zhurbenko
83fff53269 Replaced polling under the whiteboard 2016-06-29 15:00:06 -07:00
Jaeeun Cho
eded89d5f0 fixes html5 clinet logout and nav-bar 2016-06-28 14:50:44 -04:00
Jaeeun Cho
3d36d3fed2 fixes html5 clinet logout and nav-bar 2016-06-24 19:09:32 -04:00
Jaeeun Cho
73c9898698 fixes html5 clinet logout and nav-bar 2016-06-17 18:15:11 -04: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
d642cb1c99 Add chat send message functionality 2016-06-02 15:40:27 -03:00
Oswaldo Acauan
f39b7171af Move session/auth logic to separated services 2016-06-02 10:46:35 -03:00
Oleksandr Zhurbenko
06e18808b3 Fixed a layout bug for the Firefox 2016-06-01 14:59:10 -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
gcampes
ce32ae5b20 Merge branch 'html5-new-userlist' into html-userlist 2016-05-31 08:37:14 -03:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
7aac407e35 Remove unnecessary component background colors 2016-05-20 10:41:15 -03:00
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03:00
gcampes
18e4f98f1d Adds html5 new userlist, WIP 2016-05-19 15:22:56 -03:00
perroned
4adad8bb32 Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-13 14:54:19 -05:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
8a6fc308da avoid race cond when subscribing for data 2016-05-13 14:34:29 +00:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00
perroned
3e0c3d1ee1 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-12 14:30:46 -05:00
Anton Georgiev
ecd3b3de17 log in user properly 2016-05-12 19:22:51 +00: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
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
3971bdb548 Lints 2016-05-12 11:10:43 -05:00
perroned
dff3dd2436 Moves serverCall to imports service api 2016-05-12 11:10:20 -05:00
perroned
f1f24acda8 Adds some services 2016-05-12 10:43:09 -05:00
perroned
666c96dab9 Adds server call wrapper to service 2016-05-12 10:41:51 -05:00
perroned
38d2bff789 Loads sip li. Adds audio tag 2016-05-11 15:43:07 -05:00
Anton Georgiev
699fde7344 accommodate for poll and deskshare 2016-05-10 20:25:24 +00:00
Anton Georgiev
298927cf4f Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/collections/collections.js
	bigbluebutton-html5/imports/api/meetings/server/meetings.js
	bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/startup/server/helpers.js
	bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
	bigbluebutton-html5/imports/startup/server/publish.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
	bigbluebutton-html5/server/server.js
 2016-05-10 19:39:01 +00:00
Anton Georgiev
45342b8a04 restructure; subscribe for remaining collections 2016-05-10 18:53:05 +00:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00
Anton Georgiev
76d599eb32 join route handled via localStorage 2016-05-06 19:12:28 +00:00
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
Anton Georgiev
b95c380b56 working on join route 2016-05-06 15:34:00 +00:00
perroned
d602a66d7f Begins adding modals 2016-05-05 16:14:39 -05:00
perroned
f8893d61da Cleans polling 2016-05-05 14:50:11 -05:00
perroned
e9b5e11ac2 Begins adding polling component 2016-05-05 13:50:18 -05:00
Oswaldo Acauan
2d57d7cbed Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -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