Commit Graph

918 Commits

Author SHA1 Message Date
barisusakli
c5d2f61b01 more fixes 2015-12-15 20:00:51 +02:00
barisusakli
43c697a5df edit message 2015-12-15 19:39:45 +02:00
barisusakli
a1ab50bd2d check admin and priv groups 2015-12-15 19:34:48 +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
a4d8ab9d12 fixes #3950 2015-12-14 14:13:18 -05:00
barisusakli
24a302ea1a closes #3947 2015-12-13 18:06:23 +02:00
Julian Lam
4cc4824087 Merge pull request #3908 from pitaj/master
Maximum invites and invites are stored
2015-12-11 15:59:59 -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
8dc9475041 closes #3941 2015-12-11 14:57:47 +02:00
Peter Jaszkowiak
67905667a9 Added admin-only invites 2015-11-28 15:33:17 -07:00
Peter Jaszkowiak
a3cfcd9a48 Maximum invites, invites stored
Added the ability for admins to restrict the maximum amount of invites
a user can make. Invites are stored and displayed in the registration
queue admin page.
2015-11-27 16:55:31 -07:00
barisusakli
124b79f6aa fix user search pagination 2015-11-25 16:01:05 -05:00
Julian Lam
6d386dd2ee Fixed some labelling issues and added support for last month 2015-11-25 14:48:32 -05:00
Julian Lam
9c1b067445 Closes #3884
Added toggles to change graph to monthly view vs regular
single-day view.

Also fixed issue where labels were out of date as the graph
data changed.
2015-11-25 14:23:14 -05:00
barisusakli
59ed276dce dont allow banned users to flag 2015-11-20 10:43:42 -05:00
barisusakli
27f77bf832 show proper error if user is not logged in 2015-11-07 18:46:31 -05:00
Julian Lam
ad5ddcbb73 whitespace fixes 2015-11-07 12:32:25 -05:00
Julian Lam
90c0a06fd4 removed some commented out code 2015-11-07 10:40:46 -05:00
barisusakli
356f1d38cb fix image upload for other users 2015-11-06 16:17:18 -05:00
Julian Lam
48b5bab849 closes #3756 2015-11-06 14:02:25 -05:00
Julian Lam
2830538835 Cover photo removal for groups, #3832 2015-11-06 10:51:10 -05:00
barisusakli
670ed38d75 missing semicolons 2015-11-05 19:57:26 -05:00
barisusakli
1be178f2a5 sync ACP stats over pubsub 2015-11-05 17:47:06 -05:00
Julian Lam
f1412b6e9b Fixed cover loading for subdirs and added removal
re: #3832
2015-11-05 15:49:41 -05:00
barisusakli
7ed378b367 removed override no longer needed 2015-11-05 12:43:05 -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
1ecf27417a removed commented out stuff removed topics.enter 2015-11-05 11:53:17 -05:00
barisusakli
491a6d0234 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize 2015-11-05 11:35:39 -05:00
barisusakli
0d23c56281 removed event:disconnect 2015-11-05 11:31:59 -05:00
barisusakli
bac2a0d959 removed event:connect use socket.io connect event duh 2015-11-05 11:25:53 -05:00
barisusakli
5879185ebc single proc stats 2015-11-04 17:43:43 -05:00
barisusakli
0199ed27a6 disable user_leave for topic 2015-11-04 13:02:19 -05:00
barisusakli
be86c74c91 disabled browsing users and global rooms syncing 2015-11-04 12:52:55 -05:00
Julian Lam
dc916c5e3c closes #3817 2015-11-02 19:35:12 -05:00
psychobunny
003631df79 isFollowing: send false if user is anon 2015-10-30 00:10:48 -04:00
psychobunny
ead377e0ca user.isFollowing socket call 2015-10-29 22:22:33 -04: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
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -04:00
barisusakli
ee71f982b7 added missing filter:post.tools 2015-10-28 20:13:27 -04:00
psychobunny
f19043d046 profile cover photos 2015-10-28 17:42:42 -04:00
psychobunny
02d1304185 removing groups.cover.get, seemingly it doesn't do anything 2015-10-28 17:04:02 -04:00
barisusakli
47c71b5a37 closes https://github.com/NodeBB/nodebb-theme-persona/issues/181 2015-10-28 15:10:27 -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
Christian Nolte
e0e04ef892 Fixed wrong method name in socket.io/groups.js from isAdmin to isAdministrator 2015-10-26 14:50:32 +01:00
barisusakli
839fd935ad add back thread tools filter 2015-10-25 21:54:41 -04:00
Julian Lam
f7f43de644 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-25 07:34:23 -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
5c2e78b1a6 parse topic tools on demand 2015-10-24 21:29:20 -04:00
barisusakli
6c9de29326 load post tools menu on demand 2015-10-24 20:50:43 -04:00