Oleksandr Zhurbenko
|
643d55938c
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-16 19:24:59 -07:00 |
|
Oswaldo Acauan
|
716ee5902f
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-08 11:52:26 -03:00 |
|
Oswaldo Acauan
|
e07c8b41af
|
Add autofocus when switching/entering chat
|
2017-08-04 15:32:21 -03:00 |
|
Oswaldo Acauan
|
720dddec24
|
Fix chat styles
|
2017-08-04 15:17:15 -03:00 |
|
Oswaldo Acauan
|
0022c121d3
|
Fix chat bug and styles
|
2017-08-04 14:58:55 -03:00 |
|
Klaus
|
e4e7f1da2c
|
Move domain functions to service.js
|
2017-08-03 11:10:05 -03:00 |
|
Oswaldo Acauan
|
b53636ec19
|
Fix avatar colors and text capitalization
|
2017-08-03 09:36:26 -03:00 |
|
Oswaldo Acauan
|
14f586faad
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
|
2017-08-03 09:23:12 -03:00 |
|
Klaus
|
e02e5d75ce
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-03 09:17:50 -03:00 |
|
Klaus
|
e7b9eab5b6
|
Move makeCall to service file
|
2017-08-02 14:05:20 -03:00 |
|
Klaus
|
63fee3b615
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
|
2017-08-02 11:36:16 -03:00 |
|
Klaus
|
d45ae64558
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
|
2017-08-02 11:29:33 -03:00 |
|
Oleksandr Zhurbenko
|
b207a1275e
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-08-01 13:49:46 -07:00 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|
Oswaldo Acauan
|
83c117ddde
|
Match user-list with the new styles
|
2017-07-28 10:43:39 -03:00 |
|
Klaus
|
e2c0971e57
|
Add new icons
|
2017-07-27 17:45:40 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -03:00 |
|
Klaus
|
d44299d221
|
Fix the missing string name
|
2017-07-25 15:57:20 -03:00 |
|
Klaus
|
fade555d55
|
Add check for user permission
|
2017-07-21 15:17:25 -03:00 |
|
Klaus
|
39288e6e70
|
Add clear history, copy and save as chat options
|
2017-07-21 13:27:28 -03:00 |
|
Klaus
|
a63d8d5cf4
|
Add function to export public chat to clipboard and file
|
2017-07-21 11:39:51 -03:00 |
|
Oleksandr Zhurbenko
|
23263c997b
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
|
2017-07-17 16:01:05 -07:00 |
|
Anton Georgiev
|
bc9083c0cf
|
Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
|
2017-07-17 14:58:02 -04:00 |
|
Klaus
|
87943cb3f8
|
Change relative path of the sass to absolute
|
2017-07-17 15:21:45 -03:00 |
|
Klaus
|
3af281d648
|
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
|
2017-07-17 13:33:45 -03:00 |
|
Oleksandr Zhurbenko
|
82a1ad2c8a
|
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
|
2017-07-14 15:43:41 -07:00 |
|
Anton Georgiev
|
a251305cab
|
Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
[HTML5] - ARIA fixes to work with JAWS
|
2017-07-14 13:26:07 -04:00 |
|
Anton Georgiev
|
586c51fcac
|
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0] Move emoji messages to 2.0
|
2017-07-14 10:39:16 -04:00 |
|
Klaus
|
54234cecac
|
Handling emoji messages
|
2017-07-13 10:15:42 -03:00 |
|
Klaus
|
f0e26c1bbb
|
Change missing strings to const
|
2017-07-12 17:22:26 -03:00 |
|
Klaus
|
111ad9171b
|
Remove strings and add constants
|
2017-07-12 17:15:50 -03:00 |
|
Klaus
|
8cd4b752ef
|
Remove strings and add constants
|
2017-07-12 17:02:55 -03:00 |
|
Klaus
|
2aa603d195
|
Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages
|
2017-07-12 16:29:07 -03:00 |
|
Klaus
|
1dfb054323
|
A few hotfixes to make the html5 client join again
|
2017-07-12 15:51:29 -03:00 |
|
Klaus
|
eb5712e96c
|
Fix chat list
|
2017-07-12 13:47:58 -03:00 |
|
Klaus
|
e1004b64d3
|
Filtering correct the messages
|
2017-07-12 10:54:54 -03:00 |
|
Klaus
|
898f7c97e3
|
Sending private message
|
2017-07-12 10:18:26 -03:00 |
|
Klaus
|
73f49bb46a
|
Sending public message
|
2017-07-12 09:42:16 -03:00 |
|
KDSBrowne
|
1cc5c5df92
|
change variable name and condition
|
2017-06-27 20:35:15 -07:00 |
|
Anton Georgiev
|
724e21a0d6
|
we do not have 1.0 user messages coming from bbb so use 2.0 only
|
2017-06-27 18:14:53 -04:00 |
|
Klaus
|
b3865ef90d
|
Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis
|
2017-06-20 14:11:19 -03:00 |
|
KDSBrowne
|
be009fd9ba
|
fix chat log aria label to work with jaws
|
2017-06-20 09:01:42 -07:00 |
|
Klaus Klein
|
c627deca36
|
Move api to api/1.1
|
2017-06-19 08:57:32 -03:00 |
|
KDSBrowne
|
c189faceff
|
fix merge conflicts
|
2017-06-08 11:00:06 -07:00 |
|
Oleksandr Zhurbenko
|
1309bb1808
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
|
2017-06-07 14:12:04 -07:00 |
|
Oleksandr Zhurbenko
|
017ff470c3
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
|
2017-06-07 13:29:35 -07:00 |
|
KDSBrowne
|
c2579c7838
|
fix console error related to messageForm
|
2017-06-07 11:36:25 -07:00 |
|
Oleksandr Zhurbenko
|
1ba4018629
|
Cleanup
|
2017-06-05 20:15:37 -07:00 |
|
Oleksandr Zhurbenko
|
52fae1b8c8
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks
|
2017-06-05 19:51:20 -07:00 |
|
Oleksandr Zhurbenko
|
9f497d8991
|
Fixed scrollArea usage
|
2017-06-05 19:10:06 -07:00 |
|