Commit graph

212 commits

Author SHA1 Message Date
Kyle Drake
a498b9445c fix footer 2013-07-13 21:44:00 -04:00
Kyle Drake
8fc7e71d39 Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign 2013-07-13 21:41:28 -04:00
Kyle Drake
1758715dda app -> na 2013-07-13 21:41:25 -04:00
Scott O'Hara
565f0e19fa Merge branch 'newdesign' of https://github.com/kyledrake/neocities-web 2013-07-13 21:41:03 -04:00
Scott O'Hara
675ee16aed oh my 2013-07-13 21:40:56 -04:00
Kyle Drake
8b4dd1278d try to fix bleeding into header 2013-07-13 21:35:50 -04:00
Kyle Drake
222a170cb5 Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign 2013-07-13 21:34:02 -04:00
Scott O'Hara
b7c08b139c Merge branch 'newdesign' of https://github.com/kyledrake/neocities-web 2013-07-13 21:33:57 -04:00
Kyle Drake
ee961ff6ec try to fix lack of closing row div 2013-07-13 21:33:47 -04:00
Scott O'Hara
d539c6f7d4 more stuff 2013-07-13 21:33:44 -04:00
Kyle Drake
53cb5ded6d try to fix lack of closing row div 2013-07-13 21:33:01 -04:00
Kyle Drake
2e1a83c770 Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign 2013-07-13 21:30:55 -04:00
Kyle Drake
ae4b012f7b try non-center rows for browse 2013-07-13 21:30:48 -04:00
Scott O'Hara
d67f480f47 Merge branch 'newdesign' of https://github.com/kyledrake/neocities-web 2013-07-13 21:25:30 -04:00
Scott O'Hara
1a76c3a9dd this is kinda fun 2013-07-13 21:25:13 -04:00
Kyle Drake
096bfbfc3c Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign 2013-07-13 21:23:15 -04:00
Kyle Drake
bd4d22ab57 nav and my broken browse page 2013-07-13 21:23:08 -04:00
Scott O'Hara
f9d3c03280 more to test 2013-07-13 21:20:19 -04:00
Scott O'Hara
9691bb2ec2 some fixes
push plz
2013-07-13 21:03:23 -04:00
Kyle Drake
64eab634f6 http://i.imgur.com/xVyoSl.jpg 2013-07-13 20:43:02 -04:00
Kyle Drake
e7689a09df Commit of new front page 2013-07-13 17:09:32 -04:00
Scott O'Hara
f6724e3757 Merge branch 'master' of https://github.com/kyledrake/neocities-web 2013-07-13 15:03:02 -04:00
Scott O'Hara
3e2cdcd138 redesign
included all dev and production files for new redesign.

the index file has a different layout than the interior page files.

for more in-depth look into how these are set up, look in the templates > includes & layouts folders.

I used .liquid files to create these pages, and all the content for the files are in there, with the base layout stuff in the includes and layout files.

check the converted-html folder to see how everything should look.

(test it on an android phone.  should look good now) :)
2013-07-13 15:02:32 -04:00
Kyle Drake
72c818e048 neocities gateway error page 2013-07-13 13:40:08 -04:00
Kyle Drake
b3c80622ce web site not found html 2013-07-13 19:17:49 +02:00
Kyle Drake
10b83629d0 more fixes, remove debug code 2013-07-13 17:32:57 +02:00
Kyle Drake
a66bee4b63 LETS TRY THIS AGAIN 2013-07-13 11:06:08 -04:00
Kyle Drake
38b2914e70 error reporting 2013-07-13 11:01:13 -04:00
Kyle Drake
f059772d5e last fix to contact 2013-07-13 16:52:27 +02:00
Kyle Drake
5e4c54faf2 last minute tweaks for contact 2013-07-13 16:49:39 +02:00
Kyle Drake
d7819fd25f not found page, contacts 2013-07-13 10:45:15 -04:00
Kyle Drake
3995a64db1 flag for marking sites changed 2013-07-13 10:19:24 -04:00
Kyle Drake
93f7918340 fix password reset, fix ip blocker, turn off js for now 2013-07-12 07:04:01 +02:00
Kyle Drake
6245319bc1 fixes to password reset 2013-07-12 06:12:48 +02:00
Kyle Drake
82195a9cb8 10 second timeout, one retry 2013-07-12 05:55:12 +02:00
Kyle Drake
1e1051fd36 what's this? is this password reset??? 2013-07-11 23:33:10 -04:00
Kyle Drake
72947b6606 Fix worker load 2013-07-12 04:59:35 +02:00
Kyle Drake
0a618c5895 latest sidekiq 2013-07-11 21:15:31 -04:00
Kyle Drake
93ede044d9 queue, retry, config 2013-07-11 21:10:11 -04:00
Kyle Drake
91b4d8aa14 sidekiq for processing 2013-07-11 21:06:38 -04:00
Kyle Drake
44b61170e5 Merge pull request #21 from talklittle/master
Fixed GH-20 "Numbers are stripped from filenames on save"
2013-07-11 17:25:55 -07:00
Andrew Shu
fc99f296b3 Fixed filename sanitization: allow numbers when saving via text editor 2013-07-11 17:56:41 -04:00
Kyle Drake
265a719fda add ssl 2013-07-10 23:41:50 -04:00
Kyle Drake
9033e57074 is_nsfw 2013-07-08 21:36:57 -04:00
Kyle Drake
4e20af4618 tweaks to config 2013-07-09 03:32:12 +02:00
Kyle Drake
d85482a6c4 updates to config 2013-07-07 23:13:54 +02:00
Kyle Drake
5eb85e28f3 add settings page 2013-07-06 23:56:41 -04:00
Victoria Wang
b0f3d40bda Added .psd version of homepage mockup 3 2013-07-03 02:31:17 -05:00
Kyle Drake
1f3a0095e7 turn off autocap and autocorrect for some stuff, html tutorials 2013-07-02 11:43:41 -04:00
Kyle Drake
4c28c11f91 Merge pull request #16 from tomByrer/patch-1
+ free HTML/CSS tutorial links on dashboard
2013-07-02 08:32:22 -07:00