Commit graph

475 commits

Author SHA1 Message Date
calzoneman 4f6d72d6d5 Resolve merge conflict 2013-08-08 18:28:10 -04:00
calzoneman 07a3e3cc21 A few minor changes
- Fix paginator always showing 5 buttons even if there are less pages
- Clear AFK timer when clicking voteskip
- Change the modestbranding youtube param because people wanted the like/dislike buttons
2013-08-08 18:25:56 -04:00
calzoneman 9256928d82 Handle user impersonation using bold filter differently 2013-08-08 10:57:46 -04:00
calzoneman c7501bfd50 Add different userlist sort options 2013-08-08 10:54:07 -04:00
calzoneman 425aa75165 Show popup with breakdown of usercount on hover 2013-08-08 10:39:58 -04:00
calzoneman 9c83a4dd3e Fix #248, fix channel caching temp media 2013-08-07 21:05:30 -04:00
calzoneman ac9d60eee7 Fix browser compat issue 2013-08-07 17:55:39 -04:00
calzoneman fefa9f4238 Fix line endings 2013-08-07 17:00:53 -04:00
calzoneman 0cc230f192 Move/change playlist lock button 2013-08-07 16:26:20 -04:00
calzoneman d3cda0517c Improvements to userlist dropdown
- Add a <select> menu to easily change rank
- Only have one leader button, change value between "Give Leader" and "Remove Leader"
2013-08-07 16:14:22 -04:00
calzoneman 04cbdfb631 Add volume slider for soundcloud because their widget is crap 2013-08-07 14:25:08 -04:00
calzoneman 84e9bcde06 Add warning when pasting media links into the search box 2013-08-07 13:34:14 -04:00
calzoneman 51874ed4b9 Fix fluid layout 2013-08-07 11:39:06 -04:00
calzoneman 4af0291470 Add channel list search to ACP 2013-08-07 10:30:16 -04:00
Calvin Montgomery cf7972f740 Add refresh button for chanlogs 2013-08-06 23:37:45 -04:00
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 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 a26df3c92c Add UI for custom embeds 2013-08-03 15:10:06 -04:00
calzoneman fe2ec2c8d2 Support custom embeds (no UI for it yet) 2013-08-03 11:12:53 -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
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
calzoneman a4587ef53c Tweak user pagination 2013-07-31 10:47:23 -04:00
calzoneman 520697af86 Use paginator for actionlog 2013-07-31 10:45:15 -04:00
calzoneman e47c1abff7 Merge branch 'dev' of github.com:calzoneman/sync into dev 2013-07-31 10:27:09 -04:00
calzoneman 17b9353833 Switch pagination on users in ACP 2013-07-31 10:27:01 -04:00
Calvin Montgomery 48483efb02 Take care of obnoxious channel names and video titles 2013-07-30 23:36:18 -04:00
Calvin Montgomery 49f7fb2e15 Change the way action log is queried 2013-07-30 23:21:32 -04:00
calzoneman d9c4c32c6d Handle #215, re-add multifilter editor 2013-07-30 09:27:13 -04:00
calzoneman 17c733be44 Dedupe playlist option notification 2013-07-29 20:06:01 -04:00
calzoneman 77a57d24c1 Implement Auto-AFK (#192)
- Channel-configurable delay
- User is marked AFK if no chat messages are received before the delay expires
- User is marked un-AFK if a chat message is received or if the user voteskips
2013-07-28 17:58:22 -04:00
calzoneman d35ace1916 Fix #234 2013-07-28 14:10:47 -04:00
calzoneman 3932014ed0 Tried implementing Vimeo flash player, didn't fix problem 2013-07-28 10:49:12 -04:00
calzoneman 149eeb6277 Add error message when socket fails 2013-07-27 16:42:42 -04:00
calzoneman 6673e6c203 Fix #225 2013-07-27 10:30:12 -04:00
calzoneman b9e465b714 Fix URI encoding on register/login, also fix database escape bug 2013-07-27 10:11:31 -04:00
nuclearace a2fd40dd24 Fix #227 2013-07-24 15:11:50 -04:00
calzoneman 709f6d09c6 Would help if I included chart lib 2013-07-16 14:57:49 -04:00
calzoneman b8611de605 Add stat charts 2013-07-16 14:57:34 -04:00
calzoneman dad89c823c Minor fix to ACP 2013-07-14 13:08:33 -04:00
Calvin Montgomery 38c29acdb5 Revert mistakenly committed change to channel.html 2013-07-13 22:28:51 -04:00
Calvin Montgomery f2b6534d0a Fix channels not unloading / video skipping 2013-07-13 22:19:47 -04:00
calzoneman 5a5016fd79 Change alt socket to socketio xhr-polling 2013-07-13 16:15:57 -04:00
calzoneman 07795feffa Improve ACP 2013-07-13 14:26:27 -04:00
calzoneman 8d9d2b6433 Clear individual rows from action log 2013-07-13 13:23:32 -04:00
calzoneman 5df30cb8a9 Move action log to DB, throttle registrations 2013-07-13 12:05:58 -04:00
Calvin Montgomery 7bc86037b7 Whoops, forgot to make site footer load when I released v2 2013-07-13 00:53:32 -04:00
calzoneman 120cdf50e4 Re-address #173 2013-07-12 16:34:55 -04:00
calzoneman 4d4161d046 Fix #212 2013-07-12 16:10:06 -04:00
calzoneman 8ea0a34326 Fix JTV [#216] 2013-07-12 15:58:55 -04:00
Calvin Montgomery bd6ff20ae6 Fix #204, #208 2013-07-10 02:29:01 +04:00
Calvin Montgomery d63fe56e8b Fix soundcloud player even though it wasn't my fault 2013-07-10 02:24:40 +04:00
Calvin Montgomery 014a4750a4 Turn off socket debug again 2013-07-09 21:24:25 +04:00
Calvin Montgomery 4b269a5a6c Triple fix #184 2013-07-09 21:21:40 +04:00
Calvin Montgomery 4660f952ed Fix #184 (properly) 2013-07-09 21:11:44 +04:00
calzoneman e6150301b1 Disable debug printing of incoming packets 2013-07-06 11:39:42 -04:00
Calvin Montgomery dce341e42b Blindly doing a find and replace is bad\! 2013-07-06 01:41:14 -04:00
Calvin Montgomery ee1b6c3255 Merge branch 'dev' -- run update.js 2013-07-05 21:50:09 -04:00
calzoneman ec035bd93f Implement #185 2013-07-04 19:11:13 -04:00
calzoneman a2036e4383 Fix #198 2013-07-04 18:50:15 -04:00
calzoneman d20e676443 FixeS 2013-07-03 17:29:49 -04:00
calzoneman 860d81afbc Merge master into dev 2013-07-03 16:06:13 -04:00
calzoneman 8a54000097 I think it works 2013-07-03 15:51:35 -04:00
calzoneman 7d232b80dc setCurrent can wait 2013-07-03 11:32:44 -04:00
calzoneman f6b02a166a Getting there 2013-07-03 11:26:10 -04:00
Calvin Montgomery 6a6dd7bc21 fallback on cookies if localStorage is null or undefined 2013-07-02 22:40:40 -04:00
calzoneman 91a2fcb61d Better XSS prevention (NOTE: must run npm install validator on existing installs) 2013-07-02 15:42:26 -04:00
calzoneman 0611a6b0a6 Merge branch 'master' into dev 2013-07-01 17:44:27 -04:00
calzoneman f84073ad38 Implement a button for #188 2013-06-30 16:01:19 -04:00
calzoneman 543ec91e9b Implement #189 2013-06-30 15:56:41 -04:00
calzoneman 8292a548fd Still working on stuff 2013-06-30 15:33:38 -04:00
calzoneman 9a3563ca45 Continue work on playlist changes 2013-06-29 20:59:33 -04:00
calzoneman eefd62593b [WIP] Playlist changes 2013-06-29 18:09:20 -04:00
calzoneman 0868ef647d Implement UID method of playlist management (#182) 2013-06-27 18:15:29 -04:00
calzoneman e030a2bfa6 Fix theme preference on login frame 2013-06-27 16:09:36 -04:00
Calvin Montgomery ab7ad2c36c Fix #182 #183 #184 2013-06-26 22:44:48 -04:00
calzoneman a89f5138d3 Wait for movements to complete before queue callback 2013-06-26 10:52:37 -04:00
calzoneman f10a5d7ec3 Add a wait condition to prevent playlist highlight being messed up 2013-06-26 10:50:08 -04:00
Calvin Montgomery d688a63bfa Improve queue fail error reporting 2013-06-25 23:09:37 -04:00