tylercopeland
|
a4a806d254
|
lastest css updates
|
2013-10-29 19:38:52 -04:00 |
|
tylercopeland
|
499aba5f03
|
css style updates
|
2013-10-29 19:01:52 -04:00 |
|
mohamed-ahmed
|
1c012aec32
|
merged html5-bridge with master
|
2013-10-29 18:33:25 +00:00 |
|
Richard Alam
|
a141928824
|
- Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671
Remove the beginning . (dot) from uploaded presentation.
|
2013-10-23 16:21:49 +00:00 |
|
Fred Dixon
|
ca56259457
|
Updating label to RC4
|
2013-10-20 15:47:12 -04:00 |
|
Fred Dixon
|
381ddbf3a9
|
Updated labels for 0.81-RC3
|
2013-10-09 14:05:55 -04:00 |
|
mohamed-ahmed
|
9c0e4ca9dd
|
Merge branch 'master' into throwaway-merge
|
2013-10-03 16:07:28 +00:00 |
|
Fred Dixon
|
6b7438e9f8
|
Updated wording of welcomeMessageFooter
|
2013-09-27 19:01:59 -04:00 |
|
mohamed-ahmed
|
ad86f142d4
|
merged Gary's newUI and fixed conflicts
|
2013-09-27 16:07:38 +00:00 |
|
Fred Dixon
|
a84c6ca8e8
|
Configuration updates for moving to 0.81-RC2
|
2013-09-26 16:42:27 -04:00 |
|
Gary Deng
|
fb8af3bdf7
|
implement html5 new interface
|
2013-09-24 06:13:09 -07:00 |
|
mohamed-ahmed
|
7a50b35873
|
added 'move_and_zoom' event to pubsub
|
2013-09-10 20:54:49 +00:00 |
|
Nadia Noori
|
c2c344ed79
|
Changing lable to RC1
|
2013-09-04 14:24:19 -04:00 |
|
mohamed-ahmed
|
2951a3bbd8
|
slide size hotfix
|
2013-08-26 14:32:19 +00:00 |
|
mohamed-ahmed
|
995359a9d4
|
merged latest with my local changes
|
2013-08-14 16:48:54 +00:00 |
|
mohamed-ahmed
|
2df93fa993
|
modified local settings to be able to run on my system
|
2013-08-02 20:48:31 +00:00 |
|
Jorge Nunez
|
5b1d62f5d2
|
Merge remote branch 'upstream/master' into html5-bridge
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
|
2013-07-31 17:27:33 -07:00 |
|
Fred Dixon
|
1c7d220edc
|
Updated welcome message footer to 0.81-beta-2
|
2013-06-18 05:17:24 -07:00 |
|
Markos Calderon
|
dfbfae9c8d
|
change reject value when the meeting doesn't exist
|
2013-07-10 16:12:08 -05:00 |
|
Markos Calderon
|
ff893f36fe
|
Fix: disallow client to reconnect by refreshing the browser, when a meeting ends
|
2013-07-10 16:01:54 -05:00 |
|
Fred Dixon
|
70f26a27f2
|
Minor updates to welcome message
|
2013-06-16 07:19:32 -07:00 |
|
Ricahrd Alam
|
695bb54ab5
|
- have upgrade to grails 1.3.9 work
- remove plugins tomcat, hibernate, jsecurity
grails --list-plugins
grails --uninstall-plugin hibernate
grails --uninstall-plugin jsecurity
grails --uninstall-plugin tomcat
|
2013-06-06 12:49:18 -07:00 |
|
Richard Alam
|
e1879795e9
|
try to upgrade to grails 1.3.9 - Not starting properly though
|
2013-06-06 12:17:52 -07:00 |
|
Calvin Walton
|
085294af6d
|
Fix typo 'defaulLayout' in join parameters
|
2013-05-30 17:47:26 -04:00 |
|
Richard Alam
|
11f41b8d70
|
Revert " - allow removing of close button for avatar and publish window through config.xml"
This reverts commit 961626f46a .
|
2013-05-28 16:24:54 +00:00 |
|
Richard Alam
|
961626f46a
|
- allow removing of close button for avatar and publish window through config.xml
|
2013-05-28 16:18:48 +00:00 |
|
Richard Alam
|
af0c56c131
|
updating api version to 0.81
|
2013-05-25 16:31:33 -03:00 |
|
Richard Alam
|
b28cb66f32
|
- change how we create the base string and calculate checksum for setConfigXML API
|
2013-05-24 15:11:36 +00:00 |
|
Mohamed Ahmed
|
bf441450b0
|
modified ip and salt to that of my system
|
2013-05-23 11:54:23 -04:00 |
|
Richard Alam
|
be8befb243
|
Merge branch 'master' into html5-bridge
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
|
2013-05-09 17:25:25 +00:00 |
|
Richard Alam
|
4d3e6de0e9
|
- return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded.
|
2013-04-28 21:52:14 +00:00 |
|
Richard Alam
|
5cdf1b18f6
|
- sign the query string for get default config xml
|
2013-04-17 21:59:51 +00:00 |
|
Richard Alam
|
18bacaa632
|
- fix NPE when sending incorrect checksum to getDefaultConfigXML call
|
2013-04-17 18:43:10 +00:00 |
|
Fred Dixon
|
abc074aaa1
|
Hide the network monitor and editing buttons for layouts module by defult
|
2013-04-16 19:23:20 -07:00 |
|
Markos Calderon
|
fca07405e0
|
fixing some configurations
|
2013-04-10 14:53:45 -05:00 |
|
Dale Karp
|
0813595c61
|
fixed merges
|
2013-04-10 17:23:40 +00:00 |
|
Jesus Federico
|
36ed2f6537
|
Made error messages consistent on setConfigXML
|
2013-04-05 00:07:41 -04:00 |
|
Richard Alam
|
e35071a050
|
- add API to allow querying for default config.xml
|
2013-03-27 18:21:54 +00:00 |
|
Richard Alam
|
27af71f208
|
- handle passing of config xml
|
2013-03-27 16:06:03 +00:00 |
|
Richard Alam
|
d9bbc14d80
|
- remove decoding of config xml to utf-8...I still think we need to encode
the config xml to utf-8 and decode it
|
2013-03-22 15:32:44 +00:00 |
|
Richard Alam
|
8c157a3914
|
- handle setConfigXML
|
2013-03-21 17:14:13 +00:00 |
|
Richard Alam
|
0e386adab2
|
Merge branch 'master' into merge-master-into-dynamic-config
|
2013-03-15 21:03:13 +00:00 |
|
jfederico
|
f56c4474e6
|
bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server.
|
2013-03-13 15:01:14 -04:00 |
|
Dale Karp
|
7f03043f78
|
updated local props file
|
2013-03-07 17:59:36 +00:00 |
|
Markos Calderon
|
3003280227
|
Added voicebridge and dialnumber to ExternalApiCalls
|
2013-02-22 15:37:59 -05:00 |
|
Dale Karp
|
b1a14c98c6
|
commiting changes made to run env
|
2013-02-21 17:11:23 +00:00 |
|
Markos Calderon
|
cc1e40d61c
|
Added user customdata to the client
|
2013-02-19 12:18:12 -05:00 |
|
Markos Calderon
|
1929526a4d
|
added custom data parameter when a user joins to a meeting
|
2013-02-14 15:59:52 -05:00 |
|
Richard Alam
|
e6fe97db36
|
Merge branch 'master' into merge-master-into-dynamic-config
|
2013-02-07 18:53:01 +00:00 |
|
Markos Calderon
|
ba2da7004c
|
Merge almost complete. Still red dot not working
|
2013-01-25 21:50:32 -05:00 |
|