Commit Graph

494 Commits

Author SHA1 Message Date
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
Calvin Montgomery 678abbd9da Move ACP dropdown to navbar 2013-06-25 22:11:37 -04:00
Calvin Montgomery 4ce0ac646a Implement #181 2013-06-25 22:03:14 -04:00
Calvin Montgomery 770f252105 Fix queue buttons not displaying after playlist shuffle 2013-06-25 21:49:02 -04:00
calzoneman 11734f5e62 Fix NWS failing on non-ASCII messages 2013-06-25 10:48:14 -04:00
calzoneman 81d85311e7 Minor fix 2013-06-25 10:38:19 -04:00
calzoneman 08bc926df4 Fix library clear results button being stupid 2013-06-25 10:29:12 -04:00
calzoneman 2769543d04 Auto re-login guests upon reconnect 2013-06-25 10:27:35 -04:00
calzoneman ccae0ea76e Add /mute command 2013-06-25 10:18:33 -04:00
calzoneman 259d7470e1 add back ignore function 2013-06-25 10:06:01 -04:00
calzoneman 11e91d02fb Fix unban bug 2013-06-25 09:59:14 -04:00
Calvin Montgomery dc7eeed360 more fixes 2013-06-24 23:40:42 -04:00
Calvin Montgomery 8b0a960440 fixy fixy 2013-06-24 23:33:00 -04:00
Calvin Montgomery dde7ae2c79 Fix previous commit 2013-06-24 23:03:21 -04:00
Calvin Montgomery 7e356f38a8 Reduce freezes on large playlists 2013-06-24 22:45:44 -04:00
calzoneman 5389d2827c One more tiny fix 2013-06-23 14:35:40 -04:00
calzoneman 25db654bbd minor acp fix 2013-06-23 14:30:31 -04:00
calzoneman 67dee59c3f IT'S THE FINAL COUNTDOWN 2013-06-23 14:21:21 -04:00
calzoneman 1a3d92c903 Fixes and improvements 2013-06-23 14:02:20 -04:00
calzoneman c08b89d68a Fix #176 2013-06-23 10:30:28 -04:00
calzoneman 223f18a556 Fix #175 2013-06-23 10:25:49 -04:00
calzoneman 072695995e Add superadmin flair command for no good reason 2013-06-22 19:38:44 -04:00
calzoneman f2df18979c Minor fix 2013-06-22 19:07:33 -04:00
calzoneman 8c9cbca4c4 Fixes 2013-06-22 19:02:55 -04:00
calzoneman 71b774b445 Paginate user table in ACP 2013-06-22 18:54:08 -04:00
calzoneman 6943845d7a Add action log 2013-06-21 21:28:21 -04:00
calzoneman 9d90f6c660 Add another nesting layer (#174) 2013-06-21 20:42:47 -04:00
calzoneman e400dac160 Merge branch 'v2.0' of github.com:calzoneman/sync into v2.0 2013-06-21 20:42:01 -04:00
calzoneman 55b5e54d97 more ACP work 2013-06-21 18:24:26 -04:00
Calvin Montgomery 9fd4d20a7e Confirm before deleting playlist 2013-06-20 23:11:38 -04:00
Calvin Montgomery 9038238936 Fix broken selector causing issues 2013-06-20 22:51:50 -04:00
calzoneman 7bb38ec8a5 Work on ACP improvements 2013-06-20 19:45:21 -04:00
calzoneman d04ba2b99d Add notification for playlist options 2013-06-20 18:15:35 -04:00
calzoneman b5b3a88f88 Another slight playlist button tweak 2013-06-20 17:15:41 -04:00
calzoneman 8251a29b8d Address points 3-5 of #174 2013-06-20 17:01:22 -04:00
calzoneman 247862355c Add option for old-style playlist buttons (#174) 2013-06-20 16:50:12 -04:00
calzoneman 59df3924f8 Add permission for chat 2013-06-20 15:02:53 -04:00
calzoneman 77800a6587 Ability to unregister channel 2013-06-20 14:54:15 -04:00
calzoneman 57faa03b7c tweaks 2013-06-20 14:43:37 -04:00
calzoneman fa243d5303 fixes 2013-06-20 00:42:20 -04:00
calzoneman 44a981bb54 Another CSS fix 2013-06-19 23:26:34 -04:00
calzoneman 15e55c9811 Slight fixes to CSS 2013-06-19 23:26:00 -04:00
calzoneman d3079a2b07 better handling of comma-separated queues 2013-06-19 23:20:56 -04:00
calzoneman 6353638115 add option to show queue butts by default 2013-06-19 22:49:49 -04:00
calzoneman c9d6c8b5db more poll fixes 2013-06-19 19:41:49 -04:00
calzoneman e52307cdfa Fix polls, MOTD/CSS/JS text 2013-06-19 19:39:40 -04:00
calzoneman db1682fc35 Fix account.html and channelist.html cookies 2013-06-19 18:11:11 -04:00
calzoneman 9c9ed754b1 Fix channellist cookie 2013-06-19 18:09:22 -04:00
calzoneman c369a10961 Fix alerts 2013-06-19 18:07:11 -04:00
calzoneman 823e9bef33 Remove old files 2013-06-19 17:56:52 -04:00
calzoneman f85e7fdc16 Add missing licenses 2013-06-19 17:56:05 -04:00
calzoneman 7b60d0948e Fixes 2013-06-19 17:54:27 -04:00
calzoneman dc5c6801ed Add voteskip button, fix bugs 2013-06-18 16:18:41 -04:00
calzoneman b60981c8d8 Ability to add chat filters 2013-06-18 15:59:45 -04:00
calzoneman 6eaa9a45d0 Continue working on filters 2013-06-18 11:51:42 -04:00
calzoneman 25862acd72 Work on chat filters 2013-06-18 10:57:53 -04:00
calzoneman 09e9fb2eab Add channel ranks editor 2013-06-18 10:46:28 -04:00
calzoneman 6f43a7efdc Notify moderators when a new user joins 2013-06-18 00:26:44 -04:00
Calvin Montgomery 449d01180a Banlist and recent login history 2013-06-17 23:57:29 -04:00
calzoneman ca6d2962d8 Continue working on channel settings 2013-06-17 18:16:59 -04:00
Calvin Montgomery 9dcaeb88c1 Continue working on options 2013-06-15 17:45:07 -04:00
calzoneman 00abe7ced1 Start working on channel settings 2013-06-12 13:07:58 -04:00
calzoneman f6615f1f20 Minor alignment fix 2013-06-11 23:46:42 -04:00
calzoneman 877b125766 Bad URL indicator, auto-remove player_embedded crap 2013-06-11 23:37:12 -04:00
calzoneman de2294d3ab So much work 2013-06-11 19:51:00 -04:00
calzoneman 1850f009ff Fixes, continue work 2013-06-11 15:41:03 -04:00
calzoneman 42fc2e45c8 Continue rewriting things 2013-06-11 11:29:21 -04:00
Calvin Montgomery 161a116e59 Work on playlist items 2013-06-09 18:18:27 -04:00
calzoneman 38b2816e23 Forgot to add util.js 2013-06-09 14:03:57 -04:00
calzoneman 9c3596b04a Still working on things 2013-06-09 14:03:41 -04:00
calzoneman 0214910d7e ho hum more rewriting stuff 2013-06-07 18:09:36 -04:00
Calvin Montgomery b5ec80d02f Continue working on rewriting stuff 2013-06-06 23:13:24 -04:00
calzoneman c7b3adbed1 Slight improvements 2013-06-06 19:38:47 -04:00
calzoneman a0768316a4 Start redesigning page 2013-06-06 17:48:21 -04:00
calzoneman 2c069c26b3 Add button to show/hide userlist 2013-06-06 13:53:10 -04:00
calzoneman 685358b0d8 Move user options to localStorage instead of cookies 2013-06-05 17:22:50 -04:00
calzoneman a1862496a9 Implement #163 2013-06-05 16:49:54 -04:00
calzoneman 33744da634 Revise channel ranks editor (Fixes #162) 2013-06-05 11:40:59 -04:00
Calvin Montgomery 33f4ffcec2 Add permission option for livestreams 2013-06-04 22:51:41 -04:00
Calvin Montgomery 8c6d2ccfb2 Add imgur album embedding 2013-06-04 22:47:02 -04:00
Calvin Montgomery ef6a415c1b Don't remove user theme when channel CSS is set 2013-06-04 22:36:49 -04:00
calzoneman a02228afdd Add license text to files missing it 2013-06-04 18:26:17 -04:00
calzoneman 2c57d2a8f2 Fixes, rate limiting 2013-06-04 18:22:05 -04:00
calzoneman cfc866400c Break out NWS into a user option 2013-06-04 15:41:34 -04:00
calzoneman ddc1c56986 Adaptive poll rate for NWS 2013-06-04 15:28:54 -04:00
calzoneman cc1b378c3d NWS fixes 2013-06-04 12:11:16 -04:00
calzoneman 44fa360c60 Continue working on NWS 2013-06-04 11:46:06 -04:00
Calvin Montgomery 9eafc53c91 start experimenting with a fallback layer 2013-06-03 23:56:06 -04:00
calzoneman cfd70cff12 Add notification when queueing jwplayer 2013-06-02 19:37:48 -04:00
calzoneman 3ebf4a1009 Leader synchronization for JWPlayer 2013-06-02 19:19:51 -04:00
calzoneman d2271a020b Add playlist item count and playtime 2013-06-02 13:54:58 -04:00
calzoneman b87dd8b5e7 Redesign playlist management 2013-06-01 16:56:23 -04:00
calzoneman bd7288bed3 Add user playlist interface 2013-06-01 15:42:08 -04:00
calzoneman 28a960285c Begin working on playlists 2013-06-01 11:59:04 -04:00
calzoneman 52b88c0e40 Finish up 2013-05-30 14:34:54 -04:00
calzoneman 5205afb9cd Add password reset emailer 2013-05-30 14:07:29 -04:00
calzoneman c8df4b036c More work 2013-05-29 21:04:22 -04:00
calzoneman 74203ad223 Continue work on account management and password reset 2013-05-29 14:19:43 -04:00
calzoneman f3da02566c Start working on account management 2013-05-29 11:49:09 -04:00
calzoneman 8592c17bec Add maxlength to chatline (Fix #156) 2013-05-28 17:10:35 -04:00
calzoneman a3331ff758 Move callback initialization to prevent race condition 2013-05-28 17:06:23 -04:00
calzoneman a882f598d6 begin working on password reset 2013-05-28 11:40:06 -04:00
calzoneman a3138abd38 more fixes 2013-05-27 21:12:07 -04:00
calzoneman 16d3c600fe Fix #152; change JS load order to load faster 2013-05-27 15:00:32 -04:00
calzoneman 296bddefcd Fix #153 2013-05-27 14:35:24 -04:00
Calvin Montgomery 81d6b4873d More pagination 2013-05-26 23:10:16 -04:00
Calvin Montgomery ee10a080cc Search results pagination and clearing 2013-05-26 22:45:50 -04:00
calzoneman 50d73cee5b Fix #151 2013-05-26 12:53:35 -04:00
calzoneman 828b7e0381 Fix #149 and a couple other issues 2013-05-26 11:38:38 -04:00
calzoneman 486c6f7c8a Tweak index page and channellist 2013-05-24 13:13:07 -04:00
calzoneman ca72d79193 Update help.html for /clear 2013-05-23 00:05:43 -04:00
calzoneman a5c297365c Fixes; implement /clear command 2013-05-23 00:03:37 -04:00
calzoneman 4e364f45a6 Add permissions editor; fixes for bans 2013-05-22 15:38:16 -04:00
calzoneman 12c1f4acf8 Fix sort error for connection log 2013-05-22 10:56:27 -04:00
calzoneman f8b0b06caf Add username bans, tweak ban interface 2013-05-21 12:17:01 -04:00
calzoneman 505c628eb9 Tweak bans 2013-05-19 17:23:35 -04:00
calzoneman ea9132624a Fix index.html to work in non-root directories 2013-05-19 13:34:14 -04:00
calzoneman cf2e1213a9 Give feedback when a queue fails 2013-05-19 13:06:39 -04:00
calzoneman 01fc746334 Implement #137 2013-05-19 12:56:13 -04:00
calzoneman 3e2683642e Fix ACP 2013-05-17 19:04:39 -04:00
calzoneman 886834e822 Fix broken URLs from last commit 2013-05-17 18:56:11 -04:00
calzoneman 6dc0a33bda Separate ports for webserver and socketio
It came to my attention today that some firewalls block websocket traffic on port 80.  For this reason, I have split out the webserver and socket.io traffic to 2 different ports.
In config.js, IO_PORT is the socket.io port.  This should NOT be port 80.  WEBSERVER_PORT is the port that the built in webserver will bind to (can be port 80, but this requires root permissions).
You will connect to yourhostname:WEBSERVER_PORT, and use yourhostname:IO_PORT as IO_URL.
2013-05-17 18:39:49 -04:00
calzoneman 66fbbb77ce Add Justin.tv support 2013-05-17 14:39:58 -04:00
calzoneman 79ec535358 Improve chat button 2013-05-17 13:36:58 -04:00
calzoneman 8671edd106 Add option for send button in chat 2013-05-17 11:23:11 -04:00
calzoneman 767cfdd76e Improve announcements; remove debug console.log 2013-05-16 22:48:37 -04:00
calzoneman 8da604fd8a Solve #130 2013-05-16 22:39:33 -04:00
calzoneman a8d8f346d4 Add editors for CSS and JS 2013-05-15 11:34:27 -04:00
calzoneman b3cb87aab6 Add a little note about emoticon filters 2013-05-15 10:44:15 -04:00
calzoneman 91e3049e61 I could swear I fixed announcements before 2013-05-14 22:32:59 -04:00
calzoneman 25a2c053e9 Fix login page to load user theme 2013-05-14 18:07:55 -04:00
calzoneman ad54cffee1 Make it clear that custom css/js are URLs 2013-05-14 17:50:05 -04:00
calzoneman c1c3e4c47f Add ustream support 2013-05-14 17:22:47 -04:00
calzoneman e45489b77c Fix polls not autoscrolling chat 2013-05-14 13:15:58 -04:00
calzoneman ce99233596 Reduce amount of data sent in media updates 2013-05-14 11:35:11 -04:00
calzoneman 69550c7a51 Fix errors when video is hidden 2013-05-14 11:19:03 -04:00
calzoneman d0b3f9014a Make links unaffected by chat filters 2013-05-13 19:54:52 -04:00
calzoneman 4fe8ab164d Fix leader function 2013-05-13 19:44:51 -04:00
calzoneman 22b10e3ffa Implement #123 2013-05-13 18:05:01 -04:00
calzoneman 59fa9aa029 Fix video height inconsistency on fluid layout 2013-05-13 16:15:12 -04:00
calzoneman 4620fb2d56 Add unregistration for channel admins 2013-05-13 15:41:29 -04:00
calzoneman 27cfbcb61a Fix #121 2013-05-13 15:06:09 -04:00
calzoneman 46fa93c35d Update help.html 2013-05-13 11:51:34 -04:00
calzoneman 12c2ef8669 Fix race condition for fluid layout 2013-05-12 22:13:28 -04:00
calzoneman b98a785740 More modal fixes 2013-05-12 22:11:32 -04:00
calzoneman a6fff1c849 Fixes 2013-05-12 21:37:03 -04:00
calzoneman c7e63391f6 Add fluid layout option 2013-05-12 21:15:05 -04:00
calzoneman b00e63b622 Fix #119 2013-05-12 20:46:28 -04:00
calzoneman ebe48798fe Implement user profiles
Existing installations will have to apply the following SQL:
```sql
ALTER TABLE `registrations` ADD `profile_image` VARCHAR( 255 ) NOT NULL ,
ADD `profile_text` TEXT NOT NULL
```
2013-05-12 20:41:02 -04:00
calzoneman c6446d6f84 Begin working on profiles 2013-05-12 16:15:39 -04:00
calzoneman d9ed665540 Show page title in channel list 2013-05-12 11:46:19 -04:00
calzoneman 3af35cb268 Add links to playlist entries and the index page 2013-05-12 11:41:14 -04:00
calzoneman 161c8517b2 Change icons for next and temp, update help.html 2013-05-11 18:15:48 -04:00
calzoneman 369517945b Implement #106 2013-05-11 15:21:14 -04:00
calzoneman 2622aaac41 Implement #107 2013-05-11 15:12:51 -04:00
calzoneman aba806018c Add Total row to channellist 2013-05-11 14:53:33 -04:00
calzoneman 0f2c17b828 Fix #105 2013-05-10 18:06:58 -04:00
calzoneman dd67179fd4 Variable sync accuracy 2013-05-10 16:31:04 -04:00
calzoneman bafce39107 Show timestamps on continued messages 2013-05-09 21:12:01 -04:00
calzoneman ab2118da48 Implement #101 2013-05-09 17:59:02 -04:00
calzoneman 6168523a1c Refactor callbacks 2013-05-09 12:05:39 -04:00
calzoneman d102ca8815 Fix #95, Fix #96 2013-05-06 11:24:55 -05:00
calzoneman 703ac3ce4f Add temporary videos 2013-05-04 17:54:28 -05:00
calzoneman 62e80cec63 Add password change (#88) 2013-05-04 13:01:04 -05:00
calzoneman 27c1f78dbd Add banlist to acp 2013-05-04 12:30:38 -05:00
calzoneman 622788f7e7 Implement #91 2013-05-04 11:53:07 -05:00
calzoneman e524fca989 Add logviewer to ACP 2013-05-03 15:53:10 -05:00
calzoneman e62a02673c Fix #82 2013-05-02 22:02:25 -05:00
calzoneman cecb5db6c7 Fix #81 2013-05-02 21:56:31 -05:00
calzoneman 1d90ea48d2 Implement #78 (as an option) 2013-05-02 10:25:39 -05:00
calzoneman dbf41e3499 Fix old style URL redirect 2013-05-01 18:17:19 -05:00
calzoneman b36fd3518e Fix index.html 2013-05-01 17:57:59 -05:00
calzoneman 288da92e6f Remove login from index.html since it's unnecessary 2013-05-01 17:54:55 -05:00
calzoneman 41de5c5d7a Add homepage channel list 2013-05-01 17:49:34 -05:00
calzoneman 5b7eed3541 Sort usernames in connection log 2013-05-01 17:24:07 -05:00
calzoneman d8894f0280 Add timestamps (optional) to chat messages 2013-05-01 16:03:03 -05:00
calzoneman 3600a3114a Transition channel page away from index.html 2013-05-01 13:39:01 -05:00
calzoneman 7a2f3efcff Fix #74 2013-05-01 13:03:03 -05:00
calzoneman ab3dd208c3 Alert on wrong credentials (#76) 2013-05-01 13:02:06 -05:00
calzoneman 6a3e248ea5 Add donation link to footer 2013-04-30 17:09:30 -05:00
calzoneman f76b509430 Pressing enter on media URL queues next 2013-04-30 11:15:03 -05:00
calzoneman b0cc87e193 Add site footer 2013-04-30 11:13:06 -05:00