Commit Graph

12096 Commits (a2e5e7d9d39660eaf188b462100fb9aa1127bf00)
 

Author SHA1 Message Date
Barış Soner Uşaklı a2e5e7d9d3 Merge pull request from RaceProUK/master
Allow for a little scrolling before dismissing bookmark alert
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
psychobunny a68811cad2 closes
psychobunny 7e827fd5e7 up themes
psychobunny 963d13795b bump persona
psychobunny f40ec978cb Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 489bdcced6
psychobunny 3e14606226 added roomId to match the other hook
barisusakli 35a7554ec7 closes
barisusakli e3077b0ab0 dont use titleEscaped if its empty
barisusakli cb8abab5c5 fix for undefined topicTitle
barisusakli 301f12d630 fix conditional
barisusakli 8075a2f00f up persona
barisusakli f665a1e353 closes
barisusakli 041531a2e3 closes
psychobunny 086289528f Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 823880348c up themes
barisusakli 57ccbd606c closes
psychobunny 9cb2f9e05f removed JS fake link
barisusakli 86106971c4 closes
psychobunny 67646e2cda 1.0.2
psychobunny 294171b072 fixes potential XSS in usercard
barisusakli cccc64ef90 up persona
Barış Soner Uşaklı e9648daf7f Merge pull request from pichalite/issue-4386
fixes 
Barış Soner Uşaklı fd80259768 Merge pull request from BenLubar/topic-title-truncated
fix notifications that contain topic titles with commas in them
Barış Soner Uşaklı fe7d4999c9 Merge pull request from BenLubar/post-tools-stream
fix post tools not showing up for other users on new posts
Barış Soner Uşaklı 4d92ddf634 Merge pull request from BenLubar/email-hidden-symbol-for-staff
show the crossed-out eye icon for private email addresses
barisusakli 4eb7468dcd already checked in scrollToPostIfSelf
Barış Soner Uşaklı 86180e29e6 Merge pull request from boomzillawtf/master
Loads posts if appropriate, but doesn't scroll to new post according …
barisusakli e5188ee05b up mentions
Barış Soner Uşaklı 43ddf008ac Merge pull request from BenLubar/crashes-2016-03-19
fix two crashes
pichalite 9c9e49e2f6 properly fix with styling
pichalite 497592965f fixes issue-4386
Ben Lubar 44431f8410 fix notifications that contain topic titles with commas in them
Ben Lubar bb88c82ffd fix post tools not showing up for other users on new posts (src/topics/posts.js has this condition already)
Ben Lubar 3c607f2612 fix two crashes
Ben Lubar d654978508 show the crossed-out eye icon for users who want their email private for staff, not just the user
boomzillawtf 3d0012d730 Loads posts if appropriate, but doesn't scroll to new post according to the scroll to my post setting. Addresses .
barisusakli e556ae93ea up mentions
barisusakli b9b8f2320f up composer
NodeBB Misty c9f285a883 bumped up version
Conflicts:
	package.json
Julian Lam f7e4387748 closes
Julian Lam 1e651aed35
barisusakli 9e44bd3d21 up themes
Barış Soner Uşaklı d5e875538b Merge pull request from boomzillawtf/master
Setting to show new post after reply
psychobunny 3f9c838c30 up persona
barisusakli 6076bbbed4 added title
barisusakli c71ffed69c closes
barisusakli 838023f91e up themes
barisusakli 677b97d8bb closes