Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 12:01:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,100 Commits 79 Branches 492 Tags
ceaa3a334df7c4df047046e4ec9603f48a62d152
Commit Graph

6435 Commits

Author SHA1 Message Date
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
Julian Lam
7580cfb235 fixed double-definition of hashPassword method that was causing new registrations to fail 2015-10-28 09:32:27 -04:00
Julian Lam
defceb6271 Merge remote-tracking branch 'origin/master' into user-icons 
Conflicts:
	src/controllers/index.js
	src/topics/tags.js
 2015-10-28 08:55:18 -04:00
barisusakli
290686a194 modifyCategory is no longer async 2015-10-27 17:21:28 -04:00
barisusakli
353ebb71d2 removed unnecessary if 2015-10-27 17:03:14 -04:00
barisusakli
efef0af6fa tag fix 2015-10-27 15:04:46 -04:00
barisusakli
4ef2ae7ba2 update count even if its 0 2015-10-27 14:01:23 -04:00