Commit Graph

760 Commits

Author SHA1 Message Date
Julian Lam
8d4209d42c Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 16:14:10 -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
nodebb-misty
4ec57d4110 Merge branch 'master' into user-icons 2015-10-29 15:29:42 -04:00
psychobunny
8e893869ff custom user profile covers 2015-10-29 15:11:52 -04:00
Julian Lam
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -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
ef20141e8f jshint 2015-10-28 16:17:27 -04:00
psychobunny
61b1f5fe32 allow regular uploading (modal) of cover photo 2015-10-28 15:22:54 -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
353ebb71d2 removed unnecessary if 2015-10-27 17:03:14 -04:00
Julian Lam
68c3f9d849 Squashed commit of the following:
commit 56582bc9eee5d81a01f42a28808b617b9c96873a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 05:21:11 2015 -0400

    added missing template

commit 6462a1626e7d8d77210b6e10eace5c9214335f33
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 05:19:07 2015 -0400

    sitemap index

commit 3cfd56f1fbc8e03405dc394375bf5ff6eef21322
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 04:47:52 2015 -0400

    sitemap routes, controllers, and library methods for pages, categories, and topics

commit e58e07c0881bdbe16d503b4679b85f761b02163c
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 04:07:39 2015 -0400

    added groups to sitemap

commit 7ee584b632
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 01:43:06 2015 -0400

    If notification dropdown is double-clicked, all notifications are marked read

commit 488f147bef
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:39:19 2015 -0400

    closes #3781

commit 5e1bd58a02
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:28:30 2015 -0400

    closes #3782

commit 57d3980267
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:16:08 2015 -0400

    closes #3790

commit 555c5b82da
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 21:19:20 2015 -0400

    check user settings

commit 5454862c1c
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 20:26:02 2015 -0400

    wait for all callbacks when creating tags

commit 051c5077eb
Merge: 839fd93 e0e04ef
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Mon Oct 26 09:54:12 2015 -0400

    Merge pull request #3792 from drlogout/master

    Fixed wrong method name in socket.io/groups.js from isAdmin to isAdmi…

commit e0e04ef892
Author: Christian Nolte <hello@noltech.net>
Date:   Mon Oct 26 14:50:32 2015 +0100

    Fixed wrong method name in socket.io/groups.js from isAdmin to isAdministrator

commit 839fd935ad
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 21:54:35 2015 -0400

    add back thread tools filter

commit 37060bf1a3
Merge: 5820a19 bf918bd
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Sun Oct 25 18:13:06 2015 -0400

    Merge pull request #3787 from cubehouse/patch-1

    Upgrade script fails on some consoles

commit 5820a193f6
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 17:04:46 2015 -0400

    closes #3789

commit 0d88d52557
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 17:03:33 2015 -0400

    up theme

commit 9bc43ba5e1
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 16:57:42 2015 -0400

    closes #3788

commit aafd4b6984
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 15:56:17 2015 -0400

    closes #3786

commit bf918bd016
Author: James Holding <cubehouse@users.noreply.github.com>
Date:   Sun Oct 25 10:14:00 2015 +0000

    Upgrade script fails on some consoles

    The upgrade script errors/fails on some consoles if the stdout.columns isn't set (my console did this when upgrading a Docker instance of NodeBB).
    Checking for stdout.columns before using, falling back to a couple of spaces for slightly prettiness if we can't work out the console width.
2015-10-27 05:25:14 -04:00
barisusakli
488f147bef closes #3781 2015-10-26 22:39:19 -04:00
Julian Lam
b52475c270 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
2015-10-25 07:33:59 -04:00
barisusakli
751a6c6839 got rid of extra call to user.getSettings 2015-10-23 14:07:09 -04:00
barisusakli
09747251d8 added hostname 2015-10-19 18:46:51 -04:00
barisusakli
f17ba88c0f closes #3765 2015-10-19 12:48:26 -04:00
barisusakli
53d29e29af performance improvements
store parsed category description
removed mongo _key from returns
dont get category teaser for parent
2015-10-18 18:30:17 -04:00
barisusakli
e60c1d8736 added process info 2015-10-15 20:29:54 -04:00
barisusakli
c2b29ff4c4 add page to canonical link #3758 2015-10-15 16:20:21 -04:00
barisusakli
b556652582 fix chat redirect 2015-10-15 13:00:32 -04:00
barisusakli
e2a5440ae8 closes #3741 2015-10-13 19:28:55 -04:00
psychobunny
8ef46ebc7d found some other places with the same problem 2015-10-13 16:19:52 -04:00
barisusakli
da4034a10a middleware refactor 2015-10-11 23:05:33 -04:00
barisusakli
7854e67b7b closes #1637 2015-10-09 17:52:55 -04:00
barisusakli
36bfe30425 closes #3736 2015-10-09 14:23:02 -04:00
barisusakli
fa4875d78d category teaser 2015-10-07 17:36:27 -04:00
barisusakli
ff7b6e4e91 added search title 2015-10-07 16:20:19 -04:00
barisusakli
2d96cdba1c closes #3720 2015-10-07 16:13:42 -04:00
Julian Lam
4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
2015-10-07 02:14:03 -04:00
barisusakli
2d01fe78d0 removed privileges.posts.get from addPostData
privilege data is already available higher up
2015-10-06 18:36:03 -04:00
Julian Lam
99e5015083 closes #3690 2015-10-06 06:13:25 -04:00
Julian Lam
95129a1b40 closes #3693 2015-10-06 05:28:05 -04:00
barisusakli
902f529d53 closes #3692 2015-09-30 16:08:12 -04:00
barisusakli
3a6d5948ba filter invalid categories 2015-09-30 15:27:51 -04:00
Julian Lam
896abb59d3 Update default gravatar admin option to defaultAvatar 2015-09-30 14:37:26 -04:00
Julian Lam
97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons 2015-09-30 13:45:33 -04:00
Julian Lam
00079ce158 default user icon for anons 2015-09-30 13:19:32 -04:00
barisusakli
df95d47c4c ocd 2015-09-29 20:31:40 -04:00
barisusakli
5a3a627fcd fix rel tag urls 2015-09-29 20:30:42 -04:00
barisusakli
ca294fc6ec closes #3663 2015-09-29 18:22:47 -04:00
barisusakli
e4f0cd856a prettier admin navigation page 2015-09-26 13:00:59 -04:00
barisusakli
3cdc0c6890 missing return 2015-09-25 18:51:27 -04:00
barisusakli
d490ed30d1 check err 2015-09-25 18:29:02 -04:00
barisusakli
5950f97f96 more refactors 2015-09-25 17:38:58 -04:00
barisusakli
e5e41e85f2 accounts refactor #2
and various 404 fixes
2015-09-25 13:11:11 -04:00
barisusakli
3bb5d2aa86 accounts refactor part #1 2015-09-25 01:52:41 -04:00
barisusakli
c617a3f008 inf scroll changes
dont load main post if start > 0
2015-09-24 21:14:41 -04:00