diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-09-05 05:57:56 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-09-05 05:57:56 -0400 |
| commit | 626de9aba2c1513b67482602bf2d639f2feeb6b9 (patch) | |
| tree | e5d76143bd5f9fd45ce706688d3b01fda75082c5 | |
| parent | 2fcfd448fe0c28b41f14f7cd8c51abb5154e1bba (diff) | |
| parent | 62d6401ca88bc72ffe157d3af3bfec7c8cbb3100 (diff) | |
Merge branch 'master' of /pichat/repo
| -rw-r--r-- | docs/reserved_nicks.txt | 2 | ||||
| -rw-r--r-- | src/site.clj | 4 | ||||
| -rw-r--r-- | static/css/index.css | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt index 7285642..83be5fd 100644 --- a/docs/reserved_nicks.txt +++ b/docs/reserved_nicks.txt @@ -21,6 +21,7 @@ dis-register dump dumpfm error +errorlogger event events fame @@ -49,6 +50,7 @@ library links live log +logerror login logout memes diff --git a/src/site.clj b/src/site.clj index aee56d3..23e2d8d 100644 --- a/src/site.clj +++ b/src/site.clj @@ -1420,6 +1420,6 @@ WHERE u.user_id = ANY(?)" ;; (start! feed-inserter)))
-(if (not= *server-url* "http://dump.fm")
- (start! random-poster))
+;(if (not= *server-url* "http://dump.fm")
+; (start! random-poster))
diff --git a/static/css/index.css b/static/css/index.css index b0c3ae3..1b745d6 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -432,4 +432,8 @@ z-index:-1; } .nivo-controlNav a.active { font-weight:bold; +} + +#register-spinner { + display: none; }
\ No newline at end of file |