perroned
72f857e76a
Fixed title.
2014-09-11 10:37:09 -07:00
perroned
b4414c8c0a
Important changes, removed the unnecessary timestamp code, and fixed messages beeing joined when they should sandwich messages from another user.
2014-09-11 10:02:29 -07:00
perroned
4407b9c24b
Readded scrolling on chatbar render.
2014-09-11 09:52:33 -07:00
perroned
ddec586d2e
Cleaned a few UI things.
2014-09-11 09:37:41 -07:00
perroned
753c80f34e
Made extra dummy entry smaller.
2014-09-11 09:31:13 -07:00
perroned
708427422b
Comments explaining scrolling.
2014-09-11 09:28:41 -07:00
perroned
61d2a959c8
Fixed message, yet again.
2014-09-11 09:26:06 -07:00
perroned
cea9a226e6
Turns out timing code is still needed for some things.
2014-09-11 08:04:12 -07:00
perroned
350ea3b196
commented out unnessecary time stamp code, group messages within same minute and same user.
2014-09-11 07:35:34 -07:00
perroned
b4b72095ae
Cleaned up code a bit.
2014-09-10 13:23:38 -07:00
perroned
74c1363992
Fixed up greeting, added comments for future direction, addressed issue.
2014-09-10 13:05:15 -07:00
perroned
c3a3cd6e83
Working on merging chat messages from the same user.
2014-09-10 12:48:23 -07:00
perroned
314821a243
Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates
2014-09-10 10:34:52 -07:00
Maxim Khlobystov
22ac4c6598
Proper handling of slide dimensions (natural size).
2014-09-09 09:30:02 -07:00
perroned
cd80d881ad
Merge remote-tracking branch 'maxim/meteor-client-whiteboard' into creating-better-templates
2014-09-09 05:37:02 -07:00
Maxim Khlobystov
5ef2913da4
Fixed ellipses on a whiteboard.
2014-09-07 13:34:59 -07:00
Maxim Khlobystov
02678f9c32
Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton into meteor-client-whiteboard
2014-09-04 14:42:14 -07:00
perroned
ecb83c9e53
Added the ability to add new lines to messages.
2014-09-04 11:54:46 -07:00
Maxim Khlobystov
3278da5505
Rounded linecap was added to whiteboard lines.
2014-09-04 11:31:47 -07:00
perroned
bdeb664875
Added tooltips for icons in the users list.
2014-09-04 11:08:08 -07:00
perroned
ce31260a7c
Fixed navbar button for hiding/showing navbar.
2014-09-04 10:57:28 -07:00
Anton Georgiev
0e670a05d8
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master
2014-09-04 17:15:13 +00:00
Anton Georgiev
fd85a30ff2
handling recording_status_changed_message
2014-09-04 17:13:23 +00:00
perroned
1ddd2e439c
Changed title
2014-09-04 10:06:36 -07:00
perroned
37577b3ce4
Fixed server version
2014-09-04 09:46:02 -07:00
Anton Georgiev
1ed41ceb59
splitting "recorded" into "currentlyBeingRecorded" and "intendedForRecording"
2014-09-04 16:34:18 +00:00
perroned
a0163e5117
Fixed meeting recording status.
2014-09-04 09:32:24 -07:00
Anton Georgiev
206a2e23ea
Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merging-html5-with-master
2014-09-04 15:04:42 +00:00
perroned
29cdfe1530
Added code for getting proper voice bridge pin
2014-09-04 07:48:50 -07:00
Anton Georgiev
4a88ebdcaf
support voice_conf and duration in meeting_create_message. put empty strings for these params in get_all_meetings_reply
2014-09-04 14:47:32 +00:00
perroned
c6a91079bd
Added newline and fixed operator.
2014-09-04 07:37:36 -07:00
perroned
acc85a1bf8
Fixed errors when data doesn't load properly.
2014-09-04 06:45:17 -07:00
perroned
65024217a7
Navbar elements do not rely on data being present anymore. So now if there is a connection or data issue the UI doesn't misbehave and disappear.
2014-09-03 13:11:56 -07:00
perroned
12eb51523d
Changing the way UI relies on data.
2014-09-03 13:02:00 -07:00
perroned
8c00dcc56d
Removed not needed code. Changing UI elements' dependencies to data always being available.
2014-09-03 12:22:08 -07:00
perroned
867928a0b6
Merge remote-tracking branch 'anton/merging-html5-with-master' into creating-better-templates
2014-09-03 10:44:33 -07:00
Anton Georgiev
f5fd9ee664
log when meeting_created_message was received
2014-09-03 15:09:34 +00:00
Anton Georgiev
4f25f2ced1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
2014-09-02 21:08:03 +00:00
Richard Alam
c300eb81e6
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2014-09-02 13:18:13 -07:00
Richard Alam
4bf941b108
- although the page number is not used in whiteboard recording processing, just match the page number with the goto slide event in events.xml
2014-09-02 13:17:28 -07:00
Calvin Walton
c7967810b2
Revert the presentation publish page index altering
...
This was added because BigBlueButton 0.9 started using 1-based page
numbers in the events.xml file. That change has been reverted, so as
to avoid behaviour changes from 0.81 in places where it's unnecessary.
2014-09-02 15:46:52 -04:00
Richard Alam
d5d541a2c5
- subtract 1 from GotoSlideEvent and ResizeAndMoveSlideEvent to events.xml so that the recording is backwards compatible with 0.81 and earlier
2014-09-02 12:44:52 -07:00
Richard Alam
0d3e23db21
- update locales
2014-09-02 12:01:20 -07:00
Richard Alam
a1ded8fdb5
- add current time on header of JSON messages so we can display the correct time instead of calculating from the timestamp
2014-09-02 11:43:05 -07:00
Anton Georgiev
cf125781db
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-09-02 17:54:14 +00:00
Richard Alam
372b571b7b
- add pretty create date, duration, and user has joined info on getMeeting api response
2014-09-02 10:22:24 -07:00
Richard Alam
98c96c3613
- a meeting that has duration zero (runs infinitely) should be cleaned-up if no one has ever joined on it
2014-09-02 10:21:06 -07:00
Anton Georgiev
149b21936d
not sure if I should commit these
2014-09-02 15:59:50 +00:00
Anton Georgiev
70a3553ae9
cleaning up
2014-09-02 15:19:50 +00:00
Anton Georgiev
27e05e112a
some work on presentation_page_resized_message
2014-09-02 15:19:21 +00:00
