Commit Graph

11308 Commits

Author SHA1 Message Date
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
1cf2ad339a latest translations and fallbacks 2015-12-14 09:28:15 -05:00
barisusakli
24a302ea1a closes #3947 2015-12-13 18:06:23 +02:00
Barış Soner Uşaklı
fd215c774f Merge pull request #3946 from akhoury/patch-3
[minor] meta tag, content-type shouldnt be escaped
2015-12-13 17:22:03 +02:00
barisusakli
518552de64 dont calculate pid index on new replies 2015-12-13 17:07:52 +02:00
Aziz Khoury
b4c8301596 [minor] meta tag, content-type shouldnt be escaped
so `text/html; charset=UTF-8` and not `text/html; charset=UTF-8`
2015-12-12 13:07:51 -05: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
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
d12e8e1116 closes #3814 2015-12-11 15:24:49 +02:00
barisusakli
42cce3771b closes #3846 2015-12-11 15:17:05 +02:00
barisusakli
8dc9475041 closes #3941 2015-12-11 14:57:47 +02:00
barisusakli
60e186c8f3 refactor api/username api/email 2015-12-11 11:07:37 +02:00
barisusakli
fff5def99b up dbsearch 2015-12-11 11:00:50 +02:00
barisusakli
dcbf53bae3 moved search to dbsearch 2015-12-11 10:57:13 +02:00
Julian Lam
538c6ab7e7 added redisearch to dependencies 2015-12-10 17:18:03 -05:00
Julian Lam
9c36e81f3a 0.9.2 v0.9.2 2015-12-10 16:01:35 -05:00
Julian Lam
4ce6bcfa6a latest translations 2015-12-10 16:01:16 -05:00
Julian Lam
7220ed2010 nodebb/nodebb-theme-persona#214 2015-12-10 11:08:30 -05:00
Julian Lam
aebaf8f589 #3939 2015-12-10 10:18:16 -05:00
barisusakli
745007a2b3 closes #3873 2015-12-10 12:19:43 +02:00
barisusakli
0ffd5254ad closes #3933, closes #3934 2015-12-10 09:00:46 +02:00
Barış Soner Uşaklı
cdca09a7b2 escape error message on 500 page 2015-12-09 21:18:56 +02:00
barisusakli
7b21760f00 refactor get user by x 2015-12-09 17:43:28 +02:00
Barış Soner Uşaklı
69bc870017 Merge pull request #3927 from lots0logs/master
Add api endpoints to get user by username and by email
2015-12-09 17:32:40 +02:00
barisusakli
5a2062ba32 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	package.json
2015-12-08 19:03:20 +02:00
Julian Lam
d1fb09caec apparently I *did* need html-to-text. 2015-12-07 16:41:21 -05:00
Julian Lam
963d9b22b3 Removing and updating dependencies to satisfy david-dm.org 2015-12-07 16:06:42 -05:00
Julian Lam
5adb8da427 enabled Gmail routing for email fallback 2015-12-07 15:27:04 -05:00
Julian Lam
7d9136f655 closes #3926 2015-12-07 13:53:14 -05:00
Dustin Falgout
17e5d72815 fix waterfall
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-06 09:34:51 -06:00
Dustin Falgout
0e5830d6f2 add api endpoints to get user by username and by email
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-06 09:16:20 -06: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
9560ee3a14 upped mentions minver, #3911 2015-12-04 12:41:56 -05:00
Julian Lam
acc2dfa037 latest translations, closes #3911 2015-12-04 12:39:42 -05:00
Julian Lam
2af11a23ce fixes #3922 2015-12-04 11:30:18 -05:00
Julian Lam
f77f39e937 Fixed #3925
Also updated port local variable to be a Number, since all of the
conditional checks assume it is a number, when all along it has
been a string.... heh.
2015-12-04 08:32:01 -05:00
Barış Soner Uşaklı
721649bff9 Merge pull request #3919 from yariplus/noredirectoncathp
Don't change url when homepage is set to a category.
2015-12-03 06:27:34 -05:00
Julian Lam
6a3200ed48 fixes #3921 2015-12-02 10:44:40 -05:00
yariplus
12fb512d3c Don't change url when homepage is set to a category. 2015-12-01 12:59: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
1b9defdf8b closes #3892 2015-11-28 23:22:39 -05:00
Julian Lam
335d711dbd closes #3907 2015-11-28 22:41:39 -05:00
Julian Lam
07d57f945b nodebb/nodebb#3907 2015-11-28 22:38:12 -05:00
Julian Lam
91c012e642 #3907 2015-11-28 22:32:28 -05:00