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

248 Commits

Author SHA1 Message Date
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
bikramac
0d9c6842d2 Update bigbluebutton-client/locale/ne_NE/bbbResources.properties 2012-07-23 04:24:58 -07:00
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Richard Alam
5742f2764a Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2012-07-16 18:08:21 +00:00
Ajay Gopinath
c1f5ff0ae5 Finished graph/grid toggle tool. Two bugs remaining: 1)text and grid are not showing up when new clients join 2) sync text/grid when changing pages within a document. TOBE fixed. 2012-07-10 21:36:21 -04:00
Ajay Gopinath
540ed95984 Fixed shapes not being received bug. Fixed text toolbar not moving with window/whiteboard. Added 'text size' feature to text tool options. 2012-07-10 14:51:53 -04:00
Ajay Gopinath
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
Ajay Gopinath
0ef622f959 Added triangle tool and made fill color selectable rather than making it the same as the line color of the DrawObject. 2012-07-06 22:36:41 -04:00
Richard Alam
1d4ee2862c Merge branch 'layout-module' 2012-07-06 15:03:49 +00:00
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -04:00
Ajay Gopinath
e2d536a8f4 Added eraser and highlighter tool. Fixed text normalization issue. Need to add recogniition of individual objects. Text is buggy. 2012-07-05 01:34:51 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Ajay Gopinath
50d887e948 Fixed fill/transparency tool glitch of other clients not receiving updated shapes history. Abstracted DrawObject and TextObject to GraphicObject, and ShapeFactory and TextFactory to GraphicFactory. Almost done with abstraction of new functionality. 2012-07-01 15:33:50 -04:00
Ajay Gopinath
782154bba9 Finished adding fill selection tool and transparency option tool. 2012-06-30 18:47:31 -04:00
Ajay Gopinath
59fc817df9 Added a simple line tool to whiteboard. 2012-06-21 19:13:38 -04:00
Felipe Cecagno
b65ecad3b2 adding the lock button tooltip and fixing an issue related to the attribute "hidden" 2012-06-18 15:18:42 -03:00
Richard Alam
17bba97d40 - add catalan locale 
- update version to 0.8
 2012-06-18 12:56:30 +00:00
Felipe Cecagno
e2d99acbb0 it still needs some refactoring, but it's working fine; this is the client side of the layout module which interacts with the server in order to (un)lock the windows layout 2012-06-15 11:45:14 -03:00
Richard Alam
3d33d26bae - update latvian and german locales 2012-06-13 17:17:00 +00:00
Richard Alam
174a1c643e Merge pull request #40 from cforce/master 
added missing german locale strings
 2012-06-12 13:07:29 -07:00
Richard Alam
e411d3271b Merge pull request #42 from amon-sha/fix_lv_locale 
Fix Latvian language file
 2012-06-12 13:04:28 -07:00
Richard Alam
de6e0857a2 - update spanish and basque locales 2012-06-11 21:37:39 +00:00
Felipe Cecagno
04ab5a3fe8 final version of the layout module before start to implement the mechanism to lock the windows layout 2012-06-06 14:53:53 -03:00
Richard Alam
d116e4f298 - update locale 2012-06-03 15:12:16 +00:00
Amon Sha
0294fa8ab0 Fix Latvian language file 2012-06-02 17:49:20 +03:00
Richard Alam
4f0b930553 - update locales 2012-05-28 19:37:12 +00:00
Terence Miller
acc0776513 Update bigbluebutton-client/locale/de_DE/bbbResources.properties 2012-05-20 01:40:20 +03:00
Felipe Cecagno
c38186cf6f some minor updates; fixed a bug when the restored windows doesn't show up with the minimize button 2012-05-23 13:51:00 -03:00
Felipe Cecagno
f0214fa580 implements the very first prototype of the layout module; the admin put the layout definitions in a XML file, and the user may apply the layouts independently; the users also can extract the current layout to add directly to the xml file with the layout definitions 2012-05-22 23:13:12 -03:00
Richard Alam
01a7a4be94 - updating locales 2012-04-16 14:39:04 +00:00
Richard Alam
93349e84e6 - update locale version to 0.8-beta4 and (c) to 2012 2012-03-01 19:00:50 +00:00
Richard Alam
49b59cc189 - update with new locales 2012-03-01 18:32:27 +00:00
Richard Alam
0e795da75f - use fit-to-page as default for each new page 
- update icons and locale strings
 2012-02-28 18:31:27 +00:00
Richard Alam
0957bbb158 - change mute/unmute icons 2012-02-03 17:17:12 +00:00
Richard Alam
e2a22f21a6 - update locales with latest from mygengo 2012-01-16 21:31:05 +00:00
Richard Alam
34a57089a4 update locale strings to latest from mygengo 2011-12-20 15:49:45 +00:00
Richard Alam
3393fc5b62 add new locales 2011-11-21 15:24:55 -05:00
Richard Alam
cf8efce46e - updating locales files from mygengo 2011-11-09 11:04:08 -05:00
Richard Alam
33dcc49893 Merge branch 'hangout-style' into camera-hints 2011-11-04 01:45:32 +00:00
Localization Server
4c75e43b30 Updating locale 2011-11-01 22:40:01 +00:00
Richard Alam
db80cff3d0 Merge branch 'master' into consolidate-locales-in-one-area 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
 2011-11-01 13:34:09 -04:00
Richard Alam
7b36c465fa - Change text label when self muted/talking 
- add param to prevent locales from being cached
 2011-11-01 13:31:47 -04:00
Richard Alam
87b7380320 rename Norwegian locale code from nb_No to no_NO 2011-11-01 01:44:03 +00:00
Felipe Cecagno
08e5dbec7d extracted the strings from publish window to the language file 2011-10-24 22:10:52 -02:00
Richard Alam
e80228aeb1 - allow user to mute/umute herself. ** Locale doesn't work yet. Need to fix ** 2011-10-22 16:58:50 -04:00
Localization Server
d09141d0be Updating locale 2011-10-18 17:20:02 +00:00
Localization Server
07e6d4570e Updating locale 2011-10-17 00:20:01 +00:00
Localization Server
31993cc824 Updating locale 2011-10-17 00:00:02 +00:00
Localization Server
f3f95bc9ef Updating locale 2011-10-16 23:40:02 +00:00
Richard Alam
f524cfda17 - change locale version 0.8-beta2 2011-10-02 13:53:24 -07:00