Commit Graph

11344 Commits

Author SHA1 Message Date
Julian Lam
04879e6da2 updated jquery-timeago locales 2015-12-18 14:13:47 -05:00
Julian Lam
668adc5187 fixing bootswatch integration 2015-12-18 12:56:24 -05:00
Julian Lam
af55f55b45 latest translations 2015-12-18 12:49:10 -05:00
barisusakli
270f8130da closes #3952 2015-12-18 13:32:53 +02:00
barisusakli
9981555042 rename 2015-12-18 13:14:44 +02:00
barisusakli
e067d26ca3 closes #3961 2015-12-18 13:09:47 +02:00
Julian Lam
a091067175 closes #3963 2015-12-17 18:22:09 -05:00
psychobunny
89901b2caa reorganized settings/tags acp 2015-12-17 16:53:42 -05:00
psychobunny
339b4c30fc ability to set maximum related topics rendered in ACP 2015-12-17 16:52:02 -05:00
psychobunny
ba719148c1 generic "related topics" functionality 2015-12-17 16:44:43 -05:00
Julian Lam
0af11c5c0c fallbacks for new notification groupings 2015-12-17 14:01:08 -05:00
Julian Lam
bdeb97e225 updating composer minver again 2015-12-17 09:40:53 -05:00
Julian Lam
065bb8ebc4 #3962 2015-12-17 09:35:41 -05:00
psychobunny
3ce9d0ac2f fixed ordered lists in post content 2015-12-16 17:39:21 -05:00
psychobunny
23c2fb2b52 un-nuking @julianlam :rage1: also fixed for latest BS 2015-12-16 17:24:07 -05:00
psychobunny
8b04b4fe50 up persona 2015-12-16 16:55:50 -05:00
Julian Lam
f4187fc671 fixing crash with deleted notifications 2015-12-16 15:33:00 -05:00
Julian Lam
40f0076b77 fixed bug with notif merging 2015-12-16 14:30:58 -05:00
Julian Lam
9f5815555a fixed null error with notif grouping 2015-12-16 13:56:12 -05:00
Julian Lam
05df8900db closes #3912 2015-12-16 12:15:26 -05:00
Julian Lam
9db0f59432 part of #3912 2015-12-16 12:15:26 -05:00
Julian Lam
33a3a56fd7 Fixed issue where -w and -a flags didn't work in NodeBB reset. 2015-12-16 10:04:58 -05:00
Julian Lam
e602d2ad4d closes #3932 2015-12-16 09:42:17 -05:00
psychobunny
55b75ba502 up'd persona 2015-12-14 18:06:45 -05: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
Julian Lam
8c87ff44d1 #3829 2015-12-14 15:00:57 -05:00
Julian Lam
37b13b4879 Re-added file extension restriction ACP option
Closes #3918
2015-12-14 14:57:19 -05:00
Barış Soner Uşaklı
7e1a84850c closes #3948 2015-12-14 21:51:47 +02:00
Julian Lam
cc4997aeca fixes #3940 2015-12-14 14:28:27 -05: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
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