Commit Graph

12303 Commits

Author SHA1 Message Date
psychobunny
cd0cb5c5f1 closes #4237 2016-02-23 13:16:41 -05:00
Julian Lam
ff8e1b52e0 fixed #4251 2016-02-23 13:15:45 -05:00
Julian Lam
322d4052b0 chat controls now hidden instead of taking up space in chat modal 2016-02-23 13:01:36 -05:00
psychobunny
a0a98e64b7 closes #4220 2016-02-23 12:55:46 -05:00
psychobunny
4a12a06745 closes #4252 2016-02-23 12:42:21 -05:00
psychobunny
d0862911d3 closes #4181 2016-02-23 12:21:32 -05:00
Julian Lam
3b76b0343b Revert "fixes NodeBB/nodebb-theme-persona#218"
This reverts commit ee529d92d3.
2016-02-23 11:07:32 -05:00
barisusakli
2b90040c31 closes #4236 2016-02-23 16:46:10 +02:00
barisusakli
6951dc1fe2 closes #4211 2016-02-23 15:35:16 +02:00
barisusakli
58a849f206 up composer default 2016-02-23 14:52:42 +02:00
barisusakli
738b892074 closes #4217 2016-02-23 14:41:15 +02:00
barisusakli
4608b8f07b closes #4183 2016-02-23 13:34:16 +02:00
barisusakli
46c8101c5c closes #4152 2016-02-23 13:08:51 +02:00
pichalite
6ecc05afd4 throw error in chat if no users in room 2016-02-23 00:52:43 +00:00
psychobunny
18bc7713ef Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-02-22 14:41:10 -05:00
psychobunny
933115a853 almost had a heartattack when I saw 121 changed files in this conflict
# Conflicts:
#	src/meta/templates.js
2016-02-22 14:41:03 -05:00
Julian Lam
2cf42f55f5 latest translation 2016-02-22 14:37:50 -05:00
psychobunny
914fc1543e meta/templates.js refactor 2016-02-22 14:25:04 -05:00
psychobunny
da5494fdf1 allow recursive base templates
ex. custom theme based off lavender which is based off vanilla
2016-02-22 14:20:50 -05:00
Julian Lam
13dfe6cd51 Merge pull request #4243 from pichalite/issue-4241
don't mention guest on reply
2016-02-22 14:00:07 -05:00
Julian Lam
20103b64ce Merge pull request #4219 from pichalite/groups
add missing translation in groups
2016-02-22 13:59:47 -05:00
pichalite
fba4e93cfe remove translator 2016-02-22 10:47:29 -08:00
pichalite
872b33f0cc fix typo 2016-02-22 10:46:10 -08:00
Julian Lam
c551e0fd82 updated to latest nodemailer smtp transport 2016-02-22 11:02:39 -05:00
Julian Lam
30d980b01a updated theme and plugin minvers 2016-02-22 10:19:33 -05:00
Julian Lam
65407cb71f Merge pull request #4239 from ds-terrytate/fix-gmail-smtp-nodemailer
Update to nodemailer 2.0 syntax for smtpTransport
2016-02-22 10:08:23 -05:00
Julian Lam
60a5a1b422 latest translations 2016-02-22 09:52:55 -05:00
Julian Lam
a61fea862b Merge pull request #4245 from pichalite/issue-4159
fixes #4159
2016-02-22 09:42:41 -05:00
Julian Lam
f4c0b90bd0 Merge pull request #4246 from pichalite/issue-4235
fixes #4235
2016-02-22 09:39:13 -05:00
pichalite
f22b218250 fixes #4235 2016-02-22 08:14:51 +00:00
pichalite
ca3fa023e8 fixes #4159 2016-02-22 06:49:35 +00:00
Barış Soner Uşaklı
560a9f3867 Merge pull request #4244 from pichalite/user-delete
fix logout on user self delete
2016-02-22 08:42:28 +02:00
pichalite
a22d7290ec fix logout on user delete 2016-02-22 03:42:12 +00:00
pichalite
3024d2e661 don't mention guest on reply 2016-02-22 03:22:02 +00:00
Terry Tate
3e75c6f6a3 Update to nodemailer 2.0 syntax for smtpTransport
Fixes #4193
2016-02-21 17:13:44 +00:00
Barış Soner Uşaklı
d43a45d0b8 Merge pull request #4234 from pichalite/chat-fixes
chat edit fixes
2016-02-21 09:42:07 +02:00
pichalite
f637521105 chat edit fixes 2016-02-21 05:19:53 +00:00
Julian Lam
567b01e0bc Merge pull request #4230 from frissdiegurke/patch-4
Prevent breaking eventLoopLagThreshold value
2016-02-20 23:59:17 -05:00
Ole R
6d35690cbb Prevent breaking eventLoopLagThreshold value
[This problem](https://community.nodebb.org/topic/7955/and-once-again-all-my-data-has-gone/4) occurs when you put a value less than `10`.
2016-02-20 19:52:26 +01:00
barisusakli
2b7ed63236 fix for groups that don't have private field 2016-02-20 09:40:14 +02:00
Julian Lam
d826d4d81a Merge pull request #4224 from yariplus/patch-5
Added app.newTopic
2016-02-19 21:41:19 -05:00
Timothy Fike
c80bd0c413 Added app.newTopic
Make a new topic from anywhere. #4223
2016-02-19 19:23:18 -05:00
Julian Lam
e3371eb7ab Merge pull request #4221 from pichalite/private-groups
set default option for allowPrivateGroups on setup
2016-02-19 17:34:35 -05:00
pichalite
2cf300f0e1 set default option for allowPrivateGroups on setup 2016-02-19 22:17:09 +00:00
pichalite
9f760f9b55 translate string in groups 2016-02-19 21:08:40 +00:00
Barış Soner Uşaklı
e39fda2b45 filter dupe tags, closes #4216 2016-02-19 21:58:21 +02:00
barisusakli
6a481c1769 up html to text 2016-02-19 10:45:08 +02:00
barisusakli
3b6623ccee up mentions 2016-02-19 10:43:08 +02:00
barisusakli
6b341a844d remove notifyTyping 2016-02-19 09:41:22 +02:00
Julian Lam
dd050c8177 added new hook that is called before templates are compiled 2016-02-18 20:43:06 -05:00