197 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Henrik Joreteg	7e2268f2c5	adding dependencies	2013-10-16 10:54:54 -07:00
Henrik Joreteg	383b3d625f	t Merge branch 'video' of github.com:andyet/otalk into video	2013-10-16 10:49:56 -07:00
Henrik Joreteg	62dfb024a8	fix scope issue	2013-10-16 10:49:49 -07:00
Lance Stout	635df4b2df	Add start of adding/approving contacts	2013-10-16 10:48:40 -07:00
Henrik Joreteg	3a08118d68	magically bind src attributes to video elements as long as objects have a stream	2013-10-16 10:48:00 -07:00
Henrik Joreteg	6a4aed3ef7	temporary style fix for better testing	2013-10-16 00:30:37 -07:00
Lance Stout	1cb062631e	Create contact on incoming call if needed	2013-10-16 00:04:33 -07:00
Lance Stout	5ccdc6361b	Got things mostly almost working	2013-10-15 23:00:56 -07:00
Lance Stout	59dceeee59	Go to chat page when accepting call	2013-10-15 21:47:16 -07:00
Henrik Joreteg	8b0c96f654	Merge branch 'video' of github.com:andyet/otalk into video	2013-10-15 20:06:25 -07:00
Henrik Joreteg	84cf3e2a6e	buildling basic 'in call' video view	2013-10-15 20:06:18 -07:00
Lance Stout	888fd4ffce	Wire up the xmpp jingle action	2013-10-15 19:48:16 -07:00
Henrik Joreteg	0f7587c6bb	Merge branch 'video' of github.com:andyet/otalk into video	2013-10-15 19:16:52 -07:00
Henrik Joreteg	5d7c9b6812	better handling of incoming stuff	2013-10-15 19:16:09 -07:00
Lance Stout	f3cc25aa43	Fix issues in dependencies	2013-10-15 18:39:20 -07:00
Henrik Joreteg	4c89141357	merge	2013-10-15 16:22:53 -07:00
Henrik Joreteg	8860dc3753	basic call bar UI	2013-10-15 16:21:22 -07:00
Lance Stout	d611b9fdda	Save user profile (avatar id/status/etc)	2013-10-15 14:48:39 -07:00
Lance Stout	71e342a0a2	Merge branch 'master' into video ... Conflicts: public/css/otalk.css public/x-manifest.cache	2013-10-15 14:15:07 -07:00
karolinaszczur	274febbc7c	[ux] fix call button appearance	2013-10-15 12:52:59 -07:00
Henrik Joreteg	ba9b0a7baf	starting to add active calls, collection and start of UI	2013-10-15 12:15:25 -07:00
karolinaszczur	d796b88160	[ux] small visual tweaks: sizes, placement and cancel button	2013-10-15 12:14:16 -07:00
karolinaszczur	8ccbf68fd2	[ux] fix bookmark appearance	2013-10-15 11:56:40 -07:00
Lance Stout	4022b53a86	Make things mostly work	2013-10-15 01:01:49 -07:00
Lance Stout	1963bcebe1	Add shrinkwrap file, because latest sub-dependencies broke.	2013-10-15 00:11:15 -07:00
Lance Stout	c736a7722e	Save jingle changes	2013-10-15 00:02:45 -07:00
Henrik Joreteg	2cec815821	adding video button that's enabled/disabled based on availability. Also waiting for roster load before starting router to make it so you can refresh the page and maintain your url	2013-10-14 16:45:31 -07:00
Lance Stout	a864a8b19c	Add WildEmitter dependency	2013-10-14 14:34:30 -07:00
Lance Stout	d3842b46b4	Update stanza.io dep	2013-10-14 14:27:25 -07:00
Lance Stout	2ae7cb05d1	Add jingleResources field to contacts	2013-10-14 14:11:32 -07:00
Lance Stout	f8c946a60d	Add disco checking for chat states + jingle	2013-10-14 14:04:04 -07:00
Lance Stout	cc40e9e574	Update badge handling.	2013-10-14 14:02:05 -07:00
Lance Stout	760af00f05	Update desktop integration + jingle	2013-10-14 13:36:19 -07:00
Lance Stout	8abaef6f04	Add appcache support	2013-10-11 22:39:30 -07:00
Lance Stout	5a9bee42d5	Fix typing notification when pressing ctrl or alt	2013-10-11 21:20:18 -07:00
Lance Stout	5e0ffdb154	Use new notifications lib	2013-10-11 15:40:42 -07:00
Lance Stout	943dff7b69	Add option to install locally with firefox	2013-10-11 14:42:08 -07:00
Lance Stout	17d3882a8a	Use type=groupchat for chat states in muc	2013-10-08 08:14:23 -07:00
Lance Stout	cc7921a54a	Remove extra ref	2013-10-08 08:09:06 -07:00
Lance Stout	bbd8f6aad0	fix some muc related issues	2013-10-08 08:03:58 -07:00
Lance Stout	58765c20a0	Fix chat box layout	2013-09-27 12:10:30 -07:00
Lance Stout	bec2387801	Reset unread count for active contact on focus.	2013-09-27 12:05:39 -07:00
Lance Stout	ea08b54e03	Fix focus check	2013-09-27 11:54:51 -07:00
Lance Stout	64e2f1ed5e	Try avoiding error with macgap	2013-09-27 10:05:29 -07:00
Lance Stout	4c16d8321e	Fix default model values	2013-09-27 09:59:06 -07:00
Lance Stout	ed894f83c6	Reset badge on startup	2013-09-27 09:55:04 -07:00
Lance Stout	f21afd2b5d	Add unread count in page title and app badge.	2013-09-27 09:47:54 -07:00
karolinaszczur	56407a7d54	[ux] make vertical alignment work properly in roster	2013-09-27 18:36:04 +02:00
karolinaszczur	e9f8e5efc6	[ux] unbreak the header alignment and username length	2013-09-27 17:31:02 +02:00
karolinaszczur	fe1220d76f	[ux] add proper styling for idle timestamp	2013-09-27 09:53:00 +02:00