BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,559 Commits 13 Branches 260 Tags 1.1 GiB
2dfe4a1aac
Commit Graph

8559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
2dfe4a1aac Merge branch '090-expanded-status' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2014-12-10 18:33:18 -02:00
Felipe Cecagno
76f2e53cd3 cleanup 2014-12-10 18:06:54 -02:00
Felipe Cecagno
514c65e8cf prepared the css file to use the icons from the branding file instead of the embedded images file 2014-12-10 16:39:46 -02:00
Felipe Cecagno
c988875e2c changed the set of icons used for the mood feature 2014-12-10 16:38:25 -02:00
Felipe Cecagno
fce27a0bd9 Merge branch 'smooth-toolbar-transition' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2014-12-09 20:44:27 -02:00
Felipe Cecagno
e1e59ef0cc smooth transition between whiteboard toolbar visible and invisible 2014-12-09 20:35:02 -02:00
Felipe Cecagno
af238993fd Merge branch '090-download-chat' into mconf-live0.6.1 2014-12-09 17:54:51 -02:00
Felipe Cecagno
f53ea822f0 fix translation 2014-12-09 17:54:37 -02:00
Felipe Cecagno
92158362e0 do not enforce listen only by default 2014-12-09 17:53:39 -02:00
Felipe Cecagno
9f2c5926fa Merge branch '090-download-chat' into mconf-live0.6.1 2014-12-09 17:21:15 -02:00
Felipe Cecagno
e2692c039f using a different string to set the download chat filename 2014-12-09 17:20:55 -02:00
Felipe Cecagno
12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-12-09 16:52:43 -02:00
Fred Dixon
52c7aceb2b Merge pull request #460 from kepstin/recording-presentation-links 
recording: Strip out the 'event:' from the beginning of urls in chat
 2014-12-08 16:50:36 -05:00
Richard Alam
2cd918145c Merge pull request #459 from SenecaCDOT-BigBlueButton/reinforce-chat-scrolling 
Reinforce chat scrolling
 2014-12-08 16:19:47 -05:00
Chad Pilkey
0a1c74ce07 Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
 2014-12-08 13:11:34 -08:00
Chad Pilkey
c96e78d829 chat scrolling should be more robust and not rely on events firing 2014-12-08 13:07:40 -08:00
Calvin Walton
65bb9ce47e recording: Strip out the 'event:' from the beginning of urls in chat 2014-12-08 11:43:26 -05:00
Fred Dixon
b895316bad Merge pull request #458 from bigbluebutton/upload-transifex-locales 
- update locales from transifex
 2014-12-05 14:08:13 -05:00
Richard Alam
5667ea4156 - update locales from transifex 2014-12-05 11:05:42 -08:00
Richard Alam
3e4f2d930a Merge pull request #457 from SenecaCDOT-BigBlueButton/fix-chat-scrolling 
Rewrote chat scrolling so that it always scrolls as far down as possible
 2014-12-04 17:46:28 -05:00
Chad Pilkey
f12ac62a47 rewrote chat scrolling so that it always scrolls as far down as possible 2014-12-04 14:39:21 -08:00
Richard Alam
878c81d04b Merge pull request #456 from mconf/fix-client-warnings 
Handle mxmlc warnings
 2014-12-03 15:18:47 -05:00
Richard Alam
99c88fcc30 Merge pull request #455 from bigbluebutton/fix-issue-1830 
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=18...
 2014-12-03 15:18:32 -05:00
Felipe Cecagno
afdf4d5f4f few tweaks to handle the warnings during the compilation of bigbluebutton-client 2014-12-03 16:57:39 -02:00
Felipe Cecagno
7d922d0a23 cleanup 2014-12-03 16:53:45 -02:00
Felipe Cecagno
97359c8a90 improved a little bit the way the mood menu is presented 2014-12-03 16:41:59 -02:00
Felipe Cecagno
4e29bbfa2a Merge remote-tracking branch 'bigbluebutton/master' into 090-expanded-status 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-12-02 20:42:15 -02:00
Felipe Cecagno
905e04dc92 fix the visibility of the new notes button and the close button when the user is promoted to moderator 2014-12-02 20:22:54 -02:00
Felipe Cecagno
a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2014-12-02 20:04:23 -02:00
Felipe Cecagno
8e1c559f80 Merge branch '090-logout-url' into mconf-live0.6.1 2014-12-02 19:38:48 -02:00
Felipe Cecagno
008ba809cc cleanup 2014-12-02 19:38:30 -02:00
Felipe Cecagno
f41ee97427 Merge branch '090-download-chat' into mconf-live0.6.1 2014-12-02 18:58:41 -02:00
Richard Alam
0b1678cfd1 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1830 2014-12-02 10:54:21 -08:00
Richard Alam
d300b52fba Merge pull request #454 from SenecaCDOT-BigBlueButton/fix-presentation-mouseup 
Moved the whiteboard mouseup listener to the stage
 2014-12-01 18:25:18 -05:00
Chad Pilkey
5cdedb19b1 moved the whiteboard mouseup listener to the stage 2014-12-01 12:48:17 -08:00
Richard Alam
862bf0df0c Merge pull request #452 from SenecaCDOT-BigBlueButton/preload-slides 
Add the ability to preload slides
 2014-12-01 15:07:30 -05:00
Fred Dixon
d45762b098 Merge pull request #453 from bigbluebutton/change-api-version 
- change api version to 0.9 from 0.81
 2014-12-01 15:05:46 -05:00
Richard Alam
234a95902d - change api version to 0.9 from 0.81 2014-12-01 11:52:40 -08:00
Chad Pilkey
7774ac049d added a feature to pre-download the next 3 slides 2014-12-01 11:00:49 -08:00
Chad Pilkey
2bc0901ad9 added a missing variable type declaration 2014-12-01 10:59:09 -08:00
Richard Alam
630541abe2 Merge pull request #450 from mconf/fix1835 
Fix #1835
 2014-12-01 12:08:31 -05:00
Fred Dixon
6c2002d1be Merge pull request #451 from bigbluebutton/support-utf-8-chars-in-log 
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837
 2014-12-01 11:59:42 -05:00
Alan Dias
6a59b3ea4c Fixed Status and Settings button 2014-12-01 10:00:22 -02:00
Felipe Cecagno
c0cb0e9c3c removed the duplicated string for the public chat filename 2014-12-01 00:28:35 -02:00
Felipe Cecagno
f8ee5b46c1 Merge branch '090-download-chat' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2014-11-30 20:02:24 -02:00
Felipe Cecagno
546a4add34 cleanup 2014-11-30 19:59:00 -02:00
Felipe Cecagno
932474d5c2 added an effect to show and hide the chat toolbar 2014-11-30 19:58:54 -02:00
Felipe Cecagno
d6e2c54a3f better format of the saved/copied messages 2014-11-30 19:51:17 -02:00
Felipe Cecagno
b9ee79cdd5 added an alert when the user copies the chat content 2014-11-30 19:34:56 -02:00
Felipe Cecagno
6ccef83bb5 fixed a bad syntax in the chat event map 2014-11-30 19:34:24 -02:00