Commit Graph

753 Commits

Author SHA1 Message Date
barisusakli
29d8b9c181 more room changes app.openChat 2015-12-16 10:09:00 +02:00
barisusakli
58d05f7c79 recent chat list with rooms 2015-12-15 17:50:30 +02:00
Julian Lam
7b49dc9061 fixes #3935 2015-12-14 14:20:52 -05:00
Julian Lam
c1460d36f0 Deprecated uploader.open, use uploader.show instead
... as it now takes a single Object argument instead of multiple
parameters.

Also, closes #3942. Help text is just omitted now.
2015-12-14 12:00:24 -05:00
Julian Lam
84a039446c updated modal to not show parentheses when max file size
is not defined...

Also fixing hideAlerts error in ACP when opening the upload modal.
2015-12-14 11:31:49 -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
Julian Lam
fc476ba168 Fixes #3906
Initially, the removed block of code was used to stop the chat modal
from popping up altogether, since the /chats page was usable on
mobile. Since the re-design, only the contact list is shown on
mobile, leaving the modal as the main way to communicate. So, this
intercepting code is actually interfering now.
2015-11-27 12:52:58 -05:00
barisusakli
20c8411287 closes #3767 closes #3774 2015-11-12 14:14:27 -05:00
Julian Lam
93c077dabd closes #3825 2015-11-10 16:02:56 -05:00
Julian Lam
8a90afeed2 fixes #3859 2015-11-09 11:55:44 -05:00
barisusakli
3bd83cd732 remove dupe code 2015-11-07 18:54:08 -05:00
Julian Lam
92be63ebe6 Update user account removeFn
As I did not realise both groups and users call the same
coverPhoto lib, the removeFn has to be in the user client js,
and not in the coverPhoto lib.

... of course, it *could* be in there, but it would be hacky.
2015-11-06 10:37:42 -05:00
Julian Lam
f1412b6e9b Fixed cover loading for subdirs and added removal
re: #3832
2015-11-05 15:49:41 -05:00
barisusakli
54901afe5e removed toggleNew 2015-11-05 14:49:03 -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
Julian Lam
3314ab4b83 fixes #3809 2015-11-02 23:10:03 -05:00
psychobunny
b9316bfd23 removed alert.location 2015-11-02 12:24:23 -05:00
psychobunny
1982501985 toaster components + deprecated alert.location 2015-11-02 12:23:37 -05:00
psychobunny
ad0a7e0cb2 upping themes 2015-10-29 19:05:35 -04:00
psychobunny
ec434dfe95 user/picture component 2015-10-29 18:07:21 -04:00
Julian Lam
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -04:00
psychobunny
02d1304185 removing groups.cover.get, seemingly it doesn't do anything 2015-10-28 17:04:02 -04:00
psychobunny
973da9bdcc up persona 2015-10-28 16:29:00 -04:00
psychobunny
a4cae65732 fixed hardcoded group name in uploader + cleanup 2015-10-28 16:23:42 -04:00
psychobunny
ef20141e8f jshint 2015-10-28 16:17:27 -04:00
psychobunny
a6796479bf fixed drag and drop image upload 2015-10-28 15:46:48 -04:00
psychobunny
61b1f5fe32 allow regular uploading (modal) of cover photo 2015-10-28 15:22:54 -04:00
psychobunny
69e43cd35a modularized coverPhoto 2015-10-28 14:22:19 -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
7ee584b632 If notification dropdown is double-clicked, all notifications are marked read 2015-10-27 01:43:06 -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
02abcf0da7 add newlines tabs to meta and link tabs 2015-10-23 17:21:23 -04:00
barisusakli
74b02ee096 dont crash if item is undefined 2015-10-23 16:24:02 -04:00
barisusakli
c426c7288f find closest to middle in navigator 2015-10-22 14:56:23 -04:00
barisusakli
5e5cafafd0 make one socket call to load unread counts 2015-10-20 19:19:50 -04:00
barisusakli
edf545cd2c dont load sound data on cold load 2015-10-20 18:47:34 -04:00
barisusakli
6b1834d4ae closes #3767 2015-10-19 11:28:18 -04:00
barisusakli
d351d01490 fix sort on category page 2015-10-15 14:16:36 -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
fcf411a72b small fixes 2015-10-05 22:24:36 -04:00
barisusakli
848a14d861 fix typo 2015-10-03 18:13:35 -04:00
barisusakli
89439f2c14 fix upload hide 2015-10-03 17:58:06 -04:00
barisusakli
d4206c047d select by class 2015-10-01 17:43:03 -04:00
Julian Lam
97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons 2015-09-30 13:45:33 -04:00
barisusakli
ca294fc6ec closes #3663 2015-09-29 18:22:47 -04:00
psychobunny
714efd0d0e scrollToPost / scrollToPostIndex offset isn't used anymore 2015-09-29 17:10:28 -04:00
psychobunny
81b3ae2597 cleanup 2015-09-28 17:20:55 -04:00
psychobunny
4c4d560f64 fixed f5 from in the middle of a big topic 2015-09-28 17:17:47 -04:00
psychobunny
e9d3f4278d IS improvements
* simplify calculation (scrollTop vs elementInView)
* use post anchor rather than create big $ objs from post html
* pressing f5 repeatedly now always takes you to the correct pid
2015-09-28 15:21:20 -04:00