Commit Graph

12303 Commits

Author SHA1 Message Date
pichalite
be4aa5ac94 add title length check to topic fork process 2016-03-21 21:13:36 +00:00
Barış Soner Uşaklı
a2e5e7d9d3 Merge pull request #4430 from RaceProUK/master
Allow for a little scrolling before dismissing bookmark alert
2016-03-21 22:07:01 +02:00
RaceProUK
fd854b134d Allow for a little scrolling before dismissing bookmark alert
This is just in case someone scrolls a little accidentally; the alert remains so they can still follow it if they want to
2016-03-21 19:49:35 +00:00
psychobunny
a68811cad2 closes #4428 2016-03-21 13:49:37 -04:00
psychobunny
7e827fd5e7 up themes #4413 2016-03-21 13:10:39 -04:00
psychobunny
963d13795b bump persona 2016-03-21 13:00:11 -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
psychobunny
3e14606226 added roomId to match the other hook 2016-03-21 12:57:23 -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
301f12d630 fix conditional 2016-03-21 17:55:15 +02:00
barisusakli
8075a2f00f up persona 2016-03-21 17:51:10 +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
psychobunny
086289528f Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-03-21 10:10:34 -04:00
psychobunny
823880348c up themes #4407 2016-03-21 10:10:07 -04:00
barisusakli
57ccbd606c closes #4391 2016-03-21 16:07:59 +02:00
psychobunny
9cb2f9e05f removed JS fake link #4407 2016-03-21 10:05:38 -04:00
barisusakli
86106971c4 closes #4382 2016-03-21 15:50:25 +02:00
psychobunny
67646e2cda 1.0.2 2016-03-21 09:10:48 -04:00
psychobunny
294171b072 fixes potential XSS in usercard 2016-03-21 08:58:59 -04:00
barisusakli
cccc64ef90 up persona 2016-03-21 10:46:39 +02: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ı
fe7d4999c9 Merge pull request #4418 from BenLubar/post-tools-stream
fix post tools not showing up for other users on new posts
2016-03-21 10:27:17 +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
barisusakli
4eb7468dcd already checked in scrollToPostIfSelf 2016-03-21 10:16:10 +02:00
Barış Soner Uşaklı
86180e29e6 Merge pull request #4415 from boomzillawtf/master
Loads posts if appropriate, but doesn't scroll to new post according …
2016-03-21 10:11:50 +02:00
barisusakli
e5188ee05b up mentions 2016-03-21 09:43:27 +02:00
Barış Soner Uşaklı
43ddf008ac Merge pull request #4417 from BenLubar/crashes-2016-03-19
fix two crashes
2016-03-21 09:22:48 +02:00
pichalite
9c9e49e2f6 properly fix with styling 2016-03-20 22:20:55 +00: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
bb88c82ffd fix post tools not showing up for other users on new posts (src/topics/posts.js has this condition already) 2016-03-20 15:59:38 -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
boomzillawtf
3d0012d730 Loads posts if appropriate, but doesn't scroll to new post according to the scroll to my post setting. Addresses #4412. 2016-03-20 14:48:55 -04:00
barisusakli
e556ae93ea up mentions 2016-03-19 10:47:05 +02:00
barisusakli
b9b8f2320f up composer 2016-03-19 10:36:39 +02:00
NodeBB Misty
c9f285a883 bumped up version
Conflicts:
	package.json
2016-03-18 13:47:49 -04:00
Julian Lam
f7e4387748 closes #4380 2016-03-18 12:24:51 -04:00
Julian Lam
1e651aed35 #4377 2016-03-18 12:13:29 -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
psychobunny
3f9c838c30 up persona 2016-03-17 14:57:41 -04: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
838023f91e up themes 2016-03-17 11:03:23 +02:00