Commit Graph

679 Commits

Author SHA1 Message Date
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
4ce6bcfa6a latest translations 2015-12-10 16:01:16 -05:00
Julian Lam
acc2dfa037 latest translations, closes #3911 2015-12-04 12:39:42 -05:00
Julian Lam
d12ccfacb5 latest translations 2015-11-25 15:11:35 -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
Julian Lam
6ad715f948 fallbacks for nodebb.topic 2015-11-13 16:58:22 -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
Julian Lam
e35cb6d78d latest translations 2015-11-11 15:41:08 -05:00
Julian Lam
0260c5b68b updated image_spec to not have gif, but bmp 2015-11-11 15:38:34 -05:00
Julian Lam
3469c47a59 language fallbacks for #3825 2015-11-10 16:04:13 -05:00
Julian Lam
93c077dabd closes #3825 2015-11-10 16:02:56 -05:00
Julian Lam
00a4ba6617 latest translations 2015-11-10 15:36:49 -05:00
Julian Lam
9de8250697 fixed spanish language issue, #3849 2015-11-07 11:25:07 -05:00
Julian Lam
628cecdd36 latest translations 2015-11-06 15:22:10 -05:00
Julian Lam
48b5bab849 closes #3756 2015-11-06 14:02:25 -05:00
Julian Lam
ca0cba0c38 Added Galician and Slovenian 2015-11-05 15:03:27 -05:00
Julian Lam
3959316da9 latest translations and fallbacks 2015-11-05 15:03:26 -05:00
Julian Lam
82f78d910d tweaks to language and updating theme minvers 2015-11-05 14:00:01 -05:00
Julian Lam
de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage 2015-11-05 13:47:26 -05:00
Julian Lam
b8b9da2c30 Squashed commit of the following:
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 11:04:27 2015 -0500

    tweaked 503 template

commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:58:19 2015 -0500

    added text about reloading being required if threshold values are changed

commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:53:35 2015 -0500

    added ACP settings for toobusy

commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 08:53:53 2015 -0500

    removed unused 503a template

commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 02:01:11 2015 -0500

    updated code to send static 503 instead of maintenance-style page

commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 01:18:45 2015 -0500

    added toobusy support so the Node process doesn't fall over at high load
2015-11-05 12:44:51 -05:00
yariplus
f815f2d981 Fix userhomepage derps 2015-11-04 05:55:02 -05:00
psychobunny
5c44c365dd chat with %1 2015-11-03 18:20:51 -05:00
psychobunny
f6f43fe3de a couple extra useful "posted in" strings 2015-11-03 17:26:43 -05:00
Julian Lam
d9cde968cc latest translations and fallbacks 2015-11-03 13:44:29 -05:00
Julian Lam
ae6a2a8dbf latest translations and fallbacks 2015-10-30 00:47:13 -04:00
Julian Lam
526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 2015-10-29 13:27:28 -04:00
psychobunny
80da65b4ef unused lang strings 2015-10-28 16:24:59 -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
7f66494a57 closes #3764 2015-10-19 12:59:40 -04:00
barisusakli
0da39d036b uploading string 2015-10-15 11:36:50 -04:00
barisusakli
e2a5440ae8 closes #3741 2015-10-13 19:28:55 -04:00
barisusakli
47e2dd9478 closes #3107 2015-10-13 16:36:49 -04:00
barisusakli
7854e67b7b closes #1637 2015-10-09 17:52:55 -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
Julian Lam
95129a1b40 closes #3693 2015-10-06 05:28:05 -04:00
Julian Lam
05b40cf576 latest translations 2015-10-04 04:58:46 -04:00
Julian Lam
97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons 2015-09-30 13:45:33 -04:00
psychobunny
be28d7db98 changing bookmark alert to be more accurate to what it actually does 2015-09-28 10:30:23 -04:00
psychobunny
2669241c06 closes #3656 2015-09-28 10:26:29 -04:00
Julian Lam
a52f6cf0b4 User Account Edit and Change Picture Modal 2015-09-27 17:23:18 -04:00
Julian Lam
010c04f21f latest translations 2015-09-25 10:02:31 -04:00
Julian Lam
66afb59bc8 translations for global resource, closes #3659 2015-09-23 11:13:54 -04:00
Julian Lam
78863a438f Firing new hook filter:auth.list
This new plugins allows SSO services to list whether a
user has authenticated via that service, and will display
as such in the user's profile editing screen.
2015-09-22 14:27:44 -04:00
Julian Lam
a8f9671a11 latest translations 2015-09-20 12:00:09 -04:00
barisusakli
04be0411e7 build search categories server side 2015-09-16 17:17:58 -04:00
barisusakli
ade9a44b11 closes #3590 2015-09-16 14:45:45 -04:00
Julian Lam
00f2778534 latest translations 2015-09-16 14:05:48 -04:00
Julian Lam
9454e5a73a latest translations 2015-09-15 14:06:15 -04:00
barisusakli
15b667850e closes #3595 2015-09-14 17:42:06 -04:00
barisusakli
bb4984a9aa closes #3428 2015-09-11 13:54:00 -04:00