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

735 Commits

Author SHA1 Message Date
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
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
perroned
2a6d7b7578 Fixing some UI sizing and overflowing issues. 2014-08-22 11:46:50 -07:00
Anton Georgiev
6776c17ca7 update whiteboard_text 2014-08-22 15:26:37 +00:00
Anton Georgiev
bebe541cbf colorful shapes (cont'd) 2014-08-21 22:31:32 +00:00
Anton Georgiev
8839613e0a Merge branch 'meteor-client-messages-better-templates' of github.com:gthacoder/bigbluebutton into colorful-shapes 2014-08-21 22:17:18 +00:00
Anton Georgiev
ad4413db48 fixed the sorting of chat messages 2014-08-21 16:03:31 -04:00
Maxim Khlobystov
3538ce9509 Stroke color and width are displayed properly on HTML5 client's side. 2014-08-21 12:36:50 -07:00
Anton Georgiev
126b0eb127 removed unused properties from config 2014-08-21 19:07:02 +00:00
Anton Georgiev
8ef0248868 removed unused properties from config 2014-08-21 19:06:20 +00:00
Anton Georgiev
f1055361c9 Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into merging-html5-with-master 2014-08-21 18:26:00 +00:00
Anton Georgiev
e93819e3af cleaning up 2014-08-21 18:24:01 +00:00
Anton Georgiev
078fbc938e minor fix 2014-08-21 18:06:34 +00:00
Anton Georgiev
9435b5ee7b (un)muting in Flash is displayed in HTML5 2014-08-21 18:06:08 +00:00
perroned
8a26a7b2a7 Hide settings icon 2014-08-21 08:11:31 -07:00
perroned
64ff5f1da2 Unified color conversion methods combining both to make it better, placed it in globals.coffee as a coffeescript function, and added a global handlebars helper that calls it too. 2014-08-21 07:40:19 -07:00
perroned
f0738dda62 Fixed up issue where closing tags for anchor links were not properly ended causing all following text to be swallowed up in the link text. 2014-08-21 07:12:38 -07:00
perroned
dd9267fab0 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates 2014-08-21 06:49:20 -07:00
Maxim Khlobystov
75d9c03b48 Tags and line breaks inside the chat messages have been replaced with the ASCII equivalents (keeping links clickable). 2014-08-20 22:14:15 -07:00
Anton Georgiev
d59e3366dc fixed the auto display of shapes 2014-08-20 21:17:52 +00:00
Anton Georgiev
f9261d9696 fix indentation 2014-08-20 21:17:18 +00:00
Anton Georgiev
c746cd30f5 fix typo 2014-08-20 20:43:29 +00:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
perroned
3caebfc1f4 Fixed error message when there are 0 messages in chat, and prevented unsafe data from being inserted into the DOM. 2014-08-20 08:02:48 -07:00
Anton Georgiev
a63ea5875e increased the size of the cursor to make it more visible 2014-08-19 21:20:11 +00:00
Anton Georgiev
de15efbc74 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates 2014-08-19 20:28:12 +00:00