Commit Graph

5262 Commits

Author SHA1 Message Date
barisusakli
26ac05dd5c Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat 2015-12-18 13:16:55 +02:00
Julian Lam
a091067175 closes #3963 2015-12-17 18:22:09 -05:00
barisusakli
5a26eb1c76 IS fix, timeago fix 2015-12-17 12:25:30 +02:00
barisusakli
3d79e0750b fix edit delete for rooms 2015-12-17 12:05:35 +02:00
barisusakli
992ca0a351 fix taskbar icon 2015-12-17 11:56:28 +02:00
barisusakli
d2b54ae0f8 display less derpy chat list 2015-12-17 11:47:32 +02:00
barisusakli
f71fd0a3ec only allow users in the room to get raw message content 2015-12-17 11:22:22 +02:00
barisusakli
832a20e59e markRead fixes 2015-12-16 15:43:01 +02:00
barisusakli
d8810ceae9 send messages 2015-12-16 15:09:14 +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
2ac34ba391 fix recepientUid 2015-12-16 10:16:44 +02:00
barisusakli
29d8b9c181 more room changes app.openChat 2015-12-16 10:09:00 +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
Julian Lam
ea1b640435 calling translator in parseMessage 2015-12-14 16:20:12 -05:00
Barış Soner Uşaklı
530b0dc19e use .text() 2015-12-14 22:03:18 +02:00
Barış Soner Uşaklı
7e1a84850c closes #3948 2015-12-14 21:51:47 +02:00
Julian Lam
7b49dc9061 fixes #3935 2015-12-14 14:20:52 -05:00
Julian Lam
a4d8ab9d12 fixes #3950 2015-12-14 14:13:18 -05:00
Julian Lam
c04622506d console.log removal 2015-12-14 14:08:58 -05:00
Julian Lam
0b735fad17 fixed #3936 2015-12-14 14:07:18 -05:00
Julian Lam
46571ccd77 closes #3930 2015-12-14 13:39:53 -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
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
0ffd5254ad closes #3933, closes #3934 2015-12-10 09:00:46 +02:00
Julian Lam
bc199d6872 By default, always switch chat in chats page
closes #3915
2015-12-04 15:49:32 -05:00
Julian Lam
648e9c4dc8 fix #3889 2015-12-04 14:44:34 -05:00
Julian Lam
2af11a23ce fixes #3922 2015-12-04 11:30:18 -05:00
Julian Lam
3a520cdfbf Successful web installer now doesn't show 503 2015-11-30 23:10:59 -05:00
Barış Soner Uşaklı
9770983fdb closes #3913 2015-11-29 16:49:23 -05:00
Julian Lam
fc495a83ec closes #3763 2015-11-28 23:26:51 -05:00
Julian Lam
992bcffcdf we stopped using -dev versions, so this conditional is unnecessary 2015-11-28 23:25:32 -05:00
Julian Lam
a936866688 revamped ACP Flags interface, #3907 2015-11-28 22:08:06 -05: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
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
Julian Lam
f673f4f186 🐶 2015-11-25 16:50:46 -05:00
Julian Lam
e232d9e198 Fixed issue where page view counts kept changing
... when they should only really be updated for the
hourly pageviews graph.
2015-11-25 16:45:21 -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
7f9ac3f1fe Fixing bug where the labels would revert back to hours 2015-11-25 14:33:31 -05:00
Julian Lam
027d80debd Fixed issue where graph would always switch back to single-day 2015-11-25 14:26:38 -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
d3778a052a fix ajaxify data 2015-11-25 12:02:13 -05:00
barisusakli
ecd777b659 closes https://github.com/NodeBB/nodebb-theme-persona/issues/206 2015-11-23 10:57:43 -05:00
Julian Lam
65ce8a50b3 Removed cant-vote-self-post
As suggested in nodebb/nodebb-theme-persona#203, a positive
action has been applied when a user attempts to upvote
their own post. It will now open the upvoters modal
instead of throwing an alertError.

Closes nodebb/nodebb-theme-persona#203
2015-11-16 15:03:39 -05:00
Barış Soner Uşaklı
c55abdd095 closes #3815 2015-11-13 17:45:36 -05:00
Julian Lam
c2963a7ca9 Composer minver, #3693 2015-11-13 16:25:20 -05:00
Julian Lam
65396000d2 Updated modal to not be .confirm() but .dialog()
Also updated composer code to actually send a link back
to the other topic...

Closes #3693
2015-11-13 16:22:27 -05:00