Commit Graph

101 Commits

Author SHA1 Message Date
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
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
5e5cafafd0 make one socket call to load unread counts 2015-10-20 19:19:50 -04:00
psychobunny
78fe1da00c don't mark all chats as read when just reading the list from dropdown/slidemenu/chats page
strangely enough it was doing it twice
2015-10-08 18:29:57 -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
5cf983dcee check if user exists 2015-10-02 17:31:18 -04:00
barisusakli
8e06ff49f3 check user exists before chat 2015-10-02 17:26:12 -04:00
Julian Lam
097ee5d2a2 user icons in chat modal and page 2015-09-27 16:07:07 -04:00
barisusakli
5950f97f96 more refactors 2015-09-25 17:38:58 -04:00
Julian Lam
2e3eef136f Update chat frontend to better handle incoming messages
When an incoming message occurs from somebody who is new,
a new chat contact is spawned and put into the contact list.
2015-09-16 18:15:10 -04:00
Julian Lam
34a6275b85 sanitise chat teaser 2015-09-16 15:44:10 -04:00
Barış Soner Uşaklı
e62bd2ab9e fix chat status unread etc. 2015-09-15 13:13:23 -04:00
barisusakli
15b667850e closes #3595 2015-09-14 17:42:06 -04:00
barisusakli
5ff2eccbd2 #3593 2015-09-14 15:10:25 -04:00
psychobunny
ff83305c6a closes #3593 2015-09-14 15:01:35 -04:00
psychobunny
b5c7473c95 get teasers: probably faster, hopefully 2015-08-31 17:09:37 -04:00
psychobunny
08137c5c1e fixed issue where teasers were being assigned to the wrong chat 2015-08-31 16:53:15 -04:00
psychobunny
6aa6510ef6 teasers instead of chatTeasers 2015-08-28 17:44:00 -04:00
psychobunny
71cad7e181 chat teaser 2015-08-27 17:58:29 -04:00
psychobunny
643abb6926 if params.count is passed in, min should be 0 2015-08-27 17:37:34 -04:00
psychobunny
e0cfc117c7 changing function signature for messaging.getMessages
@julianlam should this be moved to 0.8.0?
2015-08-27 17:32:33 -04:00
Julian Lam
2593f1b4d9 Fix bug where new chat messages would not append
... due to incorrect class and id assignment of the chat modal. Regression was caused by an earlier commit that moved the
typing span elsewhere.
2015-07-29 12:58:06 -04:00
Julian Lam
48af82659e removing the composer from core, out to its own plugin: nodebb-plugin-composer-default, closes #3288 2015-07-03 16:43:36 -04:00
Julian Lam
f168566928 fixed incorrect use of username in unsub cta in emails 2015-05-27 21:36:13 -04:00
barisusakli
990b02d0db fix crash @julianlam 2015-05-22 00:42:24 -04:00
barisusakli
95e9d7c798 filter messages 2015-05-22 00:39:48 -04:00
Aziz Khoury
35c426ee1c guard against NULL mids/messages
I've seen them few times during import testing. In case the conversation does not exists.
2015-05-13 13:02:00 -04:00
barisusakli
7632997a99 closes #3045 2015-04-22 10:41:49 -04:00
Julian Lam
a5832624d7 added optional parameter to define timestamp when sending a chat message, for use in write API 2015-04-17 14:38:01 -04:00
Julian Lam
0e9a096c25 moved some socket notifications to notifyUser instead of in websocket layer (again, @barisusakli) 2015-04-16 20:48:38 -04:00
Julian Lam
d40ca1e3c8 moved a number of sanity checks to also be in canMessage, so they are all consolidated into one exported method. (@barisusakli) 2015-04-16 20:32:16 -04:00
barisusakli
878e548296 renamed end to stop globally
fixed getting favourites for admins
2015-03-31 23:40:58 -04:00
psychobunny
13fa1f6b9a require socket.io only when you need it, shaves off another 0.5s on load 2015-02-23 16:24:43 -05:00
barisusakli
756d03fa62 closes #2745
generate paths on retrieval instead of notification creation
also fix follow notification path
2015-02-19 18:14:38 -05:00
barisusakli
bfaf50908d closes #2565 2014-12-31 14:16:27 -05:00
Aziz Khoury
100f31be81 adding mid on the message returned data on addMessage 2014-12-13 08:19:49 -05:00
barisusakli
f7c70e2a7a update all socket methods, works on single node 2014-11-28 19:06:07 -05:00
barisusakli
c56b9aafff closes #2289, replace Infinity with '+inf' 2014-11-07 19:40:41 -05:00
barisusakli
72bb74cf46 canMessage 2014-11-06 12:57:59 -05:00
barisusakli
595ff1f4b1 closes #2303
see
https://community.nodebb.org/topic/3039/filter-post-parse-and-filter-post-parsesignature-changes
2014-11-05 18:59:20 -05:00
Julian Lam
adfb89a2ad closed #2321 2014-10-30 17:50:27 -04:00
barisusakli
433769eb36 closes #2146
first tab (recent) shows last 50 messages instead of just last 24 hours
2014-10-30 16:51:15 -04:00
Julian Lam
ffdc4b5d24 fixed places where site_title was being referenced in config, instead of the correct "title" 2014-10-23 15:47:25 -04:00
barisusakli
72a919e416 time based check 2014-10-15 14:49:11 -04:00
psychobunny
f4b5090738 more linting 2014-10-08 12:11:06 -04:00
barisusakli
6aa53b8323 nextStart changes, fixed move topic notification text 2014-10-02 17:46:43 -04:00
barisusakli
4066607388 closes #2052 2014-09-17 16:29:07 -04:00
Julian Lam
b80b0e1e99 re: #2098, chat message emails are now opt-in 2014-09-16 13:54:03 -04:00
Julian Lam
b85ff61de6 refactored chat notification system to wait a bit before sending notif/email, closes #2098 2014-09-16 13:28:21 -04:00
barisusakli
9a96458f79 closes #2053 2014-09-15 16:26:25 -04:00