Commit Graph

15448 Commits

Author SHA1 Message Date
Peter Jaszkowiak
73f375252f Automatically install dependencies 2017-05-10 12:23:12 -06:00
Barış Soner Uşaklı
aabfe8f41f fix lint 2017-05-10 14:02:58 -04:00
Julian Lam
71137dbf43 pass reputation to flag reporter payload as well 2017-05-10 11:21:30 -04:00
Misty (Bot)
1d672d9024 Latest translations and fallbacks 2017-05-10 09:23:07 +00:00
Barış Soner Uşaklı
3c8460fee0 disable timeout 2017-05-09 18:19:22 -04:00
Barış Soner Uşaklı
17b57be835 Merge pull request #5661 from NodeBB/utils-rtrim
Deprecate non-standard `String.prototype.rtrim`
2017-05-09 16:44:43 -04:00
Peter Jaszkowiak
2b2544a4b1 Deprecate non-standard String.prototype.rtrim 2017-05-09 14:37:35 -06:00
Julian Lam
ad14b0d60b more fixes for #5660 2017-05-09 15:07:59 -04:00
Julian Lam
87fbb44ca8 fixes #5660 properly 2017-05-09 15:01:02 -04:00
Julian Lam
6d392089e4 fixes #5660 - https://ecma-international.org/ecma-262/5.1/#sec-15.9.1.1 2017-05-09 14:52:11 -04:00
Barış Soner Uşaklı
ca17975422 osd route test 2017-05-09 14:48:31 -04:00
Julian Lam
031171caed Merge pull request #5630 from NodeBB/notif-abort
Add more hooks for messaging, allow notification hook to abort the push
2017-05-09 14:42:58 -04:00
Barış Soner Uşaklı
bf78786a68 flag controller tests 2017-05-09 14:31:32 -04:00
Barış Soner Uşaklı
5a9b7b673a closes #5659 2017-05-09 14:16:21 -04:00
Peter Jaszkowiak
5ccb488b02 Fix indents 2017-05-09 11:45:09 -06:00
Peter Jaszkowiak
932ae4e86d Merge branch 'master' into notif-abort 2017-05-09 11:31:58 -06:00
Barış Soner Uşaklı
3ae3d788be up composer 2017-05-09 13:25:01 -04:00
Misty (Bot)
cb339838c0 Latest translations and fallbacks 2017-05-09 09:23:07 +00:00
Barış Soner Uşaklı
36a2ac0ebd add test for user settings cache issue 2017-05-08 21:28:06 -04:00
Barış Soner Uşaklı
db532fbb0d fix user settings cache 2017-05-08 21:23:30 -04:00
Barış Soner Uşaklı
6fcd12eafe fix tests 2017-05-08 20:55:47 -04:00
Barış Soner Uşaklı
b18b0db5be notifications.js style 2017-05-08 20:36:43 -04:00
Barış Soner Uşaklı
f3deef4931 closes #5656 2017-05-08 19:54:53 -04:00
Barış Soner Uşaklı
d49da8c85d up xregexp 2017-05-08 17:46:26 -04:00
Barış Soner Uşaklı
df7f357e53 up validator 2017-05-08 17:36:59 -04:00
Barış Soner Uşaklı
5822aaa433 up rimraf 2017-05-08 16:57:36 -04:00
Barış Soner Uşaklı
a43d6e6966 up redis 2017-05-08 16:50:40 -04:00
Barış Soner Uşaklı
dfbb488a0f up postcss 2017-05-08 16:30:12 -04:00
Barış Soner Uşaklı
ea5927047f up connect-redis 2017-05-08 16:18:36 -04:00
Barış Soner Uşaklı
1f3840414c up bcryptjs 2017-05-08 16:12:21 -04:00
Barış Soner Uşaklı
84ff8bb24a up autoprefixer 2017-05-08 16:03:32 -04:00
Barış Soner Uşaklı
d333e87b51 update some deps 2017-05-08 15:37:36 -04:00
Barış Soner Uşaklı
7ac031775a locale test change 2017-05-08 14:55:29 -04:00
Barış Soner Uşaklı
aca07a0f20 fix typo 2017-05-08 14:41:57 -04:00
Julian Lam
b58eb99571 re-adding public/uploads to gitignore 2017-05-08 14:26:48 -04:00
Julian Lam
aa9b795b3b update theme versions for v1.5.0 release 2017-05-08 14:08:17 -04:00
Julian Lam
972e9a0303 bump version for manual minor release 2017-05-08 13:56:54 -04:00
Barış Soner Uşaklı
3a1eba2537 merge 2017-05-08 13:49:35 -04:00
Barış Soner Uşaklı
7135d25a4a closes #5654 2017-05-08 12:19:22 -04:00
Barış Soner Uşaklı
6c224c3800 fix cover:url logic 2017-05-08 12:09:25 -04:00
Barış Soner Uşaklı
5b69598f15 Merge pull request #5632 from NodeBB/fix-5631
Fix #5631
2017-05-08 12:07:25 -04:00
Misty (Bot)
27b362fab2 Latest translations and fallbacks 2017-05-08 09:22:52 +00:00
Yudu Ban
a76a8b57cd fix indent
Use space instead of Tab
2017-05-08 09:30:16 +08:00
Misty (Bot)
5e464f1466 Latest translations and fallbacks 2017-05-06 20:41:49 +00:00
psychobunny
da5a0d8881 Merge pull request #5651 from NodeBB/ban-improvements
Ban improvements
2017-05-06 15:32:30 -04:00
Misty (Bot)
4511814c18 Latest translations and fallbacks 2017-05-06 09:22:16 +00:00
psychobunny
480352c650 send the banned user an email with reason + time limit if applies 2017-05-06 02:37:00 -04:00
psychobunny
2a405ad439 fixed permaban on redis 2017-05-05 20:11:18 -04:00
psychobunny
41b4ef859f add ban messaging when logged in 2017-05-05 19:50:50 -04:00
psychobunny
b3bd70235a refactor ban messaging; add ban duration to message; use bootbox instead of alert 2017-05-05 19:31:49 -04:00