Commit Graph

6285 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
d414d98bd9 More cleanup 2014-12-11 14:35:41 -02:00
Pedro Beschorner Marin
ac0a76872b Some cleanup 2014-12-11 14:35:33 -02:00
Pedro Beschorner Marin
7cdfa399ea Getting the number of shared notes from layout 2014-12-11 14:35:23 -02:00
Pedro Beschorner Marin
128c3b19bd Automatically creating shared notes 2014-12-11 14:35:16 -02:00
Pedro Beschorner Marin
9b4bafb8bf Refactored the notes counter index control so removed ones can come back 2014-12-11 14:35:06 -02:00
Pedro Beschorner Marin
bd1a90090c Initial saving of the additional notes in the layout 2014-12-11 14:34:51 -02:00
Felipe Cecagno
9f3a1a3062 Merge branch 'multinotes' of github.com:jtpastro/bigbluebutton into multinotes 2014-08-26 14:04:31 -03:00
Jonata Teixeira Pastro
073a152d01 Changing padding of the patch that identifies current cursor position. The padding is done with a series of grave accents characters rather than a random string, so that the matching algorithm doesn't mistake the padding for the actual content. 2014-08-19 15:56:20 +00:00
Felipe Cecagno
b4a7a9d317 localizing the modifications on the shared notes for en_US and pt_BR 2014-08-18 13:12:44 -03:00
Felipe Cecagno
854f898279 enable open and close additional notes only for moderators; using an attribute on config.xml to enable or disable multiple notes support 2014-08-18 12:56:46 -03:00
Felipe Cecagno
133b6da887 fixed the inconsistency when a particular note is closed and it's not possible to close the others; cleanup 2014-08-18 12:46:40 -03:00
Jonata Teixeira Pastro
f3252728e0 Using server to provide sharednotes numbering. 2014-08-15 21:14:13 +00:00
Jonata Teixeira Pastro
9ee6024b8e Merged multinotes-ui (client ui) and multinotes (server logic) 2014-08-15 20:40:16 +00:00
Felipe Cecagno
ac292cbeb2 implemented the ui to be able to have multiple shared notes windows opened and being shown for every user in the session 2014-08-14 16:03:20 -03:00
Jonata Teixeira Pastro
ef94afb56c Fixed issues with client-server communication. 2014-08-14 18:16:07 +00:00
Jonata Teixeira Pastro
8960338797 Changed noteId from long timestamp to string UUID
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/ISharedNotesRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/sharedNotes/SharedNotesSender.java
2014-08-05 14:40:55 -03:00
Jonata Teixeira Pastro
186386b13c Fixed call netconnection arguments.
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/managers/SharedNotesConnectionManager.as
2014-08-05 14:39:10 -03:00
Jonata Teixeira Pastro
f8656b7291 Event to trigger upon sharedNote creation server response. 2014-08-05 14:37:24 -03:00
Jonata Teixeira Pastro
6b2d5f9239 Bug #1022. Disabling focus change on shared note update.
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/PatchableTextArea.as
2014-08-05 14:37:13 -03:00
Felipe Cecagno
13adfc7aaf Bug #1022. Disabling focus change on shared note update.
jtpastro/bigbluebutton@661b401d65
2014-07-02 16:12:58 -03:00
Felipe Cecagno
03e4f775c2 adding the shared notes window in the default layout 2013-08-26 23:52:28 -03:00
Felipe Cecagno
7f991d1346 Merge branch 'master' into sharedNotesNoServer-0.81
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
2013-08-25 23:30:44 -03:00
Gustavo Salazar
1e0f8c1969 Merge pull request #237 from SenecaCDOT-BigBlueButton/renable-playback-buffering
added back in the playback buffering indicator and fixed some issues with it
2013-08-23 10:26:06 -07:00
Chad Pilkey
3d378ffec1 Merge pull request #230 from speakserve/flex-client-updates
LoadingBar properties binding replaced by fixed values.
2013-08-23 09:08:50 -07:00
Chad Pilkey
7229d1a45d added back in the playback buffering indicator and fixed some issues with it 2013-08-23 08:54:45 -07:00
Chad Pilkey
695ece39c4 Merge pull request #234 from mconf/fix-accessibilityProperties-0.81
Fixed chatBox AccessibilityProperties that was seted before being initia...
2013-08-23 06:59:20 -07:00
Hugo Lazzari
b9068b9137 Add test to check if variable is null 2013-08-23 08:45:39 -03:00
Chad Pilkey
89cbf9bdf4 Merge pull request #236 from jent46/master
update translation
2013-08-22 12:47:07 -07:00
Chad Pilkey
9f79d5ae31 Merge pull request #235 from mconf/resolution-combo-style
Fixed the style of the video resolution combobox
2013-08-22 12:46:11 -07:00
jent46}
99667ce98d Merge remote-tracking branch 'upstream/master' 2013-08-20 16:36:50 -05:00
jent46}
6d8d8962e5 update languages (fr_FR,he_IL,id_ID,vi_VN) 2013-08-20 16:34:42 -05:00
Chad Pilkey
61a6298f80 changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
Felipe Cecagno
cd02ad5c79 fixed the style of the video resolution combobox 2013-08-20 14:07:38 -03:00
Gustavo Salazar
26e6876136 Fix #1606 2013-08-19 20:17:10 -05:00
Chad Pilkey
708ce4ebd7 Merge pull request #223 from SenecaCDOT-BigBlueButton/skin-logout-confirm
The Alert box skin seems to be working now. I'm not sure why it suddenly started working for me, but I won't question it.
2013-08-19 15:01:10 -07:00
Chad Pilkey
c88b888ae3 enable the logout confirmation again 2013-08-19 14:58:25 -07:00
Chad Pilkey
ea02ae16f2 Merge remote branch 'upstream/master' into skin-logout-confirm 2013-08-19 14:57:46 -07:00
Chad Pilkey
2d68393cdd moved the confirmation box down a little 2013-08-19 14:56:58 -07:00
Chad Pilkey
a1c691059f Merge pull request #233 from SenecaCDOT-BigBlueButton/move-title-prefix
moved the client title prefix to javascript for easier modification
2013-08-19 07:30:15 -07:00
Chad Pilkey
238544e495 moved the client title prefix to javascript for easier modification 2013-08-19 07:28:33 -07:00
Chad Pilkey
d935d8e15e repositioned the logout confirm alert 2013-08-19 06:39:27 -07:00
Fred Dixon
1c50f1cff2 Disable logout window for the moment as its pending UI updates (changed correct parameter :-) 2013-08-16 15:38:41 -07:00
Fred Dixon
d5099639ef Disable logout window for the moment as its pending UI updates 2013-08-16 15:11:45 -07:00
Richard Alam
b1ae7bb2e1 Merge pull request #228 from kepstin/stretch-audio-sync
Stretch freeswitch audio to match event timing (experimental)
2013-08-16 05:35:17 -07:00
Ghazi Triki
a3ca2c6bac Removed uncessary binding for LoadingBar positioning. 2013-08-16 10:37:12 +01:00
Calvin Walton
0fa60e2bc3 Use the old sox trim syntax for the version on ubuntu lucid 2013-08-15 13:36:52 -04:00
Calvin Walton
6b56c4103d Correct variable name to refer to original audio length 2013-08-15 13:34:19 -04:00
Calvin Walton
d2afbe9383 Convert timestamps to numbers for subtraction 2013-08-15 13:30:36 -04:00
Calvin Walton
acbd0e5b7e Stretch freeswitch audio to match event timing
This helps maintain audio sync with video and events when freeswitch's
internal timing differs from red5's.
2013-08-14 17:25:10 -04:00
Chad Pilkey
723570d0d4 Merge pull request #227 from jent46/master
Update localization from transifex
2013-08-14 14:17:02 -07:00