Commit Graph

12303 Commits

Author SHA1 Message Date
Baris Usakli
b0284487f2 added users link to top bar 2013-05-14 15:56:38 -04:00
Baris Usakli
b13b74dadb buttons for add friend and send message 2013-05-14 15:50:32 -04:00
psychobunny
527547b4a4 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-14 19:33:53 +00:00
psychobunny
35974ed6b9 more changes to category view 2013-05-14 19:33:50 +00:00
Baris Usakli
073b87982b moved user routes into routers/user.js 2013-05-14 14:04:19 -04:00
psychobunny
3fa0f7c8b5 fixed three bugs in templates: 1) if you're sending in null as a value it should now correctly replace that field as ''. 2) you don't need to put objects last in data anymore (stupid bug) 3) you can now send multiple objects to be parsed in templates properly; Also added deprecation message to server side templates 2013-05-14 17:36:12 +00:00
psychobunny
8e48990a48 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-14 13:07:11 -04:00
psychobunny
7e67260a74 still derping away on duhsign 2013-05-14 13:05:58 -04:00
Baris Usakli
188b1d5ada for andrew 2013-05-14 13:04:12 -04:00
Baris Usakli
b429a31f6b more clean up 2013-05-14 12:26:26 -04:00
Julian Lam
c5b7e7cc08 Merge remote-tracking branch 'origin' 2013-05-14 12:20:53 -04:00
Julian Lam
613b53ac3d removing console logs 2013-05-14 12:20:33 -04:00
Baris Usakli
4c324664fa removed global modules 2013-05-14 12:13:29 -04:00
Julian Lam
315cf9a88d Merge branch 'popstate' 2013-05-14 12:04:53 -04:00
Julian Lam
c351d83418 added popstate functionality 2013-05-14 12:04:38 -04:00
Baris Usakli
d564811b71 fixed the data passing to accountedit.tpl 2013-05-14 11:32:37 -04:00
Baris Soner Usakli
0bb0fd5789 removed debug console.logs 2013-05-13 17:40:51 -04:00
Baris Soner Usakli
901b378912 css fix 2013-05-13 17:40:14 -04:00
Julian Lam
23254103e4 Merge branch 'master' of github.com:psychobunny/NodeBB 2013-05-13 17:30:59 -04:00
Julian Lam
f662353cbf fixes to thread avatar on phone 2013-05-13 17:30:51 -04:00
Baris Soner Usakli
d7b6141e31 button to change picture 2013-05-13 17:02:10 -04:00
Julian Lam
624658307c Merge branch 'master' of github.com:psychobunny/NodeBB 2013-05-13 16:57:58 -04:00
Julian Lam
487d740164 added client and server validation on registration 2013-05-13 16:57:47 -04:00
Baris Soner Usakli
6942107dd4 regen gravatar url when email changes 2013-05-13 16:41:28 -04:00
Julian Lam
9a768a4f6c Merge branch 'master' of github.com:psychobunny/NodeBB 2013-05-13 15:18:12 -04:00
Julian Lam
8bb724e994 minor tweaks to config default, and text copy update on registration page
updated readme to mention the upload_path option
2013-05-13 15:17:46 -04:00
Baris Soner Usakli
62bffff3c7 forgot to add a ; 2013-05-13 15:16:54 -04:00
Julian Lam
eb606855bc updating config defaults to automatically construct upload_url 2013-05-13 14:38:08 -04:00
psychobunny
c3e7aa9766 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-13 18:34:01 +00:00
psychobunny
6b495767c0 removed server side templates for register 2013-05-13 18:33:53 +00:00
Baris Soner Usakli
2631e42b64 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-13 14:26:16 -04:00
Baris Soner Usakli
71d595a552 debug image uploading 2013-05-13 14:26:08 -04:00
psychobunny
49fcea503e Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-13 18:22:31 +00:00
psychobunny
e41cc6fd10 toying around with category listing again 2013-05-13 18:22:24 +00:00
Baris Soner Usakli
613325c4ec Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-13 14:17:14 -04:00
Baris Soner Usakli
b18330f246 fixed bug in image upload that was causing multiple form submits, added progress bar to image upload 2013-05-13 14:17:04 -04:00
Julian Lam
aab149aecf Merge branch 'master' of github.com:psychobunny/NodeBB 2013-05-13 14:16:43 -04:00
Julian Lam
80b20fe877 adding alternate logins to register page 2013-05-13 14:16:33 -04:00
Baris Soner Usakli
3b6e20d4ef image upload cleaned up a bit 2013-05-13 13:57:42 -04:00
Baris Soner Usakli
eccd1f66d1 removed some debug stuff from image upload 2013-05-13 13:51:25 -04:00
Baris Soner Usakli
5796140f58 image upload changes 2013-05-13 13:30:33 -04:00
Baris Soner Usakli
5785b16ae9 fixed users page so that all reps and post counts are comma delimited, some image upload fixes 2013-05-13 12:45:40 -04:00
Baris Soner Usakli
e476e27807 image upload error msgs, file size limit 2013-05-13 12:14:10 -04:00
Julian Lam
9df65da7d4 Merge branch 'master' of github.com:psychobunny/NodeBB 2013-05-12 16:04:40 -04:00
Julian Lam
0c047d2fc4 fixing indents in one code block 2013-05-12 16:03:45 -04:00
Julian Lam
1b61511e8a fixed tabindex in reply window, wrapping up some minor bugs in editing
posts
2013-05-12 15:59:45 -04:00
Julian Lam
156d5dce08 post deletion 2013-05-12 15:46:23 -04:00
Julian Lam
4fd1244e2d some work on deleting posts, and allowing a mod to edit a post 2013-05-11 23:35:27 -04:00
Baris Soner Usakli
9ba5490da6 users page images 80x80 2013-05-11 22:07:09 -04:00
Julian Lam
b608a5ff97 Merge branch 'master' into edit_delete 2013-05-11 22:05:10 -04:00