Commit Graph

6441 Commits

Author SHA1 Message Date
Julian Lam
de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage 2015-11-05 13:47:26 -05:00
Julian Lam
b8b9da2c30 Squashed commit of the following:
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 11:04:27 2015 -0500

    tweaked 503 template

commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:58:19 2015 -0500

    added text about reloading being required if threshold values are changed

commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:53:35 2015 -0500

    added ACP settings for toobusy

commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 08:53:53 2015 -0500

    removed unused 503a template

commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 02:01:11 2015 -0500

    updated code to send static 503 instead of maintenance-style page

commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 01:18:45 2015 -0500

    added toobusy support so the Node process doesn't fall over at high load
2015-11-05 12:44:51 -05:00
barisusakli
0d23c56281 removed event:disconnect 2015-11-05 11:31:59 -05:00
barisusakli
bac2a0d959 removed event:connect use socket.io connect event duh 2015-11-05 11:25:53 -05:00
yariplus
f815f2d981 Fix userhomepage derps 2015-11-04 05:55:02 -05:00
yariplus
853aa37cd2 Add user home pages. #3616 2015-11-04 04:08:22 -05:00
Julian Lam
ceaa3a334d Squashed commit of the following:
commit 3a39e5e6bd3c357d78d8ec1dad6e3a64c18ee3ab
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:15:10 2015 -0500

    minor tweak

commit ed3c25ba8b431a2b730aae78a43cfa934521a5d4
Merge: d9cde96 d7a0adc
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:12:32 2015 -0500

    Merge branch 'master' of https://github.com/acardinale/NodeBB into acardinale-master

commit d7a0adc5c8
Author: Andrea Cardinale <a.cardinale@webandtech.it>
Date:   Wed Sep 30 10:32:25 2015 +0200

    Get registry (if it's set) from config.json in suggest method (client-side)
2015-11-03 20:15:30 -05:00
psychobunny
281f377fde Merge branch 'master' of https://github.com/NodeBB/NodeBB 2015-11-03 14:54:39 -05:00
psychobunny
726c3802e1 isMainPost for post summary 2015-11-03 14:53:20 -05:00
barisusakli
c3369964eb closes #3820 2015-11-03 12:36:32 -05:00
barisusakli
fb7f10d63d closes #3821 2015-11-03 12:27:26 -05:00
Julian Lam
3314ab4b83 fixes #3809 2015-11-02 23:10:03 -05:00
Julian Lam
dc916c5e3c closes #3817 2015-11-02 19:35:12 -05:00
barisusakli
8d0cb18b74 display git hash/branch 2015-11-02 14:54:43 -05:00
psychobunny
8cf6fe3aa1 closes #3808 2015-11-02 11:31:17 -05:00
barisusakli
2fef7acf4b closes #3805 2015-10-30 16:16:43 -04:00
barisusakli
ca4440b8af closes #3799 2015-10-30 15:43:17 -04:00
psychobunny
003631df79 isFollowing: send false if user is anon 2015-10-30 00:10:48 -04:00
psychobunny
ead377e0ca user.isFollowing socket call 2015-10-29 22:22:33 -04:00
psychobunny
3305256575 add fullname to user return as well 2015-10-29 18:46:52 -04:00
psychobunny
0588a59c0c normalize user data between topic.user and post.user 2015-10-29 18:07:04 -04:00
barisusakli
c2ca093569 check username 2015-10-29 17:18:05 -04:00
barisusakli
c39aa07d6f moved colors out, only create icon if picture is requested 2015-10-29 16:51:58 -04:00
barisusakli
f4bfcc7351 removed icon:bgColor and icon:text from db calls
calculates from username on the fly
2015-10-29 16:35:53 -04:00
psychobunny
d8e50f931e material user icon bgs 2015-10-29 16:31:58 -04:00
Julian Lam
8d4209d42c Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 16:14:10 -04:00
Julian Lam
9f6dc63fed updated to no longer use user.icons.generate, and removed an unneeded upgrade script! :) 2015-10-29 16:14:07 -04:00
psychobunny
12d2abff44 missed some other profile pages 2015-10-29 16:05:07 -04:00
psychobunny
f17391e6a2 fix default cover image on all profile pages 2015-10-29 15:56:48 -04:00
psychobunny
c697785270 console.log 2015-10-29 15:55:20 -04:00
psychobunny
9bef54b5ed fix title for dashboard 2015-10-29 15:42:00 -04:00
nodebb-misty
4ec57d4110 Merge branch 'master' into user-icons 2015-10-29 15:29:42 -04:00
psychobunny
aa3fa477e3 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2015-10-29 15:18:00 -04:00
psychobunny
f385e13531 fix default cover on groups/list page 2015-10-29 15:16:49 -04:00
psychobunny
a670f2facc organized cover acp pages 2015-10-29 15:13:06 -04:00
psychobunny
8e893869ff custom user profile covers 2015-10-29 15:11:52 -04:00
psychobunny
7148d44f90 default cover images for groups 2015-10-29 14:55:04 -04:00
Julian Lam
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -04:00
Julian Lam
098111ba5b Fixes bug where if post edit was called without a title, NodeBB would crash 2015-10-29 11:45:34 -04:00
psychobunny
8787f04757 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2015-10-28 20:36:51 -04:00
psychobunny
07c50cba7d titles for ACP routes 2015-10-28 20:35:56 -04:00
barisusakli
ee71f982b7 added missing filter:post.tools 2015-10-28 20:13:27 -04:00
psychobunny
a5b754eac3 add profile cover/position + profile picture on every account page 2015-10-28 18:02:49 -04:00
psychobunny
f19043d046 profile cover photos 2015-10-28 17:42:42 -04:00
psychobunny
02d1304185 removing groups.cover.get, seemingly it doesn't do anything 2015-10-28 17:04:02 -04:00
psychobunny
ef20141e8f jshint 2015-10-28 16:17:27 -04:00
psychobunny
7a6d6c2bd6 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2015-10-28 16:00:05 -04:00
psychobunny
61b1f5fe32 allow regular uploading (modal) of cover photo 2015-10-28 15:22:54 -04:00
barisusakli
47c71b5a37 closes https://github.com/NodeBB/nodebb-theme-persona/issues/181 2015-10-28 15:10:27 -04:00
psychobunny
4baeda7c09 navigation acp styling / checkboxes 2015-10-28 13:47:13 -04:00