Commit Graph

125 Commits

Author SHA1 Message Date
barisusakli
3df7bae08c closes #4834, closes #4830 2016-07-13 17:32:00 +03:00
barisusakli
45ff71fd06 closes #2475 2016-07-13 17:04:45 +03:00
barisusakli
268aa12cc2 closes #4275 2016-02-29 10:36:31 +02:00
pichalite
6ecc05afd4 throw error in chat if no users in room 2016-02-23 00:52:43 +00:00
Barış Soner Uşaklı
8f25994482 fix for async whilst derp 2016-02-16 20:25:23 +02:00
barisusakli
821461f802 closes #4123 2016-02-01 21:09:35 +02:00
barisusakli
cb91587567 closes #4063 2016-01-18 15:35:24 +02:00
barisusakli
a3dc427e67 if there are no messages pass empty array 2015-12-21 15:40:53 +02:00
barisusakli
f0b333e8a1 closes #3929 2015-12-19 20:20:41 +02:00
barisusakli
4827ea04fc messaging.getTeaser 2015-12-17 12:35:49 +02:00
barisusakli
d2b54ae0f8 display less derpy chat list 2015-12-17 11:47:32 +02:00
Barış Soner Uşaklı
f4e502c793 simpler isNewSet 2015-12-16 21:52:42 +02:00
barisusakli
784ff07907 ability to add/remove users from chat rooms, tagsinput 2015-12-16 13:35:24 +02:00
barisusakli
8fab270852 leaveRoom method, small fixes 2015-12-16 11:30:10 +02:00
barisusakli
f8a6666e1a chat notify changes 2015-12-16 11:15:43 +02:00
barisusakli
c5d2f61b01 more fixes 2015-12-15 20:00:51 +02:00
barisusakli
5d1169e686 changed the chat route to /chats/:roomid? 2015-12-15 19:05:32 +02:00
barisusakli
58d05f7c79 recent chat list with rooms 2015-12-15 17:50:30 +02:00
barisusakli
e2e547db45 first part of messaging refactor 2015-12-15 14:10:32 +02:00
Julian Lam
bcbc8608a4 newSet calculations bugfix 2015-12-11 20:04:27 -05:00
Julian Lam
3b6b36cfa6 fixing possible crash 2015-12-11 19:50:21 -05:00
Julian Lam
2d203d7dca Squashed commit of the following:
Closes #2668

commit 3d4f494ed3257bceda8f6f82057cab83f0f252b3
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:06:42 2015 -0500

    theme minvers for #2668

commit b608ce61854f8195143685bb9753b80d32b26e95
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:01:03 2015 -0500

    Allowing chat modal to edit and delete messages

    re: #2668

commit 0104db90a4070582f3938b6929dae35f985bac35
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:51:23 2015 -0500

    Fixed issue where newSet calculations were off

    ... sometimes.

    Also, rendering of edited messages now parses a template partial,
    instead of just replacing the content.

commit 5cb6ca600425ca9320c599b32306e93dcc5aa4ce
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:07:12 2015 -0500

    If edited content matches existing content...

    ... then edit is aborted.

commit 6e7495247b1895589c716db29f919a934087b924
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:05:08 2015 -0500

    some linting and fixed issue where new msgs when deleted would crash server

commit db4a9e40d6dff44569c2437378121db8fdf75cf8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 17:25:56 2015 -0500

    Message deletion for #2668, and fixed bug

    Fixed bug where chat modal would spawn even though user was sitting
    on the /chats page.

commit a5aa2498ab4a8bba02a6daa43a9dbed7b3e37976
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:55:23 2015 -0500

    wiring up the edit button, #2668

commit 5f2afdcf6f2b9eae6b5873ca100149e65e3d385d
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:20:39 2015 -0500

    added indicator to show if and when a message had been edited

commit e8301132d525c1b9fd46c98cdb282ac7ea7a0d7f
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:06:39 2015 -0500

    Allowing editing of chat messages

commit bfd991be1cb1769599f7d5d2b1638e313c3c2dcb
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 10:33:49 2015 -0500

    Added messageId to messages object return

commit 0306ee6657b3288dd4547c66869d7d4ece0b31ad
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 08:20:17 2015 -0500

    WIP #2668
2015-12-11 12:07:02 -05:00
barisusakli
46c2563164 removed rooms.js removed browsing users, removed chat syncing across sockets
use lastonline for online detection
2015-11-05 12:34:39 -05: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
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