Commit Graph

523 Commits

Author SHA1 Message Date
bush fb2d568c76 Merge remote-tracking branch 'upstream/3.0' into 3.0 2015-03-06 22:00:40 +00:00
bush 6138d3b7ff Fixes for calzoneman <3 2015-03-06 21:59:34 +00:00
calzoneman e6bdbb99b1 Prefer MP4 over WebM because IE can't play webm apparently 2015-03-06 00:23:06 -06:00
calzoneman 950853ba71 cytubefilters: bump git hash 2015-03-05 14:31:58 -06:00
bush f191e2a9c9 Fixed cipher list to high 2015-03-05 04:42:01 +00:00
bush a9a77147be Enabled disabling of openssl cipher suits. RC4 disabled by default. 2015-03-05 04:31:45 +00:00
calzoneman a049a7e2dc Fix login/logout redirects 2015-02-24 11:08:10 -06:00
calzoneman a0b7bff70c Fix 2015-02-24 10:48:51 -06:00
Calvin Montgomery 6ab609db71 Merge pull request #454 from calzoneman/gdocs-refactor
Gdocs refactor
2015-02-24 10:42:35 -06:00
Calvin Montgomery 62b81708ab Merge pull request #453 from calzoneman/csurf
Add csrf middleware
2015-02-24 10:42:11 -06:00
bush6 c2a00420f2 Merge remote-tracking branch 'upstream/3.0' into 3.0 2015-02-24 08:28:08 +10:00
bush6 ca0f0c4086 set uid timeout
Allow the timeout to be changed allowing more time before dropping root
privledges
2015-02-24 08:08:43 +10:00
calzoneman afc0ea0a58 Add csrf prevention 2015-02-22 18:15:22 -06:00
calzoneman 400e15dea8 Fix logins on raw IPs in chrome 2015-02-21 14:48:24 -06:00
bush 960f94bfb6 Forgot the new file :o 2015-02-21 19:13:55 +11:00
bush 2f6fb43152 added a feature to change uid/gid after startup to bind ports lower than
1024 on Linux
2015-02-21 19:12:26 +11:00
calzoneman a6eaa944c1 Fix improper null check 2015-02-20 23:23:10 -06:00
calzoneman c9025fbb44 Fix titles and error messages 2015-02-20 23:17:34 -06:00
calzoneman ad13896739 Make gdocs retrieval less janky 2015-02-20 22:59:11 -06:00
calzoneman 1b5f8d47aa Fix 2015-02-20 18:54:00 -06:00
calzoneman df62ee8d58 Fixes 2015-02-20 18:54:00 -06:00
calzoneman 08a9eae2d3 Change login sessions 2015-02-20 18:53:02 -06:00
calzoneman b579db5310 Change login sessions 2015-02-20 18:53:02 -06:00
calzoneman a31273be5c Initial 'remember me' support for logins 2015-02-20 18:53:02 -06:00
bush ff8a9d02fe fixed missing , xD 2015-02-20 08:10:04 +11:00
bush 407f8930c3 Fixed email not getting sent from correct email in config. Added way to
change the default name (CyTube Services) that email is sent from.
2015-02-20 07:53:33 +11:00
Xaekai ca17c82c8c Make doubly sure fixed calzoneman/sync#445 2015-02-16 00:50:15 -08:00
Calvin Montgomery 8c33818b36 Merge pull request #439 from Xaekai/3.0
Google+ metadata retrieval overhaul
2015-02-16 00:29:32 -06:00
Xaekai 26a9446d3d I commit this code in the name of Pinkie Pie. 2015-02-15 17:36:29 -08:00
Adam Lavin efb9d30de0 Added in ability to change mysql port 2015-02-14 22:20:26 +00:00
calzoneman 406717bb18 Update to work on node v0.12 2015-02-14 12:17:33 -06:00
Calvin Montgomery 93567c57f1 Merge pull request #432 from calzoneman/deps-upgrade
Upgrade dependencies
2015-01-31 11:44:38 -06:00
Calvin Montgomery 583e7e7616 Merge pull request #431 from calzoneman/hitbox
Add hitbox support
2015-01-27 00:29:44 -06:00
calzoneman 858207a6f8 Upgrade deps 2015-01-27 00:12:40 -06:00
Calvin Montgomery bbd03e4e0f Log aliases when someone logs in 2015-01-26 12:20:19 -06:00
calzoneman 50bf876010 Add hitbox support 2015-01-22 23:21:31 -06:00
calzoneman 5cde74cbd4 Fix potential cause for playlist timer problem 2015-01-22 16:53:36 -06:00
calzoneman 7d2015620a socket.io: upgrade to 1.3 2015-01-19 17:43:22 -06:00
calzoneman 9fc1cbd81c Whitelist <s> tags for filters 2015-01-19 01:26:46 -06:00
Calvin Montgomery d7ef0d1893 Merge pull request #428 from calzoneman/sanitize-html
Merge sanitize-html into 3.0 #yolo
2015-01-14 13:23:01 -06:00
calzoneman 139825168f Fix for private, but embeddable soundcloud tracks 2015-01-11 12:10:09 -06:00
calzoneman 80c4c90bcf Migrate old MOTDs and don't replace \n with <br> after 2015-01-08 20:07:02 -06:00
Calvin Montgomery 12f3161f50 XSS: Glob attributes data-*, aria-* 2015-01-08 20:07:01 -06:00
Calvin Montgomery 1c3a669279 Replace XSS filter with sanitize-html 2015-01-08 20:07:01 -06:00
calzoneman 8630c5972c deps: upgrade socket.io to 1.2.1 2015-01-08 17:57:44 -06:00
Erik 4135ec0bf8 Kick/Mute immunity should only be if globalRank is strictly greater 2015-01-08 09:58:44 -05:00
Calvin Montgomery 032f600746 Kick/Mute immunity should only be if globalRank is strictly greater 2015-01-08 08:48:00 -05:00
Erik 5d843358d2 site admins should be immune from kick/mute 2015-01-06 22:55:14 -05:00
Calvin Montgomery cf35c92391 Apparently this happens a lot, don't put it in the logfile 2015-01-06 10:58:15 -05:00
Calvin Montgomery 414cbfdc5d Add more safeguards for socket errors 2015-01-06 10:54:14 -05:00