Commit Graph

6979 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
ae04d6d6dd Merge pull request #4445 from BenLubar/topic-bookmarks
include bookmarks with topic lists
2016-03-23 09:42:36 +02:00
Barış Soner Uşaklı
2059352ca7 Merge pull request #4447 from BenLubar/empty-topic-slug
save slug correctly on edit
2016-03-23 08:56:32 +02:00
Ben Lubar
c7cfe45d0b fix double-URL-encoding causing redirect loops 2016-03-22 19:54:27 -05:00
Ben Lubar
1d9ff2bc70 save slug correctly on edit 2016-03-22 19:51:31 -05:00
Ben Lubar
969e7fdbbe include bookmarks with topic lists 2016-03-22 18:44:05 -05:00
Barış Soner Uşaklı
89aa06526d fix indent 2016-03-23 00:05:07 +02:00
barisusakli
931dedf7f1 revert 50 change on admin 2016-03-22 18:41:18 +02:00
barisusakli
9b1dab8ef9 up default to 50 2016-03-22 18:33:35 +02:00
barisusakli
f4dd3d2082 up users per page to 50 2016-03-22 18:32:25 +02:00
barisusakli
0bf05a17bf closes #4378 2016-03-22 18:22:42 +02:00
barisusakli
7e6e3b3a40 closes #4383 2016-03-22 16:47:30 +02:00
barisusakli
f246c5e1ee closes https://github.com/NodeBB/nodebb-theme-persona/issues/259 2016-03-22 11:39:28 +02:00
barisusakli
e2f78a9585 closes #4432 2016-03-22 11:19:33 +02:00
barisusakli
e694bd8ab5 closes #4431 2016-03-22 09:47:29 +02:00
pichalite
be4aa5ac94 add title length check to topic fork process 2016-03-21 21:13:36 +00:00
psychobunny
a68811cad2 closes #4428 2016-03-21 13:49:37 -04:00
psychobunny
f40ec978cb Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-03-21 12:59:39 -04:00
psychobunny
489bdcced6 #4423 2016-03-21 12:57:44 -04:00
barisusakli
35a7554ec7 closes #4427 2016-03-21 18:41:33 +02:00
barisusakli
e3077b0ab0 dont use titleEscaped if its empty 2016-03-21 18:18:59 +02:00
barisusakli
cb8abab5c5 fix for undefined topicTitle 2016-03-21 18:13:36 +02:00
barisusakli
f665a1e353 closes #4394 2016-03-21 17:49:44 +02:00
barisusakli
041531a2e3 closes #4424 2016-03-21 16:48:12 +02:00
barisusakli
57ccbd606c closes #4391 2016-03-21 16:07:59 +02:00
barisusakli
86106971c4 closes #4382 2016-03-21 15:50:25 +02:00
psychobunny
294171b072 fixes potential XSS in usercard 2016-03-21 08:58:59 -04:00
Barış Soner Uşaklı
e9648daf7f Merge pull request #4421 from pichalite/issue-4386
fixes #4386
2016-03-21 10:42:12 +02:00
Barış Soner Uşaklı
fd80259768 Merge pull request #4419 from BenLubar/topic-title-truncated
fix notifications that contain topic titles with commas in them
2016-03-21 10:40:29 +02:00
Barış Soner Uşaklı
4d92ddf634 Merge pull request #4416 from BenLubar/email-hidden-symbol-for-staff
show the crossed-out eye icon for private email addresses
2016-03-21 10:24:48 +02:00
pichalite
497592965f fixes issue-4386 2016-03-20 22:09:10 +00:00
Ben Lubar
44431f8410 fix notifications that contain topic titles with commas in them 2016-03-20 16:28:21 -05:00
Ben Lubar
3c607f2612 fix two crashes 2016-03-20 15:11:32 -05:00
Ben Lubar
d654978508 show the crossed-out eye icon for users who want their email private for staff, not just the user 2016-03-20 15:07:11 -05:00
Julian Lam
f7e4387748 closes #4380 2016-03-18 12:24:51 -04:00
barisusakli
9e44bd3d21 up themes 2016-03-18 10:33:10 +02:00
Barış Soner Uşaklı
d5e875538b Merge pull request #4374 from boomzillawtf/master
Setting to show new post after reply
2016-03-18 10:24:43 +02:00
barisusakli
6076bbbed4 added title 2016-03-17 11:54:31 +02:00
barisusakli
c71ffed69c closes #4362 2016-03-17 11:38:21 +02:00
barisusakli
677b97d8bb closes #2873 2016-03-17 11:00:10 +02:00
boomzillawtf
ceb3b6ebe7 Add setting to avoid showing a post after it is submitted to keep the user's place on the page to address issue #4363 2016-03-16 17:55:58 -04:00
Julian Lam
cf8f1210cd added syntax hints to blacklist page 2016-03-16 12:04:08 -04:00
barisusakli
b1284f900d up toobusy default 2016-03-15 15:38:53 +02:00
barisusakli
c9cfe5b089 closes #4355 2016-03-15 15:38:16 +02:00
barisusakli
b6e22b7723 closes #4367 2016-03-15 12:13:35 +02:00
barisusakli
5920697ac0 closes #4368 2016-03-15 11:09:06 +02:00
barisusakli
d52a0ad87a closes #4366 2016-03-15 10:53:10 +02:00
Julian Lam
184a2c4540 IP blacklist functionality -- re: #4367
Squashed commit of the following:

commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:29:45 2016 -0400

    allowing blacklist.test to be called synchronously

commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:01:14 2016 -0400

    added plain ipv6 support and finished middleware logic

commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 16:05:31 2016 -0500

    WIP IP Banning logic middleware

commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 15:26:27 2016 -0500

    tweaks to ACP, rule validator

commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 13:50:05 2016 -0500

    IP Banning ACP page, styling, save&load functionality
2016-03-14 17:31:36 -04:00
Barış Soner Uşaklı
71c697037d return the ips of the account we are looking at 2016-03-14 22:10:16 +02:00
psychobunny
1a669cb5fb Merge pull request #4158 from frissdiegurke/patch-3
Fix settings trim cleaning arrays
2016-03-14 15:34:46 -04:00
psychobunny
08e50a025d Merge pull request #4360 from kingjan1999/master
Update fontawesome.tpl to FA 4.5
2016-03-14 15:32:42 -04:00