calzoneman
d965d0a5b6
Merge branch 'master' into dev
2013-08-06 20:42:01 -04:00
calzoneman
d599303881
Fix #244 , Fix #247 , Change 'Show Library' to 'Show Library/YouTube Search'
2013-08-06 20:41:29 -04:00
calzoneman
0807c65270
Merge branch 'master' into dev
2013-08-06 14:27:03 -04:00
calzoneman
a371ff629d
Allow channel admins to read channel logs
2013-08-06 14:20:47 -04:00
calzoneman
07249f3589
Add wmode=transparent option
2013-08-06 11:42:20 -04:00
calzoneman
b53ac91a61
Add 'My Channels' to prevent silly people from forgetting which rooms they own
2013-08-06 11:20:15 -04:00
Calvin Montgomery
6d37c63a3d
Fix custom embed transition
2013-08-06 00:07:54 -04:00
Calvin Montgomery
06514cc7f4
Fix ustream causing a queue fail message
2013-08-06 00:04:43 -04:00
Calvin Montgomery
e3f83f27ec
Fix derpy custom embed button
2013-08-06 00:03:20 -04:00
Calvin Montgomery
9749b39dfd
Add JWPlayer constructor to dict
2013-08-05 23:55:46 -04:00
Calvin Montgomery
6bd44fa109
Fix leader not working
2013-08-05 23:30:16 -04:00
Calvin Montgomery
d1d7c8dd05
More fixes
2013-08-05 23:25:16 -04:00
Calvin Montgomery
3f81883994
Fixes
2013-08-05 23:21:28 -04:00
Calvin Montgomery
775a6752bb
Move hide/unhide player to util
2013-08-05 23:11:56 -04:00
Calvin Montgomery
51ea4ce594
Fix JSHint errors for player.js
2013-08-05 22:55:11 -04:00
Calvin Montgomery
3a5de93d7c
Finish refactoring player [untested]
2013-08-05 22:46:56 -04:00
Calvin Montgomery
b2900afb3b
Fix ACP
2013-08-05 00:51:28 -04:00
Calvin Montgomery
39ea0c9207
Continue refactoring clientside loader
...
- Vimeo flash
- Dailymotion
- Soundcloud
- Fix a lot of JSHint stuff
2013-08-05 00:19:10 -04:00
calzoneman
0a00d059e8
Start refactoring clientside player init
2013-08-04 12:16:19 -04:00
calzoneman
0aa8e0f930
Merge branch 'master' into dev
2013-08-04 11:46:33 -04:00
calzoneman
15085fc6ae
Minor fixes for v2.2
...
- If NO_WEBSOCKETS or USEROPTS.altsocket are true, don't use websockets
- Base resizing on an invisible div (some channels remove/hide #queue)
- Names are properly italicized when AFK
2013-08-04 11:44:48 -04:00
calzoneman
bdaa76295e
Remove extraneous console.log
2013-08-03 16:16:59 -04:00
calzoneman
2efd3f0db2
Add support for youtube api v2 keys because v3 is a butt
2013-08-03 16:13:19 -04:00
calzoneman
a26df3c92c
Add UI for custom embeds
2013-08-03 15:10:06 -04:00
calzoneman
5e2b0929a9
Forgot to add file
2013-08-03 11:50:41 -04:00
calzoneman
fe2ec2c8d2
Support custom embeds (no UI for it yet)
2013-08-03 11:12:53 -04:00
calzoneman
1aeec527f6
Refactor get-info module to be a Server property
2013-08-03 10:58:21 -04:00
calzoneman
aa3234eb6a
Implement gdata v3 for youtube videos
2013-08-03 10:52:24 -04:00
calzoneman
ca3bf07d91
Merge branch 'master' into dev
2013-08-03 10:33:47 -04:00
Calvin Montgomery
20f0d1c316
Clear afk timer when disconnecting
2013-08-01 22:47:38 -04:00
calzoneman
4937dca98e
Ceil voteskip requirement instead of truncating
2013-08-01 16:11:11 -04:00
calzoneman
229f8a206a
Fix rare case where paginator breaks
2013-08-01 15:20:50 -04:00
calzoneman
8f72854e38
Fix #238
2013-08-01 15:12:57 -04:00
calzoneman
5342ce8b77
Remove old code
2013-08-01 10:29:00 -04:00
calzoneman
aa5cd300f1
Add yt playlist and search to refactored lookup
2013-08-01 10:27:32 -04:00
calzoneman
3a62c987ea
Add imgur album and rtmp to refactored lookup
2013-08-01 10:14:17 -04:00
calzoneman
51e48e924d
Better error reporting for queue fails (404)
2013-08-01 10:12:22 -04:00
calzoneman
329505de9d
Revert "Forgot to add afk-timeout to config defaults"
...
This reverts commit b93f5584b6
2013-08-01 09:45:14 -04:00
calzoneman
b93f5584b6
Forgot to add afk-timeout to config defaults
2013-08-01 09:42:51 -04:00
calzoneman
a1b39833ed
(Hopefully) fix voteskip problems
2013-08-01 09:39:10 -04:00
Calvin Montgomery
ba8730b722
A couple of voteskip fixes
2013-08-01 00:37:06 -04:00
Calvin Montgomery
b9ccf05416
Merge branch 'master' into dev
2013-08-01 00:04:07 -04:00
Calvin Montgomery
103e01042e
Fix voteskip calculation
2013-08-01 00:03:56 -04:00
Calvin Montgomery
90437e5ac2
Media retrieval refactor; first pass
2013-07-31 23:26:11 -04:00
Calvin Montgomery
7477c64ae2
v2.2 - IMPORTANT CONFIG CHANGED
...
config.js is now a module which loads configuration dynamically.
It automatically generates a file "cfg.json" with defaults.
Edit cfg.json and restart the server to apply.
2013-07-31 22:27:34 -04:00
Calvin Montgomery
971cb18c9f
Update version
2013-07-31 22:27:08 -04:00
Calvin Montgomery
ec1b28b8cd
Merge branch 'dev'
2013-07-31 22:26:40 -04:00
calzoneman
008655e5bf
Force linewrap on video title in Chrome
2013-07-31 11:13:32 -04:00
calzoneman
7d0de7b1ba
Paginate library/search
2013-07-31 11:05:07 -04:00
calzoneman
2573218d55
Paginate channel ranks
2013-07-31 10:57:59 -04:00
