Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-31 09:40:55 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,872 Commits 72 Branches 495 Tags
432c3d777deedcfc860cfed86a4f94a58e79ef44
Commit Graph

6842 Commits

Author SHA1 Message Date
Julian Lam
432c3d777d Merge branch 'master' into fix-vendors 2016-02-26 12:38:23 -05:00
Julian Lam
7bc9e4439a removed .gitignore from list of sound files 2016-02-26 12:37:55 -05:00
Julian Lam
3f2872979f added buzz 2016-02-26 12:34:48 -05:00
Julian Lam
44aae7daa5 removed hammer, updated semver, added mousetrap 2016-02-26 12:12:12 -05:00
Julian Lam
e1323c0295 Updated js code so vendors can be added to the modules folder, so 
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
 2016-02-26 11:29:17 -05:00
barisusakli
c8ee1b4c58 closes #4261 2016-02-26 16:45:44 +02:00
psychobunny
ee6d16c3d8 closes #4266 2016-02-25 23:06:00 -05:00
psychobunny
2b10ef97b2 closes #4262 2016-02-25 23:04:34 -05:00
pichalite
5f6a1a0acd complete fixes for #4144 2016-02-26 00:04:56 +00:00
Julian Lam
dd3f1b9ba8 removed console.log 2016-02-25 16:22:35 -05:00
Julian Lam
088940d4c7 Squashed commit of the following: 
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 16:12:15 2016 -0500

    added recording and charts for topic and post counts globally and by cid

commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 15:35:49 2016 -0500

    added labels to charts

commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 13:30:47 2016 -0500

    added per category graphs to ACP management page

commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 12:36:11 2016 -0500

    updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page

commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Feb 24 16:48:55 2016 -0500

    saving per-category analytics, and updated the writeData method to use async for "clarity"
 2016-02-25 16:12:50 -05:00
psychobunny
9e832e006a closes #2920 2016-02-25 14:06:03 -05:00
barisusakli
8bc80abde6 removed notify typing code, not even working 2016-02-25 18:21:24 +02:00
barisusakli
ebcd892aee closes #4259 2016-02-25 18:01:59 +02:00
barisusakli
66c6c47b7c closes #4213 2016-02-25 16:12:46 +02:00
barisusakli
ac09036156 closes #4053 2016-02-25 11:41:40 +02:00
psychobunny
fae5fe5c50 closes #3837 2016-02-24 18:04:14 -05:00
barisusakli
211311214e https://github.com/NodeBB/NodeBB/issues/4204 2016-02-24 22:47:31 +02:00
barisusakli
34f68a029a closes #4204 2016-02-24 22:15:37 +02:00
barisusakli
1349c4907d fix notification crash 2016-02-24 22:05:14 +02:00
barisusakli
2b8ecfbb94 dont add topic to topics:recent if its deleted 2016-02-24 21:35:35 +02:00
barisusakli
5f17e327ce possible fix for https://github.com/akhoury/nodebb-plugin-import/issues/173 2016-02-24 20:10:06 +02:00
barisusakli
e9c488d489 closes #4166 2016-02-24 13:09:53 +02:00
barisusakli
92fba4f396 closes #4248 2016-02-24 12:07:02 +02:00
barisusakli
878b7b21ee closes #4170 2016-02-24 11:35:53 +02:00
barisusakli
e4cae9391c moved ips down 2016-02-24 09:58:14 +02:00
psychobunny
911892c5b0 closes #3870 2016-02-23 17:17:55 -05:00
psychobunny
99719414fe closes #4052 2016-02-23 17:10:34 -05:00
psychobunny
e069150625 closes #2165 2016-02-23 16:06:02 -05:00
psychobunny
b18052210d closes #3146 2016-02-23 14:23:57 -05:00
psychobunny
637c20f44d closes #3526 2016-02-23 14:17:04 -05:00
psychobunny
b8eb19b991 closes #3993 2016-02-23 13:57:00 -05:00
psychobunny
75917e25b3 closes #4026 2016-02-23 13:33:46 -05:00
psychobunny
a3530340a9 Merge pull request #4250 from pichalite/issue-4228 
throw error in chat if no users in room
 2016-02-23 13:18:34 -05:00
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
psychobunny
d0862911d3 closes #4181 2016-02-23 12:21: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
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
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
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
Terry Tate
3e75c6f6a3 Update to nodemailer 2.0 syntax for smtpTransport 
Fixes #4193
 2016-02-21 17:13:44 +00: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
Barış Soner Uşaklı
e39fda2b45 filter dupe tags, closes #4216 2016-02-19 21:58:21 +02:00