Commit Graph

16569 Commits

Author SHA1 Message Date
Julian Lam
a1f87a5d7f added tests for #5545 2017-03-24 15:52:33 -04:00
Julian Lam
a49e647de3 fixes #5545 again 2017-03-24 14:46:51 -04:00
Julian Lam
b649eb95f8 Merge remote-tracking branch 'origin/master' into develop 2017-03-24 14:37:39 -04:00
Julian Lam
31b6d47f88 fixes #5545 2017-03-24 14:36:54 -04:00
Julian Lam
c84e54c6c6 Merge pull request #5544 from NodeBB/patch_5543
Fix #5543
2017-03-24 13:32:32 -04:00
Peter Jaszkowiak
a7677063de Rename to uniqueUsername 2017-03-24 10:33:38 -06:00
Peter Jaszkowiak
642306e69c Fix #5543 2017-03-24 10:28:18 -06:00
Misty (Bot)
3319a72679 Latest translations and fallbacks 2017-03-24 09:22:18 +00:00
Julian Lam
6060b8e13b fix tests 2017-03-23 14:39:46 -04:00
Julian Lam
f2653cd380 broader error handling for empty notif creation return 2017-03-23 14:35:29 -04:00
Barış Soner Uşaklı
a3d65d10f6 fix test again 2017-03-23 16:45:24 +03:00
Barış Soner Uşaklı
46da2daab9 fix test 2017-03-23 16:31:14 +03:00
Barış Soner Uşaklı
61eafb32f3 fix moderation note test 2017-03-23 16:31:06 +03:00
Barış Soner Uşaklı
fe27d40ff6 closes #5542 2017-03-23 10:58:28 +03:00
Julian Lam
4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 2017-03-22 09:18:20 -04:00
Aziz Khoury
6682e048ea wrapImagesInLinks with <a download> attribute
if the `src` of the `img` does not have an extension, most browsers will trigger a download with whatever filename is set, also without an extension, so when it's opened in any OS, it wont have a default application to open it with.

So, In this case, if the `alt` attribute has an extension (meaning if it looks like filename) - we use that with the html5 [`download` attr](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download)

The PR does not affect any src if they have an extension.
2017-03-22 12:19:31 +02:00
Julian Lam
ce64db8d71 fix logic error that caused upgrade scripts to always be skipped 2017-03-21 21:10:46 -04:00
Julian Lam
a82a50baa6 fix date and name in config urls upgrade script 2017-03-21 21:10:20 -04:00
Julian Lam
b6134b160e moved auto_reconnect out of socketOptions object for Mongo 2017-03-21 15:55:24 -04:00
Julian Lam
db84296373 Merge pull request #5539 from NodeBB/julianlam-patch-1
Up MongoDB dependency to v2.2.25
2017-03-21 14:22:17 -04:00
Julian Lam
9714e3c26b Up MongoDB dependency to v2.2.25
This is a PR to see if tests go 💥
2017-03-21 14:01:41 -04:00
Ben Lubar
7f713ee822 Admin option to allow all users to view votes (#5534)
* Admin option to allow all users to view votes

* Fix </strong></strong>
2017-03-17 14:08:47 -04:00
Julian Lam
e4168f4a87 linting 2017-03-17 13:35:24 -04:00
Julian Lam
c805d55b85 creating notification for flag assignment 2017-03-17 13:16:16 -04:00
Julian Lam
7f8f197e60 Merge branch 'master' into develop 2017-03-16 14:58:39 -04:00
Misty (Bot)
da1858f674 Incremented version number 2017-03-16 14:58:24 -04:00
barisusakli
449352d899 wait for all routes to load before listening 2017-03-16 11:24:36 +03:00
Julian Lam
2ef71e22aa Merge pull request #5532 from NodeBB/patch_5491
Fix tests for #5491 fix
2017-03-15 23:11:09 -04:00
Peter Jaszkowiak
8f8babf90b Fix tests 2017-03-15 20:09:07 -07:00
Julian Lam
23d4497c73 Merge pull request #5531 from NodeBB/patch_5491
Fix #5491
2017-03-15 23:01:42 -04:00
Peter Jaszkowiak
8c45411ccc Fix #5491 2017-03-15 20:00:05 -07:00
psychobunny
f7d1e58d65 improved threaded view design... again 2017-03-15 18:56:12 -04:00
Julian Lam
69dd1e3aca Merge branch 'master' into develop 2017-03-15 14:39:18 -04:00
Julian Lam
33bf930bb9 fixes #5528 2017-03-15 13:49:35 -04:00
barisusakli
8d7283e6c7 dont minify if file ends with .min.js #5529 2017-03-15 20:33:33 +03:00
Julian Lam
250bb4b011 fixed leftover merge conflict artifact 2017-03-15 10:23:25 -04:00
Julian Lam
1ebbbdd3f9 Merge remote-tracking branch 'origin/master' into develop 2017-03-15 10:01:00 -04:00
barisusakli
ff4c7ab3bb fix tests 2017-03-15 12:49:08 +03:00
barisusakli
6a4b082080 closes #5524 2017-03-15 12:19:09 +03:00
barisusakli
cb92ebb3be fix call 2017-03-14 23:29:26 +03:00
barisusakli
5a2ff8ed0a closes #5527 2017-03-14 23:03:09 +03:00
Julian Lam
6d444ccacf Merge pull request #5526 from NodeBB/patch_5346
Fix #5346
2017-03-14 09:52:42 -04:00
Misty (Bot)
2106050bdc Latest translations and fallbacks 2017-03-14 09:22:41 +00:00
Peter Jaszkowiak
c199075d98 Fix #5346 2017-03-13 20:20:41 -07:00
Julian Lam
25518bdd18 removed unused vars 2017-03-13 16:54:29 -04:00
psychobunny
8a6665a26c up lav, closes #5525 2017-03-13 16:54:28 -04:00
Julian Lam
c323a813c0 added logic to handle backwards compatibility with old schemaDate method of tracking upgrade scripts 2017-03-13 16:45:05 -04:00
psychobunny
767705085b test against nodejs 7 as well 2017-03-13 14:00:48 -04:00
psychobunny
4a33f45b1e use writeFileSync for synchronous fs write operations - nodejs 7.x 2017-03-13 13:57:35 -04:00
Barış Soner Uşaklı
0396e9300b Merge pull request #5500 from RoiEXLab/fix-admin-search
Fix admin Search
2017-03-13 09:58:30 +02:00