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

66 Commits

Author SHA1 Message Date
Maxim Khlobystov
e1cad84bd5 Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui 
Conflicts:
	bigbluebutton-html5/app/client/main.coffee
 2015-05-07 19:04:51 -04:00
Maxim Khlobystov
9b4b896245 Made the buttons template uniform to be able to use both Ionicons and Foundation icons. 2015-05-07 18:48:14 -04:00
perroned
e762dd49a4 Hide presenter functionality 2015-05-06 23:26:55 -07:00
perroned
f47c69c314 Update BBB settings information 2015-05-06 23:26:40 -07:00
perroned
e199455b0f merge 2015-05-06 23:15:08 -07:00
Anton Georgiev
871803f449 added 2/5 counter for slide (presenter) 2015-05-07 18:14:47 +00:00
Anton Georgiev
f93eac1bb9 Merge branch 'presenter-switch-slide' of github.com:antobinary/bigbluebutton into presenter-switch-slide 2015-05-07 16:34:20 +00:00
Anton Georgiev
ff7166bf45 add tooltips for slides navigation 2015-05-07 12:17:52 -04:00
Richard Alam
6a9bf94c2c Merge pull request #635 from perroned/bridge-construction 
Moving functionality into BBB bridge
 2015-05-07 11:42:08 -04:00
perroned
840c4965a5 Restyled chatbar 2015-05-06 22:33:13 -07:00
perroned
029b90f2b1 Using Ion icons for user list audio 2015-05-06 21:53:29 -07:00
perroned
539fda349e Removed title for chat and whiteboard 2015-05-06 21:17:59 -07:00
perroned
a241c75093 Use foundation icons for users list 2015-05-06 21:14:17 -07:00
perroned
bbbcc3061c save/cancel changes from settings dialog, more UI 2015-05-06 19:41:58 -07:00
perroned
6a5bddef5e Modal menu's for Foundation 2015-05-06 16:11:59 -07:00
perroned
bf67593fa1 Conflicts 2015-05-06 16:05:34 -07:00
perroned
028951d51d Updating UI for Foundation framework 2015-05-06 15:08:49 -07:00
Oleksandr Zhurbenko
9dff47ef02 Moved a whiteboard's document name from the whiteboard-navbar to the main navbar 2015-05-06 14:22:48 -07:00
Anton Georgiev
8f0cc326f5 presentation slide switch-front end 2015-05-06 19:58:37 +00:00
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Anton Georgiev
888b8c6ecc check if null to prevent error 2015-04-27 14:42:03 +00:00
Anton Georgiev
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
4d5184c30a put a lock icon in place when relevant 2015-04-23 18:02:56 +00:00
Anton Georgiev
ef2c58eaa9 missed while resolving conflicts 2015-04-22 15:58:37 +00:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
 2015-04-22 14:50:30 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Anton Georgiev
7171c47656 cleaning up 2015-04-21 21:42:34 +00:00
Anton Georgiev
f74115c9f2 fixed spacing in userslist; Users:X with same behav as in the Flash player 2015-04-21 15:14:49 +00:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Anton Georgiev
ebe8e8627f Merge branch 'icon-and-label-modifications' into apr2015-ui-changes 2015-04-20 18:53:34 +00:00
Anton Georgiev
285b8c0e44 removed Send tooltip + blue border on chat tab 2015-04-20 17:50:05 +00:00
Anton Georgiev
df1dc332f0 display "X Users" label only for 5+ users 2015-04-16 18:19:40 +00:00
perroned
30b39fcc26 sync formatting level 2015-04-16 06:48:46 -07:00
perroned
eb2c5fc456 Prevent controls from moving around while clicking 2015-04-16 06:41:53 -07:00
Anton Georgiev
de6a312cb5 remove the labels for Participants, Presentation, Chat 2015-04-15 21:21:44 +00:00
Anton Georgiev
b650bd2381 changing the presentation icon to easel 2015-04-15 20:41:23 +00:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Maxim Khlobystov
21be913ff1 Went back to using the height of the whole whiteboard area when calculating slide dimensions (fixed the issue with missing whiteboard on client load). 2015-04-10 15:15:58 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-04-10 19:21:40 +00:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
perroned
3989a4ecfd Fix UI issues with listen only 2015-04-02 09:04:51 -07:00
Anton Georgiev
1db332572c cleaning up 2015-04-02 15:22:08 +00:00
Fred Dixon
33e9041972 Merge pull request #593 from gthacoder/meteor-client-fullscreen-whiteboard 
Whiteboard in full screen mode.
 2015-03-31 19:51:20 -04:00
Maxim Khlobystov
c08b23fec2 Limited the support for the full screen mode to Chrome and Firefox. 2015-03-31 16:44:16 -07:00
Maxim Khlobystov
91be2f4da8 Fixed the issue with the full screen button jumping to new line in Firefox. 2015-03-31 12:04:29 -07:00
Anton Georgiev
06d5087bfb unlock if presenter; completely disable locked chat input 2015-03-31 18:42:42 +00:00
Anton Georgiev
d3b459feec locking for private chat 2015-03-31 17:25:05 +00:00