Merge branch 'master' into dev

app.moon

@@ -1,5 +1,4 @@
 lapis = require "lapis"
-config = require("lapis.config").get!
 
 import respond_to, json_params from require "lapis.application"
 

blog.moon

@@ -154,8 +154,6 @@ class extends lapis.Application
                     br!
                     textarea cols: 80, rows: 13, name: "text"
                     br!
-                    text "(Note: Tables are not part of standard Markdown, and will not work.)"
-                    br!
                     element "select", name: "status", ->
                         for status in *Posts.statuses
                             if status == Posts.statuses.draft
@@ -230,8 +228,6 @@ class extends lapis.Application
                         br!
                         textarea cols: 80, rows: 13, name: "text", post.text
                         br!
-                        text "(Note: Tables are not part of standard Markdown, and will not work.)"
-                        br!
                         element "select", name: "status", ->
                             for status in *Posts.statuses
                                 if status == Posts.statuses[post.status]

misc.moon

@@ -25,7 +25,7 @@ class extends lapis.Application
             ol ->
                 li "Do not post links to pirated software. You can discuss piracy, but do not link to illegal downloads."
                 li "No constant advertising. It's fine to tell people you have a YouTube channel or are working on something, but do not mention it constantly."
-                li "By default, no one can post links except in the #shitpost channel. If you build up trust, you will be allowed to post in other channels."
+                li "By default, no one can post links except in the #picsandlinks and #shitpost channels. If you build up trust, you will be allowed to post in other channels."
                 li ->
                     text "The channels:"
                     ul ->
@@ -34,10 +34,9 @@ class extends lapis.Application
                         li "#trusted is a private channel for people I trust."
                         li "#music is for sharing music! :D"
                         li "#concept-art is for sharing concept art."
-                        li "#shitpost is for random crap..since some people want that for some reason. >.>"
-                        li "#roleplay .. some of our users like to roleplay .. I made this so they'd get out of #general .."
                         li "#bot-abuse is for playing with BoomBot, developed by Lomeli. :P"
-                        li "#boomtest is a testing channel for Lomeli's use on BoomBot development."
+                        li "#picsandlinks is for sharing stuff, as long as it's not crap."
+                        li "#shitpost is for random crap..since some people want that for some reason. >.>"
                 hr!
                 li "More rules may be added as needed, obviously."
                 li title: "If you don't like it, see http://xkcd.com/1357/", "And finally, if you are causing significant annoyance to several members, especially if they are friends of mine, I may ban you."
@@ -152,6 +151,12 @@ class extends lapis.Application
                         li "Name to call you (or I will use whatever your email uses)"
                         li "Action groups, any other notes you want to add"
 
+                dt -> a name: "ksp-mods-allowed", "Can I use mods / X mod on a craft I submit to you?"
+                dd "As long as you tell me what mods are used, and I can get ahold of them, I don't care. The more mods you use though, the more likely I will delay your craft, as mods make it harder to make episodes."
+
+                dt -> a name: "ksp-submit-non-planes", "Can I submit crafts that aren't planes?"
+                dd "Yes."
+
                 dt -> a name: "email", "Did you get my email? Why didn't you reply to my email?"
                 dd ->
                     text "Assuming you sent it to the "

views/index.moon

@@ -10,6 +10,8 @@ class extends Widget
         p ->
             text "Want to submit a craft? "
             a href: @url_for("ksp_submit_crafts"), "Click here!"
+            text " Want to see the submitted crafts? "
+            a href: @url_for("ksp_craft_list"), "Click here!"
         p ->
             text "I also just started a blog on here for random rambly bits. You can see it "
             a href: @url_for("blog_index"), "here"