Commit Graph

148 Commits

Author SHA1 Message Date
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
1493afee2a ESlint indent 2017-02-18 02:38:03 -07:00
Peter Jaszkowiak
2e031f3759 ESlint comma-spacing 2017-02-18 01:31:47 -07:00
Peter Jaszkowiak
3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
Julian Lam
05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper 2017-01-27 11:26:08 -05:00
barisusakli
ba1889f441 messaging refactor 2017-01-03 20:02:24 +03:00
barisusakli
b807915515 removed incorrect markread nid 2016-11-24 15:53:46 +03:00
barisusakli
8294fc90e3 closes #5084 2016-11-10 16:19:27 +03:00
Barış Soner Uşaklı
cbd936c547 closes #5140 2016-10-22 10:22:05 +03:00
barisusakli
c0db7798b9 fix tests :dull: 2016-10-14 13:37:58 +03:00
barisusakli
235fe9efe3 fix chat modal title 2016-10-14 13:22:30 +03:00
HeeL
4a3c31b2dc Fix space-before-function-paren linter rule 2016-10-13 11:43:39 +02:00
HeeL
3fa1c1f927 Fix space-infix-ops linter rule 2016-10-13 11:42:29 +02:00
barisusakli
aca0a893e7 remove since properly 2016-10-03 22:18:47 +03:00
barisusakli
fe50c8d124 closes #5078 2016-10-03 20:35:36 +03:00
barisusakli
a93ee97926 closes #5073 2016-10-02 15:17:27 +03:00
barisusakli
6aec61d722 groupChat on recentChats 2016-09-30 19:39:08 +03:00
Barış Soner Uşaklı
1b5287803c closes #5071 2016-09-30 14:00:49 +03:00
barisusakli
abd99760e5 closes #5070 2016-09-30 13:19:55 +03:00
barisusakli
55396ca442 inf scroll in chat-content 2016-09-20 16:58:57 +03:00
barisusakli
276031cd6f closes #4585, closes https://github.com/NodeBB/nodebb-theme-persona/issues/299 2016-08-25 16:05:07 +03:00
barisusakli
d272a63492 fix messaging.parse to be err first 2016-08-17 14:12:35 +03:00
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