Commit graph

596 commits

Author SHA1 Message Date
Calvin Montgomery 565759decf Merge changes from master 2013-06-15 16:07:38 -04:00
Calvin Montgomery 0d89c13c05 Merge branch 'dev' 2013-06-14 16:21:34 -04:00
Calvin Montgomery 0de83b466b Address #171 2013-06-14 16:21:17 -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 60ecf96670 Fix temporary videos affecting library 2013-06-11 23:44:16 -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
Calvin Montgomery fc9403a0dd Merge branch 'dev' 2013-06-09 23:58:02 +04:00
Calvin Montgomery 9703086c7c Fix IP hiding causing ban issues 2013-06-09 23:57:48 +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 4d759abac3 Merge branch 'dev' 2013-06-09 11:48:26 -04:00
calzoneman 40d0bdf120 Fix side effects of Channel.tryIPBan 2013-06-09 11:47:46 -04:00
Calvin Montgomery 4ef059ddaa Merge pull request #169 from calzoneman/dev
Merge dev into master
2013-06-08 13:38:02 -07: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 261abadf12 Fix possible race condition 2013-06-06 19:22:27 -04:00
calzoneman ca7a9e83a5 Fix IPban dropdown option 2013-06-06 19:13:56 -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 c8dac585ed Merge branch 'dev' of github.com:calzoneman/sync into dev
What.  I don't even
2013-06-04 18:49:40 -04:00
calzoneman d5e03c10b6 Increment version number 2013-06-04 18:34:03 -04:00
calzoneman ae55f44906 Fix #165 2013-06-04 18:33:51 -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 8bda02723b Merge branch 'master' into nwsexperiment 2013-06-04 15:16:23 -04:00
calzoneman 723da8b9d9 Fix sqlescape breaking table names 2013-06-04 12:26:16 -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 70f2065a36 Improve SQL escaping 2013-06-03 18:37:30 -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 ecabb5e71b Fix #159 2013-06-02 18:09:52 -04:00
calzoneman d2271a020b Add playlist item count and playtime 2013-06-02 13:54:58 -04:00
calzoneman 04e81338ee Merge branch 'master' of github.com:calzoneman/sync into dev 2013-06-02 13:39:57 -04:00
calzoneman c8ff3b4bcb Fix #160 2013-06-02 00:21:23 -04:00