Commit Graph

17 Commits

Author SHA1 Message Date
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Klaus
fc6713013a Move method to VoiceUser 2017-08-01 12:00:07 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Klaus
a1e57c84c3 Mapped meeting 2017-07-26 14:36:57 -03:00
Klaus
51f7161e45 Flat breakouts 2017-07-25 10:51:33 -03:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Klaus
73068ff8d2 Handling meeting end 2017-07-21 16:34:28 -03:00
Oswaldo Acauan
04b6b753fe Fix missing prop on meeting object 2017-07-18 10:23:16 -03:00
Klaus
9b32a4db2d Remove 'nodeJSapp' stuff, is deprecated 2017-07-06 15:01:05 -03:00
Klauswk
ebb3984828 Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages 2017-07-05 15:28:35 -03:00
Anton Georgiev
23f4521954 Merge pull request #4038 from oswaldoacauan/flat-add-meeting
[HTML5 2.0] Add flat package and implement on addMeeting modifier
2017-07-05 11:13:23 -04:00
Klaus
86d3e27d47 Merged info with anton's branch 2017-07-03 12:05:35 -03:00
Oswaldo Acauan
ace3afeb70 Remove console.log 2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95 Use flat package on mongo upsert 2017-06-29 08:54:19 -03:00
Klaus
aab51bdaed Change import and remove console.err 2017-06-28 15:14:29 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00