Compare commits

...

3721 Commits

Author SHA1 Message Date
Julian Lam
45c62da51c Merge branch 'master' into v0.4.x 2014-04-09 14:24:40 -04:00
barisusakli
e2d0d4db5c added error and success language files
removed some code from server side that was emitting alerts
2014-04-09 14:12:50 -04:00
psychobunny
d8df9ab3ed reverting groups.js to 4701eb1cee 2014-04-09 14:11:03 -04:00
psychobunny
81dfbba0ec imported latest templates.js 2014-04-09 14:08:38 -04:00
Julian Lam
0a35195fc7 an attempt at addressing loader madness... #1364 2014-04-09 13:10:28 -04:00
Julian Lam
95bd153446 added Travis CI badge [skip ci] 2014-04-09 08:43:10 -04:00
Julian Lam
f2c0175b5c increased test timeout 2014-04-08 23:40:35 -04:00
Julian Lam
2c5876779f only build the master branch, TravisCI... 2014-04-08 21:38:54 -04:00
Julian Lam
f88d7e6170 Merge remote-tracking branch 'origin/v0.4.x' into v0.4.x 2014-04-08 21:30:39 -04:00
Julian Lam
13b4aa2282 updated shrinkwrap file for v0.4.1 2014-04-08 21:30:03 -04:00
Julian Lam
995fb22600 Merge branch 'master' into v0.4.x 2014-04-08 21:25:30 -04:00
Julian Lam
53908d347e 0.4.1 2014-04-08 21:24:53 -04:00
Julian Lam
f279515d36 updated travis config with new CI values 2014-04-08 21:09:59 -04:00
Julian Lam
2627240d80 changing minimum required version for NodeBB to 0.10, and updated travis config. Allowing new setup option "ci", for TravisCI integration 2014-04-08 21:08:51 -04:00
Julian Lam
e579db8bf3 using tildes instead of carats 2014-04-08 20:08:52 -04:00
Julian Lam
5db18e307c removing apt-get lines from travis config 2014-04-08 18:15:55 -04:00
Julian Lam
8e0d33144c updated travis.yaml 2014-04-08 18:12:50 -04:00
Julian Lam
70c1beb6d2 updated travis CI yaml file 2014-04-08 18:00:51 -04:00
psychobunny
cf362f64a3 woops, now everybody is an android browser. 2014-04-08 17:59:08 -04:00
Julian Lam
3ac9425669 TravisCI integration 2014-04-08 17:41:43 -04:00
Julian Lam
49a686af78 fixing groups tests 2014-04-08 17:37:11 -04:00
psychobunny
8432d8827e attempt at fixing #1323 2014-04-08 17:35:30 -04:00
psychobunny
d5baaacb72 utils.isAndroidBrowser 2014-04-08 17:35:29 -04:00
psychobunny
ff43a619c5 moving utils.js to the top 2014-04-08 17:35:28 -04:00
barisusakli
7a6f7d3e49 fixed 2 tests 2014-04-08 17:21:04 -04:00
Julian Lam
1cc15a71d6 resolved #1350 2014-04-08 16:53:08 -04:00
Julian Lam
3378717562 dbmock 4-spaces 2014-04-08 16:53:08 -04:00
psychobunny
2288da4daf ./nodebb reset widgets - global widgets as well 2014-04-08 16:52:52 -04:00
psychobunny
ba1e04741b settings reset message 2014-04-08 16:50:30 -04:00
barisusakli
1e96c21cae removed the span size 2014-04-08 16:48:13 -04:00
psychobunny
21a4651a64 latest templates.js, gotta switch to the version on npm soon 2014-04-08 16:45:17 -04:00
psychobunny
c52583ae28 replaying changes from a150b2c6f7 2014-04-08 16:10:27 -04:00
barisusakli
c0145ad301 move db.init to reset function 2014-04-08 16:03:45 -04:00
psychobunny
c5cae312d7 error out early when saving widgets 2014-04-08 15:58:47 -04:00
psychobunny
61478caa3d imported latest templates.js 2014-04-08 15:51:20 -04:00
barisusakli
2195b20385 closes #1263 2014-04-08 15:29:56 -04:00
psychobunny
015ee701c4 @barisusakli is a stickler and wants to increase registration api call times by 0.0000000001s 2014-04-08 13:51:05 -04:00
psychobunny
5423434b3f closes #1362 2014-04-08 13:48:26 -04:00
Julian Lam
ee44128c8c not requiring email any longer for user creation (regression -- closes julianlam/nodebb-plugin-sso-twitter#4) 2014-04-07 20:19:40 -04:00
Julian Lam
ba16f95d1f Resetting 'all' done in series now -- #1317 2014-04-07 19:15:38 -04:00
barisusakli
67f9c8670a closes #1355 2014-04-07 18:54:55 -04:00
psychobunny
a150b2c6f7 handle if invalid tpl is passed in 2014-04-07 18:06:58 -04:00
barisusakli
d2033abf96 fixes unread page
if you had more than 20 unread topics it was loading 40 now it will only
load 21 then keep loading with infinite loading
2014-04-07 18:06:03 -04:00
barisusakli
54ba2d2ac3 removed console.log 2014-04-07 18:01:48 -04:00
barisusakli
d1ec101248 fixed infinite load and select 2014-04-07 17:55:19 -04:00
psychobunny
42c9185c7d closes #1317 2014-04-07 17:52:53 -04:00
barisusakli
4e71c8328c closes #1346 2014-04-07 17:38:58 -04:00
Barış Soner Uşaklı
962b141e85 Merge pull request #1356 from miksago/fix-pagination-offset-error
Fixed: Category pagination error; Check if first offset is NaN
2014-04-07 17:12:50 -04:00
barisusakli
e5cf44d398 closes #1353
mark all read will mark everything read, can also select topics and mark
them read, can mark specific categories read too
2014-04-07 17:09:59 -04:00
Micheil Smith
47d21eb008 Fixed: Category pagination error; Check if first offset is NaN 2014-04-07 20:41:51 +01:00
psychobunny
e383524334 fixed a problem with cerulean which duped motd and forced you to toggle themes to deactivate 2014-04-07 15:16:11 -04:00
psychobunny
b464099cca finally found reliable repro steps and squashed you like the bug you are. fixed #1280 2014-04-07 14:32:17 -04:00
psychobunny
591fb41c08 removed unused content variable 2014-04-07 12:46:03 -04:00
Julian Lam
b616ba7304 using preventDefault instead of return false 2014-04-06 21:11:31 -04:00
barisusakli
cb692c27e5 removed 0..n from mongo install questions 2014-04-06 16:58:38 -04:00
Julian Lam
bb629c1815 fixing language file for estonian 2014-04-06 16:19:30 -04:00
Julian Lam
a93357168c Adding Estonian language to NodeBB, tänan väga! 2014-04-06 16:15:05 -04:00
Julian Lam
cbd58bd5b9 latest translations 2014-04-06 16:14:57 -04:00
Julian Lam
d74aee97cf Merge branch 'trans-german' of github.com:JonathanMH/NodeBB into JonathanMH-trans-german 2014-04-06 16:06:58 -04:00
Julian Lam
6afd0fd9de added two failing tests for #1331 2014-04-06 15:04:05 -04:00
Jonathan M. Hethey
2bc4de4545 added additional German translations 2014-04-06 13:51:44 +02:00
Julian Lam
14b9c03199 First pass at #1331 - Groups.search() + Tests 2014-04-05 13:01:31 -04:00
Barış Soner Uşaklı
d8a2681e2b Merge pull request #1344 from frissdiegurke/master
Added svg-support for category pictures
2014-04-05 12:45:17 -04:00
frissdiegurke
993b745f1c Added svg-support for category pictures 2014-04-05 12:00:23 +02:00
Julian Lam
320f187829 split reset into themes, plugins, and all -- #1317 2014-04-04 22:47:35 -04:00
barisusakli
57dd44a871 removed console.log 2014-04-04 16:20:13 -04:00
barisusakli
5ddf70a671 closes #1273 2014-04-04 16:18:51 -04:00
barisusakli
3c5dd6a5e7 small tweak to reply with text selected 2014-04-04 15:56:22 -04:00
psychobunny
c352b4c06d imported latest templates.js, fixes #1327 2014-04-04 13:28:51 -04:00
barisusakli
770e0a67c1 send values directly 2014-04-04 13:11:09 -04:00
psychobunny
f235c86a0a closes #1330 2014-04-04 12:59:53 -04:00
barisusakli
04b60f4f99 refactored parse 2014-04-04 12:55:44 -04:00
barisusakli
c1f0d47cd4 closes #1335
looks like copy pasta fail
2014-04-04 12:47:16 -04:00
barisusakli
0cd13b7b66 closes #1273 2014-04-04 12:42:41 -04:00
barisusakli
640686f031 added back paragraph tags 2014-04-04 10:02:00 -04:00
Julian Lam
b9aa0d2121 stripping paragraph tags from post summaries in an effort to collapse it all into one paragraph block. 2014-04-04 09:21:17 -04:00
barisusakli
a7c5a5e819 closes #1334 2014-04-03 18:15:09 -04:00
barisusakli
cc3150ff09 closes #1316 2014-04-03 18:07:31 -04:00
barisusakli
421a25eb56 closes #1288 2014-04-03 17:36:31 -04:00
barisusakli
5de430deb5 add taskbar to body 2014-04-03 17:30:46 -04:00
Julian Lam
b2c663925b Merge branch 'spawn-minifier' 2014-04-03 17:27:42 -04:00
Julian Lam
7a993eb2ca closed #1328 2014-04-03 17:27:26 -04:00
psychobunny
f3eb30b674 fixed automatic updating of home page 2014-04-03 17:16:40 -04:00
barisusakli
ef2221d677 closes #1305 2014-04-03 17:14:25 -04:00
barisusakli
6b7049cdae closes #1333 2014-04-03 16:11:34 -04:00
barisusakli
5209c614fc add taskbar to body 2014-04-03 15:46:47 -04:00
Julian Lam
f3a78c2b6f #1328 - first pass 2014-04-03 15:35:59 -04:00
psychobunny
212768ee86 closes #1325 2014-04-03 14:35:09 -04:00
psychobunny
f16d98fcab linting 2014-04-03 14:33:03 -04:00
psychobunny
3840a9e67e translating the footer... and sending the original 'doh 2014-04-03 14:04:02 -04:00
barisusakli
a316927b2e added user topics page title 2014-04-03 13:43:51 -04:00
barisusakli
3a5048a6cd moved account menu to partial 2014-04-03 13:24:15 -04:00
barisusakli
41d5d16bac show widget title next to type, closes #1313 2014-04-03 13:03:40 -04:00
barisusakli
1edd2649fc this doesnt exist on topics page 2014-04-03 12:43:51 -04:00
barisusakli
4bc3f54468 closes #1318 2014-04-03 12:42:40 -04:00
barisusakli
3f44f4bb3a closes #1319 2014-04-02 16:55:01 -04:00
Julian Lam
4498f6e410 removing less-middleware calls 2014-04-02 14:41:52 -04:00
Julian Lam
27fddb0b48 removing less-middleware 2014-04-02 14:36:42 -04:00
barisusakli
82fabad364 closes #1321 2014-04-02 14:31:26 -04:00
barisusakli
bdefebeea0 reverting some of my code and fixed #1322 properly 2014-04-02 13:58:10 -04:00
Julian Lam
682fa1f874 fixed incorrect scoping for new post event introduced accidentally last commit 2014-04-02 11:13:49 -04:00
Julian Lam
90616c6e7b closed #1322 2014-04-02 11:11:01 -04:00
Julian Lam
77a4c871f6 latest translations and fallbacks 2014-04-02 10:32:17 -04:00
Julian Lam
ef47fc78eb fixed up translation strings, closed #1278 2014-04-02 10:29:42 -04:00
Julian Lam
fa6d6816e4 removing two keys from source language 2014-04-02 10:15:35 -04:00
Julian Lam
e1c9bd7229 updated shrinkwrap file 2014-04-02 09:15:11 -04:00
Julian Lam
eabbc81b40 Merge branch 'master' into v0.4.x 2014-04-02 09:05:46 -04:00
Julian Lam
ec062533a0 updating minvers, removing cerulean from bundled themes 2014-04-02 08:56:13 -04:00
Julian Lam
fdf9deb7aa latest translations and fallbacks 2014-04-02 08:54:10 -04:00
Julian Lam
339d0e5495 flag post translations 2014-04-02 08:18:28 -04:00
Julian Lam
bc29f832fe language keys for password changing -- issue #1278 2014-04-01 21:44:04 -04:00
Julian Lam
1abba25f83 language keys for accountedit.tpl 2014-04-01 21:44:04 -04:00
barisusakli
10f56faf9d admin cleanup
removed unnecessary admin checks in src/admin/user then realized they
are just one liners so moved them to src/socket.io.admin.js moved
categories update to categories folder
2014-04-01 17:12:07 -04:00
Julian Lam
e29aa5abf8 Merge branch 'master' into v0.4.x 2014-04-01 17:00:43 -04:00
barisusakli
ac88b5fc25 fixing user deletion, missing cb 2014-04-01 17:00:24 -04:00
Julian Lam
cde7168f9c adding shrinkwrap file for release 2014-04-01 16:41:06 -04:00
Julian Lam
f12b641d11 whoops, fixing bad db call 2014-04-01 16:37:02 -04:00
Julian Lam
2c1978218c moving the db require to where it is actually needed 2014-04-01 16:35:44 -04:00
Julian Lam
5daf89f263 0.4.0 2014-04-01 16:21:39 -04:00
psychobunny
4693f64bef better layout for global sidebars on mobile 2014-04-01 14:49:30 -04:00
psychobunny
15c2e4d968 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-01 14:00:36 -04:00
psychobunny
488e31df64 added X-Powered-By header for builtwith.com 2014-04-01 14:00:33 -04:00
barisusakli
b5f4503e9f fixed share url 2014-04-01 12:11:45 -04:00
psychobunny
e886e232c5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-01 12:02:54 -04:00
psychobunny
e32adf9477 console.log 2014-04-01 12:02:51 -04:00
barisusakli
99e6223bf0 removed console.log 2014-04-01 12:02:05 -04:00
barisusakli
f185e13175 added check to isReadyToPost, banned and exists 2014-04-01 12:01:16 -04:00
psychobunny
3aa4ae4b99 move deprecated vanilla footer widgets into draft zone 2014-04-01 11:48:15 -04:00
psychobunny
d1495102f2 fixed positioning if no sidebar widget selected 2014-04-01 11:22:03 -04:00
psychobunny
260579b525 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-01 11:19:15 -04:00
psychobunny
b82b5794bc add copyright widget on fresh install 2014-04-01 11:19:12 -04:00
Julian Lam
10fc991a7b Merge branch 'master' of github.com:MrHohenheim/NodeBB into MrHohenheim-master
Conflicts:
	public/language/hu/global.json
	public/language/hu/topic.json
2014-03-31 22:06:44 -04:00
Julian Lam
3ff588415c latest translations 2014-03-31 18:04:29 -04:00
Julian Lam
bb4d4eaec7 added pirate english... yarrr 2014-03-31 18:04:03 -04:00
Pénzes Tamás
d6682048a1 Update topic.json
not finished
2014-03-31 23:36:28 +02:00
Pénzes Tamás
83156701df Update reset_password.json
done
2014-03-31 23:31:09 +02:00
Pénzes Tamás
175da41131 Update pages.json
done
2014-03-31 23:29:24 +02:00
Pénzes Tamás
4a1bd2fe93 Update notifications.json
done
2014-03-31 23:27:41 +02:00
Pénzes Tamás
b23a6fecc3 Update login.json
done
2014-03-31 23:26:27 +02:00
Pénzes Tamás
c199aca4e8 Update global.json
translated some but still not finished
2014-03-31 23:24:50 +02:00
Pénzes Tamás
c4f436283e Update user.json
fixed line 47
2014-03-31 23:15:28 +02:00
psychobunny
5305bc0138 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-31 16:20:00 -04:00
psychobunny
7926514c95 draft zone for widgets, closes #1238 2014-03-31 16:19:57 -04:00
barisusakli
e7a791ab74 removed unused globals from share module 2014-03-31 15:29:29 -04:00
barisusakli
273f499cc2 moved the duplicated sharing code to requirejs module 2014-03-31 15:22:35 -04:00
barisusakli
1d3c25fdcc moved alert to its own requirejs module 2014-03-31 14:49:48 -04:00
barisusakli
b1a6d394e3 moved format number functions to utils 2014-03-31 14:43:48 -04:00
psychobunny
f01cb88c57 deprecated: plugins/fireHook, filter:server.create_routes, filter:admin.create_routes 2014-03-31 13:03:22 -04:00
psychobunny
0f20352fbb closes #1289 2014-03-31 13:00:01 -04:00
psychobunny
924388d96f widgets - only collapse / expand divs that specify a target location 2014-03-31 12:54:27 -04:00
psychobunny
375c2c2ce1 upgrade.js for re-adding copyright footer 2014-03-31 12:42:13 -04:00
psychobunny
576246c315 global widget areas (sidebar/footer) - closes #1097 2014-03-31 12:27:24 -04:00
barisusakli
ed3a1b47bd category changes 2014-03-30 19:17:48 -04:00
Julian Lam
0b6817b9a7 latest translations 2014-03-30 13:34:23 -04:00
Julian Lam
4161f138f3 adding data-dir attribute for languages 2014-03-29 21:43:33 -04:00
Julian Lam
b3e8b1a152 removed language strings for logout page that doesn't exist anymore 2014-03-29 20:48:16 -04:00
barisusakli
35eebbf20a chat message fix 2014-03-29 19:40:53 -04:00
Julian Lam
3f1df52773 settings.get should return empty obj instead of null 2014-03-29 17:58:41 -04:00
Julian Lam
2430b970f3 fixed issue where timeago strings were not rendering in the correct language on cold loads 2014-03-29 17:44:13 -04:00
Julian Lam
4b45a4b168 fixing persian language timeago mapping 2014-03-29 17:33:20 -04:00
psychobunny
0ba7c4891c closes #1295 2014-03-29 17:16:41 -04:00
psychobunny
7678eaf528 fixes #1296 2014-03-29 17:13:33 -04:00
psychobunny
5ce069fdd3 imported latest templates.js 2014-03-29 17:08:23 -04:00
psychobunny
ab20880332 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-29 16:48:24 -04:00
psychobunny
31d8f13f7b closes #1297 2014-03-29 16:48:21 -04:00
barisusakli
70f415446b added watch title language string 2014-03-29 16:05:29 -04:00
barisusakli
500ca33675 changed bootswatch to protocolless 2014-03-29 15:29:39 -04:00
psychobunny
d27eb17b32 fixes #1294 2014-03-29 15:03:14 -04:00
psychobunny
d89c0d698e prevent crash on widget containers 2014-03-29 14:44:51 -04:00
psychobunny
15773f28f2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-29 14:37:47 -04:00
psychobunny
c76a073482 added skins tab; closes #1293 2014-03-29 14:37:44 -04:00
Julian Lam
365c889dbd Latest transations (oh boy, there were a lot), and fallbacks for those that haven't been translated yet. 2014-03-29 14:29:10 -04:00
Julian Lam
bcae47bb1e Welcome to NodeBB, Persian language pack! :D 2014-03-29 14:28:23 -04:00
psychobunny
d89f280c73 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-29 13:18:51 -04:00
psychobunny
7c8d5614c6 update nodebb-widget-essentials to latest; fixes #1292 2014-03-29 13:18:48 -04:00
barisusakli
219c0d75c4 fix for #1290 2014-03-28 21:30:02 -04:00
psychobunny
ed87d40f71 helpers.buildMetaTag 2014-03-28 18:59:10 -04:00
psychobunny
40cc21fad8 closes #1100 2014-03-28 18:30:11 -04:00
psychobunny
baadd0f2ed allow logged in users to access /users page 2014-03-28 17:58:28 -04:00
psychobunny
dab91d6ce9 fixed require.js error 2014-03-28 17:54:27 -04:00
psychobunny
3ae8aa1c55 helpers.js (client/server); closes #1275 2014-03-28 17:49:58 -04:00
psychobunny
eab0ca7463 allow custom themes to include templates that don't exist in the base theme 2014-03-28 17:05:09 -04:00
psychobunny
fb7e0bb7c2 updating vanilla/lavender deps 2014-03-28 16:47:31 -04:00
psychobunny
f913c58925 imported latest templates.js updates 2014-03-28 16:14:18 -04:00
psychobunny
0c8c246be4 simplified widgets 2014-03-28 16:01:33 -04:00
psychobunny
4f04bd82a6 some fixes 2014-03-28 15:35:07 -04:00
psychobunny
4d02600820 fixing some things code climate was qq'ing about 2014-03-28 14:21:34 -04:00
psychobunny
b023ef01af moving widgets and variables code out of ajaxify 2014-03-28 14:18:42 -04:00
psychobunny
0dd7339bec fixed admin/users banning/admin 2014-03-28 14:10:14 -04:00
psychobunny
1b206a6ae8 ajaxify cleanup 2014-03-28 14:06:34 -04:00
psychobunny
67b1dd546c Merge remote-tracking branch 'origin/master' into templates.js-merge 2014-03-28 13:58:18 -04:00
psychobunny
dbb75f181d more cleanup 2014-03-28 13:54:20 -04:00
psychobunny
e4f136c208 cleanup 2014-03-28 13:34:20 -04:00
psychobunny
2ae0b3905d forgot to remove error first from templates.js 2014-03-28 13:32:10 -04:00
psychobunny
7e11d29f06 got rid of all templates.prepare; pull blocks using templates.getBlock instead of parsing twice 2014-03-28 13:29:51 -04:00
psychobunny
339eafd6be updating templates.parseTemplateVariables to ajaxify.variables.parse 2014-03-28 13:02:36 -04:00
psychobunny
7217954078 updating all templates.get to ajaxify.variables.get 2014-03-28 13:02:13 -04:00
psychobunny
113eb38f9a moving ajaxify-related things out of templates and into ajaxify 2014-03-28 13:01:43 -04:00
psychobunny
608a1ce6d0 https://github.com/psychobunny/templates.js 2014-03-28 13:01:24 -04:00
barisusakli
3a69a191ff closes #1285 2014-03-28 12:13:06 -04:00
Julian Lam
131b71f361 language: fr 2014-03-28 10:51:41 -04:00
barisusakli
fdf0076f37 decrease user count when user is deleted 2014-03-27 19:59:44 -04:00
Julian Lam
1eab829dec Merge pull request #1255 from theon/absolute-path-config
Allow absolute config paths
2014-03-27 13:10:29 -04:00
barisusakli
0e5c65199d simpler static 2014-03-27 12:59:27 -04:00
barisusakli
824d849a52 removed req 2014-03-27 03:12:23 -04:00
barisusakli
a3842d2c61 removed similar code 2014-03-26 23:29:50 -04:00
barisusakli
e5a5b8e8bf added privateUserInfo and isLoggedIn for #1275 2014-03-26 11:57:46 -04:00
Julian Lam
be45ad163a properly fixed #1274 2014-03-26 11:43:42 -04:00
Julian Lam
585eb9e1be fixed #1274 2014-03-26 11:39:27 -04:00
barisusakli
4f88e9cf2c shortened the user postcount update code 2014-03-26 11:15:27 -04:00
barisusakli
d6ad100ed5 not used anymore 2014-03-25 14:50:08 -04:00
barisusakli
68db8c04f7 added missing radix 2014-03-25 14:18:24 -04:00
barisusakli
5fe5e3d893 topics.js refactor 2014-03-25 14:17:00 -04:00
barisusakli
2507d6c853 display_moderator_tools is already returned
when new posts were loaded, we were making a socket call for each post
to check if the post is editable, but this data is already returned in
display_moderator_tools when posts are loaded.
2014-03-25 13:52:25 -04:00
barisusakli
e4fbb31e68 some cleanup 2014-03-25 13:24:51 -04:00
barisusakli
61ae01543c fixed to use postsPerPage 2014-03-25 12:47:15 -04:00
barisusakli
a400e5de81 #1269 2014-03-25 12:23:55 -04:00
barisusakli
e8265efc20 closes #1271 2014-03-25 12:10:42 -04:00
barisusakli
038a833125 check to see if there are topics 2014-03-24 21:53:14 -04:00
barisusakli
3493be4ef0 closes #1268 2014-03-24 21:05:02 -04:00
barisusakli
6fc3103aef topic og:image changes 2014-03-24 20:43:29 -04:00
Julian Lam
fc1cb76444 fixed #1266 2014-03-24 20:24:22 -04:00
barisusakli
abc7fd54f3 added class to chat messages 2014-03-24 20:12:03 -04:00
barisusakli
48ed540801 closed #1267 2014-03-24 19:57:25 -04:00
barisusakli
22ba104930 chat style 2014-03-24 18:18:00 -04:00
Julian Lam
31606578f5 putting cache buster back in header template arguments 2014-03-24 18:09:49 -04:00
Julian Lam
1487545fd2 fixing issue where cold loads were calling client-side event action:ajaxify.end with the wrong "url" 2014-03-24 16:22:10 -04:00
barisusakli
0c744a947e chat will use timeago 2014-03-24 15:58:02 -04:00
Julian Lam
17dd113a94 fixed issue where plugin css and js wasn't loaded -- also less files no longer blow up 2014-03-24 15:35:58 -04:00
Julian Lam
c2f6717e88 adding cache-buster to template globals 2014-03-24 14:36:20 -04:00
Julian Lam
8c7b474e8b moved fontawesome CSS into stylesheet.css, and updating the js and css middlewares to compile at app start, not on first load 2014-03-24 14:36:20 -04:00
barisusakli
980cf2ccf9 closes #1184 2014-03-24 14:30:11 -04:00
barisusakli
1664d179b9 closes #1245 2014-03-24 13:45:31 -04:00
Julian Lam
0ef2be61b1 translations 2014-03-24 11:42:48 -04:00
Julian Lam
6fb69e6c19 removing error output for incorrect pw on login 2014-03-24 11:07:39 -04:00
Barış Soner Uşaklı
9f5893bc83 Update delete.js 2014-03-23 23:34:04 -04:00
barisusakli
642b9e4d69 fixed extra space in new if there is no username 2014-03-23 19:00:08 -04:00
barisusakli
0741b162cb #1265 2014-03-23 18:53:21 -04:00
barisusakli
f247c2195e fixed user picture in og:image 2014-03-23 17:17:56 -04:00
barisusakli
94a589e0e4 #1190 2014-03-23 16:57:04 -04:00
barisusakli
bcc464a196 fixed reverse loading of topics
data.after can be zero which was causing a invalid data error
2014-03-23 15:05:04 -04:00
barisusakli
a3404d3d4f closes #1253 2014-03-23 14:25:16 -04:00
barisusakli
36dc086470 no need to get signature and custom profile info 2014-03-22 21:04:53 -04:00
Julian Lam
fdc6b004c5 closed #1260, closed #1261 2014-03-22 09:51:29 -04:00
barisusakli
04e0c58b84 fixes realtime update of home 2014-03-21 22:16:30 -04:00
Barış Soner Uşaklı
4e10ee473c Merge pull request #1257 from theon/fix-syntax-error
Fix syntax error
2014-03-21 20:51:38 -04:00
Ian Forsey
28f186d4a7 Fix syntax error 2014-03-22 00:46:11 +00:00
barisusakli
1f2d5abbb7 possible fix for #1256 2014-03-21 20:37:53 -04:00
Ian Forsey
6ca5a42936 Allow absolute config paths 2014-03-21 23:07:05 +00:00
barisusakli
2b2e83992e changed messages 2014-03-21 18:44:14 -04:00
barisusakli
0cfd05d839 closes #1254 2014-03-21 18:36:06 -04:00
barisusakli
d6223406e9 added space between uploading and number 2014-03-21 18:23:59 -04:00
barisusakli
ca0dbf84be no need for exists check
if topic doesnt exist topicData will be null
2014-03-21 18:20:06 -04:00
barisusakli
a695c6134b added missing meta 2014-03-21 17:59:46 -04:00
barisusakli
db3632557e moved notification push out of markAsRead 2014-03-21 17:48:32 -04:00
barisusakli
7a1037dc11 moved posts and recent to new files 2014-03-21 17:04:15 -04:00
barisusakli
38733ef94b moved reply post create to topics/create.js 2014-03-21 15:55:03 -04:00
barisusakli
478429af3a moved fork to new file 2014-03-21 15:47:46 -04:00
barisusakli
bac3cf03cb moved unread to new file 2014-03-21 15:40:37 -04:00
barisusakli
ec63ba4b17 removed unused method 2014-03-21 15:04:10 -04:00
barisusakli
8b6f701246 removd dupe 2014-03-21 14:57:38 -04:00
barisusakli
b470a9b264 fixes jumping to top on vote 2014-03-21 14:00:13 -04:00
barisusakli
7f193041a8 removed admin topics 2014-03-21 13:24:31 -04:00
Julian Lam
8abaa812ec fixing client-side script for groups page in ACP 2014-03-21 13:20:13 -04:00
barisusakli
880c393b6d fixed admin groups page
changed gid to groupName
2014-03-21 12:52:35 -04:00
Julian Lam
6f78d29498 upgrade script should not delete non-hidden groups 2014-03-21 12:14:58 -04:00
Julian Lam
1e3b9b7cf6 removing console logs 2014-03-21 12:11:34 -04:00
Julian Lam
d33253bc3a Merge remote-tracking branch 'origin/master' 2014-03-21 12:06:19 -04:00
Julian Lam
96d58288c9 tweaking upgrade script so it works with a real db 2014-03-21 11:29:00 -04:00
Julian Lam
4701eb1cee updating groups so that members leave a group when it is deleted 2014-03-21 09:27:13 -04:00
Julian Lam
ce867aec53 updated upgrade script date 2014-03-21 09:18:33 -04:00
Julian Lam
4206c17da3 rounding out tests for groups 2014-03-21 09:05:29 -04:00
Julian Lam
1dcac09e53 OMG TESTS #1252 2014-03-20 20:49:57 -04:00
Julian Lam
0e44eb8629 final refactoring pass for groups -- #1252 2014-03-20 16:26:00 -04:00
barisusakli
26d67257fe moved privilege check out of getRecentReplies
it was being called twice in api/home
2014-03-20 14:58:45 -04:00
barisusakli
ef0740049a dont return everything in followers, #1250 2014-03-20 14:28:37 -04:00
barisusakli
b2a837d283 getPostSummary change 2014-03-20 13:18:12 -04:00
barisusakli
301008b9cb missed this one 2014-03-20 12:49:31 -04:00
Julian Lam
7b4f596aba updating all group lib methods, and their callers -- #1252 2014-03-20 09:13:09 -04:00
barisusakli
c7c3bc1c8e no need to create empty array 2014-03-19 21:40:26 -04:00
barisusakli
fa98da6978 related to #1250 2014-03-19 21:32:13 -04:00
Julian Lam
befaa56ad0 derp derp derp more refactoring of groups 2014-03-19 20:40:34 -04:00
Julian Lam
c893effcb9 WIP commit -- groups refactoring + upgrade scripts 2014-03-19 20:33:39 -04:00
barisusakli
2f8ecc00d8 closes #1250 2014-03-19 18:31:19 -04:00
Julian Lam
d6b6e39f2a Sardinian (sc) and Thai (th) 2014-03-19 16:18:16 -04:00
Julian Lam
85a5c123af minor tweak to winston logging for user jobs 2014-03-19 16:11:20 -04:00
barisusakli
c070808209 store postcontainer 2014-03-19 15:56:22 -04:00
barisusakli
cabc3e5e3d more cleanup 2014-03-19 15:47:53 -04:00
barisusakli
9b63facf6f more postTools refactor 2014-03-19 15:26:38 -04:00
barisusakli
9dd0f3c9b9 some more 2014-03-19 15:04:56 -04:00
barisusakli
363e7c23bd postTools cleanup 2014-03-19 14:53:31 -04:00
barisusakli
8ffaecaa4c fixed paginator on entry, moved out postTools to a new file 2014-03-19 14:29:59 -04:00
psychobunny
3bd93a40fc closes #1235 2014-03-19 14:05:48 -04:00
Julian Lam
c709b7ed5b Merge remote-tracking branch 'origin/master' 2014-03-19 10:28:40 -04:00
Julian Lam
4239c376c8 truncating user list in Groups ACP page, resolved #1132. Refactored system groups handling 2014-03-19 10:27:02 -04:00
Julian Lam
3c5fc72e20 adding "system" flag to system groups 2014-03-19 09:28:18 -04:00
barisusakli
567d867b1e fixed require to missing public config.json 2014-03-19 02:07:18 -04:00
Julian Lam
ab5ec68f2f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-18 20:22:02 -04:00
Julian Lam
da1a1d5930 adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login) 2014-03-18 20:21:47 -04:00
barisusakli
e86eb8667e threadTools jshint 2014-03-18 20:03:56 -04:00
barisusakli
f61ca4327d fixed profile 2014-03-18 18:51:08 -04:00
Julian Lam
cc0fabc619 removing console logs from upgrade script 2014-03-18 18:31:38 -04:00
barisusakli
7d382b2900 closes #1243 2014-03-18 18:15:07 -04:00
barisusakli
d2af4a6b69 user images wont be responsive in widgets 2014-03-18 18:06:00 -04:00
barisusakli
0f66e80a5a added setting to disable notification sounds 2014-03-18 17:01:41 -04:00
Julian Lam
36e949acea Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-18 16:53:40 -04:00
Julian Lam
3308da64cb updating language strings for it and nb 2014-03-18 16:53:27 -04:00
barisusakli
45f0021503 moved follow to thread tools 2014-03-18 16:46:07 -04:00
Julian Lam
98745ae0c4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-18 15:38:06 -04:00
Julian Lam
2b8a7c73ac daily digest emails! resolved #326 2014-03-18 15:37:17 -04:00
barisusakli
64676b66c8 removed unused validator require 2014-03-18 14:28:45 -04:00
barisusakli
6774f0f52f fit image to 128x128 and keep aspect ratio, closes #1240 2014-03-18 14:27:00 -04:00
barisusakli
6a4dd5cc05 closes #1160 2014-03-18 14:11:26 -04:00
barisusakli
e11efad0b7 added getSortedSetRangeByScore 2014-03-18 13:25:09 -04:00
Julian Lam
2badb76fc2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-18 11:44:56 -04:00
Julian Lam
61afee98c3 updates to new settings mechanism, updating markdown minver, minor linting for upgrades.js, and upgrade stmt for markdown migration 2014-03-18 11:44:22 -04:00
barisusakli
e67e9aee42 moved user creation to new file 2014-03-17 21:47:37 -04:00
barisusakli
3f23821580 moved topic moving and thread tools out of topic.js 2014-03-17 21:23:30 -04:00
barisusakli
f83b7ee972 renamed event 2014-03-17 17:38:47 -04:00
barisusakli
8efc33d6a1 closes #976 2014-03-17 17:27:47 -04:00
psychobunny
ef97f627f4 closes #1237 2014-03-17 17:25:22 -04:00
Julian Lam
39b22058b7 tilde, not nothing. 2014-03-17 17:07:43 -04:00
Julian Lam
3cb2ac166b Merge branch 'patch-1' of github.com:JohnMcLear/NodeBB into JohnMcLear-patch-1 2014-03-17 17:07:16 -04:00
psychobunny
af997061aa Merge pull request #1185 from gusnips/patch-1
accept arguments on setup
2014-03-17 16:37:25 -04:00
barisusakli
10d8eed7b9 closes #1229 2014-03-17 16:28:00 -04:00
psychobunny
f0a19b06c2 launch aesthetics 2014-03-17 16:22:03 -04:00
psychobunny
c6a89b504f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-17 16:09:22 -04:00
psychobunny
6262312747 closes #1153 2014-03-17 16:09:20 -04:00
Julian Lam
012480c2e1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-17 15:48:47 -04:00
Julian Lam
43e0c726fa relaxed isClientScript regex, fixed #1198 2014-03-17 15:48:34 -04:00
barisusakli
e49d445422 added err checking 2014-03-17 15:46:53 -04:00
psychobunny
da7d6a3137 closes #1175 2014-03-17 15:38:06 -04:00
psychobunny
11dddc9c6f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-17 15:15:18 -04:00
psychobunny
653007b72e closes #1231 2014-03-17 15:15:16 -04:00
barisusakli
76d8f19e73 forgot to return #963 2014-03-17 14:56:32 -04:00
barisusakli
cd4a204f99 closes #963 2014-03-17 14:56:05 -04:00
psychobunny
99108c750a don't refresh widgets on every new post 2014-03-17 14:45:08 -04:00
psychobunny
197b34461f potentially fixes #1228 2014-03-17 14:18:58 -04:00
psychobunny
e60b2f7716 closes #1174 2014-03-17 13:38:32 -04:00
psychobunny
1804373322 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-17 13:23:08 -04:00
psychobunny
0627734fc0 trim leading whitespace/#/? in search closes #1195 2014-03-17 13:23:05 -04:00
Julian Lam
d30acee9d3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-17 13:20:29 -04:00
Julian Lam
0459e242fc resolved #1223 2014-03-17 13:20:07 -04:00
psychobunny
6e64712fd3 fixed bug in api/search causing it to crash if term is not passed in via ajaxify, see #1195 2014-03-17 13:18:43 -04:00
psychobunny
941c3b2d7e added emitter class; express.listen only after background tasks complete; closes #1227 2014-03-17 12:53:31 -04:00
Julian Lam
16f1db4f5d fireEvent reflection socket call, tweaks to Sounds page in ACP 2014-03-17 11:36:30 -04:00
Julian Lam
14a0b45ae8 securing settings.save socket listeners behind admin namespace 2014-03-17 10:48:30 -04:00
Julian Lam
c1ccc81400 ACP integration for Sounds 2014-03-17 10:37:11 -04:00
Julian Lam
eeb3bdc7f7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-17 08:54:47 -04:00
barisusakli
4cadd8da7a missing radix 2014-03-16 14:29:51 -04:00
barisusakli
367a9aa022 composer jshint 2014-03-16 14:17:43 -04:00
John McLear
ecd3f15381 Use specified Less version
Fixed https://github.com/designcreateplay/NodeBB/issues/1219
2014-03-16 18:13:54 +00:00
Julian Lam
17903adace Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-16 14:13:27 -04:00
barisusakli
b4af4c72cc alertSuccess can take language strings 2014-03-15 18:05:59 -04:00
barisusakli
da8c2896d7 moved to showForkModal 2014-03-15 17:56:21 -04:00
barisusakli
38d4fd1a59 took out forking to its own file 2014-03-15 17:50:19 -04:00
barisusakli
46a475fdde controllers/admin/users cleanup 2014-03-15 16:28:57 -04:00
barisusakli
ea4931fa1d removed dupe from controllers/user.js 2014-03-15 16:18:03 -04:00
barisusakli
19c2a85bf1 logger jshint 2014-03-15 16:08:31 -04:00
barisusakli
37e8856861 new middleware to add slug to topic and category 2014-03-15 15:29:56 -04:00
barisusakli
1eafc6ba3d moved user delete to its own file, closes #746 2014-03-15 15:09:54 -04:00
Julian Lam
f942c03a58 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-15 14:39:16 -04:00
barisusakli
611c16b5a6 closes #1126 2014-03-15 00:26:09 -04:00
Barış Soner Uşaklı
d233e7927d added tablet screenshot 2014-03-14 20:56:06 -04:00
barisusakli
7873b90caf missing ; 2014-03-14 20:06:46 -04:00
barisusakli
3d6cce44c7 dont display chats with deleted users 2014-03-14 19:34:05 -04:00
barisusakli
42f42adfaf clean up, radix 2014-03-14 19:22:56 -04:00
barisusakli
1354739d19 user deletion #746
user deletion NOT SKALABLE
2014-03-14 19:07:50 -04:00
Julian Lam
0ea14324ac adding missing files 2014-03-14 00:35:36 -04:00
Julian Lam
ebe61450a1 WIP - settings.prepare refactoring... because. 2014-03-14 00:34:51 -04:00
Julian Lam
6d03f713c5 "Sounds" tab in Settings page... WIP, needs fixing. 2014-03-13 23:43:36 -04:00
barisusakli
a0e784a612 closes #1138 2014-03-13 20:24:04 -04:00
barisusakli
6011399063 removed comment 2014-03-13 18:50:57 -04:00
barisusakli
d2bef79888 closes #1194 2014-03-13 18:11:41 -04:00
Julian Lam
97a64122b4 updates to language files 2014-03-13 17:39:00 -04:00
Julian Lam
66fd13be97 Merge branch 'master' of github.com:qk168899/NodeBB into qk168899-master 2014-03-13 17:35:17 -04:00
sam
9c3c536ae8 fine tune zh-TW 2014-03-14 05:21:16 +08:00
barisusakli
ccc717b339 account posts jshint 2014-03-13 17:19:28 -04:00
Julian Lam
401bd02748 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-13 17:15:24 -04:00
Julian Lam
553cabdcfa refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209 2014-03-13 17:15:09 -04:00
barisusakli
bddc270033 changed addUserInfoToPost to add a user object 2014-03-13 16:41:45 -04:00
barisusakli
e0911c1fff replaced exists check with getCategoryData 2014-03-13 16:21:16 -04:00
psychobunny
9223865c80 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-13 15:46:22 -04:00
psychobunny
9de21995c4 added category bgColor and color to topics api 2014-03-13 15:46:19 -04:00
barisusakli
9685cb7fe0 removed broken post update 2014-03-13 15:23:02 -04:00
barisusakli
161c7f1875 closes #1201 2014-03-13 15:13:47 -04:00
barisusakli
175230e337 closes #1205 2014-03-13 14:08:58 -04:00
barisusakli
2bb5918b6c closes #1208 2014-03-13 13:49:22 -04:00
psychobunny
e3df487173 cleanup 2014-03-13 02:06:59 -04:00
psychobunny
79bacfe164 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-13 00:52:12 -04:00
psychobunny
6563a72b5b fixed emailer templates 2014-03-13 00:49:32 -04:00
barisusakli
7668b95c66 register.js cleanup 2014-03-12 23:18:54 -04:00
barisusakli
d8e00f95a2 moved user search to its own file 2014-03-12 22:11:48 -04:00
barisusakli
383b68e7fc user js refactor 2014-03-12 21:57:25 -04:00
barisusakli
cc0ac29b36 categories refactor 2014-03-12 21:41:53 -04:00
barisusakli
970639274e fixes image uploads
if images had special regex characters in them upload text was failing
2014-03-12 21:18:39 -04:00
barisusakli
90e398e5c9 user js refactor, category fix
if a category that didn't exist was request with category/1231 or
api/category/1231 it was crashing.
2014-03-12 20:53:48 -04:00
Julian Lam
67ef155c60 fixing image uploads 2014-03-12 20:03:20 -04:00
psychobunny
b2986f2a4e removing use strict from forum/topic.js until its refactored properly 2014-03-12 18:32:40 -04:00
psychobunny
bdfe12f365 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 18:30:17 -04:00
psychobunny
35ac0bb793 linted app.js 2014-03-12 18:30:13 -04:00
psychobunny
dd7433bab6 fixed active users icon in thread 2014-03-12 18:30:06 -04:00
barisusakli
3f5c51174d refactored user.js
took out notifications, email and reset code to separate files
2014-03-12 18:00:33 -04:00
psychobunny
f47f146320 moved out uploads and users from controllers/admin into their own files 2014-03-12 17:59:29 -04:00
psychobunny
641ec3ef82 moved duplicate upload validation code into its own fn 2014-03-12 17:46:03 -04:00
psychobunny
0bbff06cfa use middleware.authenticate instead of checking in each fn 2014-03-12 17:39:10 -04:00
psychobunny
01cda60704 moved admin upload functions into controllers/admin; re-organized routes/admin to look like routes/index; removed unused deps 2014-03-12 17:34:59 -04:00
psychobunny
01077cb35b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 17:11:20 -04:00
psychobunny
0d625761be fixing bug introduced @ da0355ef79 (multiple widget areas defined = explosion) 2014-03-12 17:11:13 -04:00
barisusakli
0f19578523 removed dupe body 2014-03-12 17:08:06 -04:00
psychobunny
bdc7a19bd7 don't attempt to parse a non-existing widget area 2014-03-12 16:51:59 -04:00
psychobunny
58fe16e15c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:31:29 -04:00
psychobunny
7fc2e627c5 linting templates.js; got rid of some unused server-side code 2014-03-12 16:31:26 -04:00
Julian Lam
e611a8174e linting setting.js again and abstracting out saveField 2014-03-12 16:21:19 -04:00
psychobunny
0a293be823 linting categories.js and footer.js 2014-03-12 16:18:48 -04:00
psychobunny
d183e58771 linting admin/groups 2014-03-12 16:17:00 -04:00
psychobunny
6ea760d636 linting admin/index; admin/languages 2014-03-12 16:15:39 -04:00
psychobunny
2d65a746e4 linting admin/settings 2014-03-12 16:14:18 -04:00
psychobunny
81de895c0e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:12:27 -04:00
psychobunny
b515995432 removed unnecessary switch case 2014-03-12 16:12:23 -04:00
Julian Lam
4da1a2da97 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 16:11:49 -04:00
Julian Lam
1e0ec5dd47 appending relative path to user images for subfolder installs 2014-03-12 16:11:33 -04:00
psychobunny
8e4c23149c more re-organization of routes/index.js 2014-03-12 16:07:54 -04:00
psychobunny
e9fb2f4135 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 16:02:03 -04:00
psychobunny
44a91fe9ea linting admin/themes 2014-03-12 16:01:58 -04:00
barisusakli
2220483915 notifications 2014-03-12 15:59:02 -04:00
Julian Lam
5647354421 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 15:51:49 -04:00
Julian Lam
ca2e9d7d9e linting and moving xregexp back to .js 2014-03-12 15:51:24 -04:00
psychobunny
bff722925f Merge pull request #1206 from BitBangersCode/plugin-templates-fix
Fix importing of templates served by plugins
2014-03-12 15:46:53 -04:00
MrWaffle
c1a580c51d Fix importing of templates served by plugins 2014-03-12 20:45:07 +01:00
Julian Lam
738ada9b16 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 15:41:26 -04:00
Julian Lam
816d9e5d12 minifying xregext lib 2014-03-12 15:41:21 -04:00
psychobunny
fdb9b889ec Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-12 15:20:23 -04:00
psychobunny
fb1ddc3d9b minifying colorpicker.js 2014-03-12 15:20:20 -04:00
Julian Lam
b525d95915 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 15:18:22 -04:00
Julian Lam
6aa8df1d24 removed unminified buzz library, keeping minified version 2014-03-12 15:18:16 -04:00
psychobunny
da0355ef79 remove async dep for widgets (30kb was overkill for one use of async.each); linting 2014-03-12 15:05:07 -04:00
Julian Lam
dc99701d42 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 14:09:11 -04:00
Julian Lam
2826381b20 draft saving in composer -- resolved #1197 2014-03-12 14:08:55 -04:00
barisusakli
7b409c095c mongo callback refactor 2014-03-12 13:38:25 -04:00
barisusakli
4f72513f19 removed keys 2014-03-12 12:46:34 -04:00
Julian Lam
da0793c011 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 11:41:55 -04:00
Julian Lam
da05330ded updated cron dependency to require v0.1.4 at least, due to fixes upstream
re-enabling notifications pruning
2014-03-12 11:41:41 -04:00
barisusakli
6eff7d4c51 mongo cleanup 2014-03-12 02:04:31 -04:00
barisusakli
c320051a1e chat jshint 2014-03-12 01:40:35 -04:00
Julian Lam
e757183cec linting 2014-03-12 01:29:24 -04:00
Julian Lam
89ba0840e6 minor reordering of jslint comment 2014-03-12 01:23:35 -04:00
Julian Lam
0668556d4f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-12 01:23:20 -04:00
Julian Lam
c000a8c5ba linting 2014-03-12 01:23:11 -04:00
barisusakli
a0222b69bb closes #1200 2014-03-12 00:45:15 -04:00
barisusakli
e9ab9dcce2 search cleanup 2014-03-12 00:13:42 -04:00
barisusakli
33e34ca864 change getRecentPosts to take count 2014-03-11 23:31:28 -04:00
Julian Lam
caa9c17bc2 fixed login routes on subfolder installs 2014-03-11 23:26:33 -04:00
Julian Lam
5e5c6014ac updated vanilla minver 2014-03-11 23:20:35 -04:00
Julian Lam
9bf1d345e2 adding relative path to a category image for subfolder installs 2014-03-11 23:19:48 -04:00
barisusakli
67f1251ba3 pagination cleanup 2014-03-11 22:54:17 -04:00
barisusakli
3f12e51045 removed relative path from upload_url 2014-03-11 22:34:27 -04:00
barisusakli
6e6c5688d9 more cleanup 2014-03-11 22:31:09 -04:00
barisusakli
2befa06a33 some cleanup to socket posts 2014-03-11 21:52:22 -04:00
barisusakli
92267de9d8 feeds 2014-03-11 20:48:06 -04:00
Julian Lam
313c51cfb1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 20:14:53 -04:00
Julian Lam
392075eb27 fixing theme previews in subfolder installs 2014-03-11 20:14:45 -04:00
barisusakli
3a42200e24 refactored feeds 2014-03-11 20:10:09 -04:00
Julian Lam
bf8f91f0d9 'less bad' handling of background image in home.tpl 2014-03-11 20:08:52 -04:00
Julian Lam
82a3415ab1 fixing admin routes on subfolder installs 2014-03-11 19:46:33 -04:00
Julian Lam
f28c690f2f fixing up robots.txt 2014-03-11 19:44:48 -04:00
Julian Lam
08b2106e0f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 19:42:18 -04:00
Julian Lam
7111adb3c2 fixed subfolder installs again (a bit), also stopped apple-touch-icon from clobbering /apple-touch-icon 2014-03-11 19:41:58 -04:00
barisusakli
d4556d4da3 added minifed js files
replace jquery form and timeago with minified versions
2014-03-11 19:31:30 -04:00
Julian Lam
a500899fdf removing unused bootstrap js file 2014-03-11 19:13:18 -04:00
Julian Lam
4343f240d0 moving async back to proper vendor folder 2014-03-11 18:51:59 -04:00
Julian Lam
2f1707e772 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 18:48:57 -04:00
barisusakli
813b3d6fcc changes for live streaming of posts 2014-03-11 18:46:27 -04:00
psychobunny
1e9850b6b9 vendor* 2014-03-11 18:38:23 -04:00
psychobunny
df29410c08 moving async back to require.js modules/vendor folder 2014-03-11 18:37:16 -04:00
psychobunny
5dc5eb41df fixed ajaxify bug introduced in last commit 2014-03-11 18:33:19 -04:00
psychobunny
e451a145dd Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-11 18:10:11 -04:00
psychobunny
c8bf617f4b allow plugins to override any route (except for admin routes) 2014-03-11 18:09:56 -04:00
Julian Lam
3dc4fd9fd9 added sounds for incoming and outgoing chat, and new notification 2014-03-11 17:47:13 -04:00
Julian Lam
4cb9f34253 adding buzz and sound assets 2014-03-11 17:10:49 -04:00
Julian Lam
f65a7f96ff moving async to proper vendor folder 2014-03-11 16:32:28 -04:00
Julian Lam
cb304d7d54 fixed #1188 2014-03-11 15:56:04 -04:00
Julian Lam
41116bc0b2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 15:51:29 -04:00
Julian Lam
4bb6d89e83 fixed #1172 2014-03-11 15:51:25 -04:00
Julian Lam
b259c3d422 categoryData should return better topics (non-anon uid passed in now) 2014-03-11 15:48:29 -04:00
Julian Lam
82a82afe99 updated the way privileges were handled in the .get() category controller 2014-03-11 15:32:32 -04:00
barisusakli
350070339b added home room emit 2014-03-11 15:18:14 -04:00
barisusakli
a5f4135c62 added socket listeners to home 2014-03-11 15:15:54 -04:00
psychobunny
5abc96399e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-11 14:48:38 -04:00
psychobunny
5f7f5a37c1 linting 2014-03-11 14:48:35 -04:00
barisusakli
76037a5f14 closes #1191
added a new method called isSetMembers takes in an array of values to
test if they are members of a set
2014-03-11 14:43:42 -04:00
psychobunny
29ad8d2582 closes #1192 2014-03-11 14:41:32 -04:00
Julian Lam
21d28b0f58 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-11 11:26:22 -04:00
Julian Lam
de6f58842b fixed issue where events page would error out if log was not already created. 2014-03-11 11:26:06 -04:00
barisusakli
88c4b90fc8 accounts controller removed duplication 2014-03-11 04:33:08 -04:00
barisusakli
037e8943a8 removed left over 2014-03-11 04:10:39 -04:00
barisusakli
9564b6fda2 closes #1165 2014-03-11 04:10:00 -04:00
barisusakli
3d68c7c6b6 added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js 2014-03-11 03:39:41 -04:00
Julian Lam
8873963946 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-10 21:55:57 -04:00
Julian Lam
88b4516ef8 added compiled templates to gitignore 2014-03-10 21:55:32 -04:00
Julian Lam
ffa42ffea3 moving pluginRoutes to top of route stack (like others), put app.load hook behind plugins' ready callback 2014-03-10 21:54:30 -04:00
barisusakli
c41ef10572 removed routes/user.js 2014-03-10 20:35:55 -04:00
barisusakli
661dff2f9b added jquery css 2014-03-10 20:19:27 -04:00
barisusakli
326eddf39e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-10 19:00:30 -04:00
barisusakli
4e3819603b jshint fixed missing var 2014-03-10 19:00:23 -04:00
Barış Soner Uşaklı
900c0d838d Update README.md 2014-03-10 18:56:17 -04:00
barisusakli
e83ad1ab4a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-10 18:28:42 -04:00
barisusakli
974333dbc3 fixed missing currentPage 2014-03-10 18:28:34 -04:00
Julian Lam
efb933f102 backwards-compatibility for plugins if they return a callback 2014-03-10 17:32:50 -04:00
Julian Lam
19c9f1bb19 backwards compatibility with plugins that are assuming no callback 2014-03-10 16:58:16 -04:00
Julian Lam
a7f310b49a fixed #1189 2014-03-10 15:31:47 -04:00
psychobunny
65b49d5de8 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-10 14:41:35 -04:00
psychobunny
116dad2858 updated widget-essentials dep to 0.0.11 2014-03-10 14:41:32 -04:00
barisusakli
656ec227e9 merge 2014-03-10 14:39:40 -04:00
barisusakli
78f9c25c9c added autocomplete to jquery fixed search results 2014-03-10 14:36:29 -04:00
psychobunny
337b3a2aa7 updated nodebb dependencies 2014-03-10 14:34:52 -04:00
psychobunny
d61a75a5c2 updated deprecation notices 2014-03-10 01:30:29 -04:00
psychobunny
2cde4508b0 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-10 01:28:13 -04:00
psychobunny
23983c4c80 cleanup - search routes 2014-03-10 01:07:37 -04:00
barisusakli
71f84655ca minor cleanup 2014-03-10 00:17:06 -04:00
barisusakli
b413f06b72 removed unused function from groups, jshint 2014-03-09 23:51:09 -04:00
psychobunny
a68ba044c3 fixed missing topic_name and viewcount when reverse infinite scrolling 2014-03-09 23:48:22 -04:00
psychobunny
30cfddda68 fix for topics view count, and marking topics as unread 2014-03-09 23:20:59 -04:00
barisusakli
16d2e65ea0 optimized getCategories 2014-03-09 23:09:08 -04:00
psychobunny
857df86726 fixed pagination, and loading of template blocks on cold load (temp solution) 2014-03-09 22:35:09 -04:00
psychobunny
6ea4d89edc fixed search routes 2014-03-09 21:43:35 -04:00
psychobunny
875c8ed66c console.log 2014-03-09 21:21:57 -04:00
psychobunny
62afe65ccf bugfix + deprecated templates.getTemplateNameFromUrl 2014-03-09 21:05:01 -04:00
psychobunny
712c382a28 optimizing ajaxify (still needs work though) 2014-03-09 20:48:15 -04:00
psychobunny
4e54d500c0 fix bug where inactive plugin templates were being compiled as well 2014-03-09 20:45:37 -04:00
psychobunny
4793b6b4f9 fixed invalid path for apple-touch-icon 2014-03-09 20:08:51 -04:00
psychobunny
a99be8e7be got rid of all the res.locals.isAPI checks in all controller methods. now 1000% cleaner :shipit: 2014-03-09 20:05:14 -04:00
psychobunny
faf3de7e27 added a check for res.locals.isAPI inside res.render, instead of doing it all over the place in code 2014-03-09 19:54:16 -04:00
psychobunny
1b3f089804 fixed /admin/index 404 2014-03-09 19:47:39 -04:00
psychobunny
6acdc66470 fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch) 2014-03-09 19:47:33 -04:00
psychobunny
464c2f42c3 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
2014-03-09 19:19:13 -04:00
psychobunny
37840d35f0 missing variable - numCSS 2014-03-09 19:15:18 -04:00
psychobunny
68b41083ad removing re-added templates from core 2014-03-09 19:14:50 -04:00
Gustavo Salomé Silva
475ac1e772 accept arguments on setup
useful if you want to setup a new instance programatically
2014-03-09 19:07:28 -03:00
barisusakli
73c89010cb closes #1182 2014-03-09 17:29:05 -04:00
barisusakli
57f9f8bc57 closes #1176 2014-03-09 16:39:31 -04:00
psychobunny
1ef95bd09e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js
2014-03-09 16:07:34 -04:00
barisusakli
281c482f1c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-09 14:02:33 -04:00
barisusakli
6496b91c29 closes #1180 2014-03-09 14:02:30 -04:00
Julian Lam
4309fe3192 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-09 00:47:25 -05:00
Julian Lam
820cdf8a47 temporarily removing cronjob until upstream bugs are fixed -- resolved #1178 2014-03-09 00:47:21 -05:00
barisusakli
ec86aafb48 return user object 2014-03-09 00:20:29 -05:00
barisusakli
b4b9ed1841 optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data 2014-03-09 00:16:05 -05:00
barisusakli
1568c50906 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 17:41:51 -05:00
barisusakli
23e1cc010c removed removeHiddenFields function, using mongo selector instead 2014-03-08 17:41:23 -05:00
Julian Lam
6fb393de78 fixing #1177 2014-03-08 16:50:32 -05:00
Julian Lam
f00f7c8818 fixed apple-touch-icon for subfolder installs 2014-03-08 16:08:52 -05:00
Julian Lam
d9d04a3982 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-08 16:04:43 -05:00
Julian Lam
5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER 2014-03-08 16:04:22 -05:00
barisusakli
7fa8f5ef36 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-08 15:45:56 -05:00
barisusakli
284276cbb6 messaging jshint 2014-03-08 15:45:42 -05:00
psychobunny
f99c1f9921 removed code climate badge until analysis is complete 2014-03-08 02:56:24 -05:00
psychobunny
e84dd4fd94 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountedit.tpl
	public/templates/header.tpl
	src/routes/meta.js
	src/webserver.js
2014-03-07 19:21:40 -05:00
Julian Lam
c9642cecd2 setting Lavender as default theme for 0.4.0, woo! 2014-03-06 23:24:47 -05:00
Baris Soner Usakli
e51016ee66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 20:53:51 -05:00
Baris Soner Usakli
30130b2d62 set back to false when loading indicator fades out 2014-03-06 20:53:41 -05:00
Julian Lam
90b29031fe backwards compatibility with older plugins using css with staticDir 2014-03-06 20:36:05 -05:00
Julian Lam
6a31bd9af6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 19:48:54 -05:00
Julian Lam
552a63367d workaround for problem arising from switch to Date.UTC() 2014-03-06 19:48:38 -05:00
Baris Soner Usakli
6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-06 17:57:15 -05:00
Baris Soner Usakli
7dfdab0a2d search page change 2014-03-06 17:57:07 -05:00
Julian Lam
5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes #1168
2014-03-06 17:51:17 -05:00
psychobunny
23e4eb7cd9 deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap 2014-03-06 16:49:32 -05:00
psychobunny
7183fda2eb console.log 2014-03-06 16:48:55 -05:00
psychobunny
bcd8137d0e console.log 2014-03-06 16:47:59 -05:00
psychobunny
55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch 2014-03-06 16:00:17 -05:00
Julian Lam
958e85a31f updated readme to point to wiki for platform specific install docs 2014-03-06 15:56:14 -05:00
Julian Lam
4add89cea4 Merge branch 'master' of github.com:tparnell8/NodeBB into tparnell8-master 2014-03-06 15:40:07 -05:00
Julian Lam
1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-06 15:38:02 -05:00
Julian Lam
b2bc1d4555 setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli) 2014-03-06 15:37:29 -05:00
Julian Lam
e9e53ad95e added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example) 2014-03-06 15:32:06 -05:00
Baris Soner Usakli
d34e68ca25 convert score to int in mongo 2014-03-06 15:31:10 -05:00
Baris Soner Usakli
acd4771012 dbmock changes 2014-03-06 15:11:29 -05:00
Baris Soner Usakli
da0e1a8eb9 added back err to redis flushdb 2014-03-06 14:52:34 -05:00
Baris Soner Usakli
4986c8ed3a fixed tests 2014-03-06 14:51:43 -05:00
psychobunny
8c8055fbae fix for multiple synchronous hooks (synchronous hooks to be deprecated in 0.4x) 2014-03-06 14:23:48 -05:00
psychobunny
178edd150a moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;) 2014-03-06 14:09:10 -05:00
psychobunny
a9cccc9b9c allow hooks to accept single/multiple arguments instead of requiring you to send in a hash 2014-03-06 14:07:56 -05:00
Baris Soner Usakli
7135e9424c closes #1167 2014-03-06 13:32:26 -05:00
Baris Soner Usakli
3fe9bdc24c removed the postbar selector from activeusers 2014-03-06 13:08:22 -05:00
psychobunny
a9046b926d clean templates directory before beginning compilation 2014-03-06 12:25:10 -05:00
psychobunny
90a80ad83d plugins can now define a templates directory which gets compiled onload without requiring any hooks 2014-03-06 12:06:19 -05:00
psychobunny
c054ae121b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-06 10:56:36 -05:00
Julian Lam
4a1513eabf fixed #1161 properly - Merge remote-tracking branch 'origin/master'
Conflicts:
	src/upgrade.js
2014-03-06 10:35:12 -05:00
Barış Soner Uşaklı
b79169a765 Merge pull request #1161 from code-press/master
Upgrade script incorrectly looking for "err"
2014-03-06 01:24:32 -05:00
Anthony Webb
21b1bc1729 Revert "Remove text"
This reverts commit c25835c63e.
2014-03-06 00:13:13 -06:00
Anthony Webb
6f8ed7f073 err doesnt exist here 2014-03-06 00:07:07 -06:00
Anthony Webb
d9ca95a5a3 Merge remote-tracking branch 'upstream/master' 2014-03-06 00:04:47 -06:00
psychobunny
f20a2a2047 merging changes from deprecated routes/user.js 2014-03-06 00:52:12 -05:00
psychobunny
8a05eee1f5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/user.js
2014-03-06 00:51:36 -05:00
Baris Soner Usakli
096f352c82 closes #1130 2014-03-05 23:00:27 -05:00
Julian Lam
e956c19587 #1110 - moved isEmailAvailable into User.email 2014-03-05 21:21:53 -05:00
Julian Lam
e0dcf95138 fixed missing err in upgrade script 2014-03-05 21:19:36 -05:00
Baris Soner Usakli
38145abae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 20:37:40 -05:00
Baris Soner Usakli
58cb51bb02 removed unused imagemagick require 2014-03-05 20:37:31 -05:00
Julian Lam
b404b0197f final pass, resolved #1155 2014-03-05 19:51:16 -05:00
Julian Lam
5f52ef5f01 removed all 0.3.x related upgrade scripts, and updated minSchemaDate 2014-03-05 19:41:16 -05:00
Julian Lam
64aa89f5ee updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
(first pass #1155)
2014-03-05 19:33:10 -05:00
psychobunny
34552f7fb0 added middleware.guestSearchingAllowed to the actual search API call 2014-03-05 17:37:54 -05:00
psychobunny
542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/api.js
2014-03-05 17:35:41 -05:00
psychobunny
b9e119241e moved get_custom_templates into plugins.js 2014-03-05 17:23:08 -05:00
psychobunny
8f7a7fec7d more cleanup; commenting out custom plugin routes until its fixed properly 2014-03-05 17:13:55 -05:00
psychobunny
c0cd6148f4 one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files 2014-03-05 17:06:24 -05:00
Baris Soner Usakli
c028761857 new route to get recent posts 2014-03-05 16:49:42 -05:00
psychobunny
1dbc47b890 deps cleanup 2014-03-05 16:25:55 -05:00
psychobunny
73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
2014-03-05 15:59:50 -05:00
psychobunny
3efca794fd regex cleanup; fixed indenting on partials 2014-03-05 15:58:43 -05:00
Baris Soner Usakli
6f806d80c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-05 15:39:02 -05:00
Baris Soner Usakli
c9c25bd174 added getRecentPost 2014-03-05 15:38:54 -05:00
Julian Lam
6192af18ab Merge pull request #1159 from BitBangersCode/settings-callback
Send the callback to the retry
2014-03-05 15:37:45 -05:00
psychobunny
67517c58e3 added warning if partial template was not found 2014-03-05 15:31:02 -05:00
psychobunny
d442e10037 template compilation + partials support 2014-03-05 15:13:54 -05:00
MrWaffle
33a5a2177e Send the callback to the retry 2014-03-05 20:57:32 +01:00
Baris Soner Usakli
976744480f post summary change 2014-03-05 14:52:32 -05:00
David Hoff
c25835c63e Remove text 2014-03-05 13:59:59 -05:00
psychobunny
3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
2014-03-04 17:52:15 -05:00
psychobunny
552eb78db8 template compiling init; changing themes now finally works on this branch 2014-03-04 17:49:56 -05:00
psychobunny
88e5ddac76 deprecating hook events on body 2014-03-04 17:22:45 -05:00
psychobunny
c67182204f clean-up + bugfixes 2014-03-04 17:20:12 -05:00
psychobunny
444956d517 deprecated loadTemplates client-side as well 2014-03-04 17:16:12 -05:00
psychobunny
68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js 2014-03-04 17:14:01 -05:00
psychobunny
d471ea2d5b app.create_route removed 2014-03-04 17:11:40 -05:00
psychobunny
da331a1e6b clean up in routes/admin.js 2014-03-04 17:10:51 -05:00
psychobunny
fe147bfb67 have supervisor ignore public/templates folder 2014-03-04 17:08:30 -05:00
psychobunny
f73fd1eeae removed an unused hack in utils.js 2014-03-04 17:08:15 -05:00
Baris Soner Usakli
76d8d09f9b closes #1141 2014-03-04 16:48:07 -05:00
psychobunny
1dc63caf77 using views_dir config 2014-03-04 16:12:02 -05:00
psychobunny
d4f453cde3 added gitignore to public/templates dir 2014-03-04 16:11:03 -05:00
psychobunny
a3a0aabd22 return error if template doesn't exist 2014-03-04 16:08:02 -05:00
psychobunny
66ef8c8284 removed vanilla templates from core into nodebb-theme-vanilla :shipit: 2014-03-04 16:07:50 -05:00
Baris Soner Usakli
d100a41ce7 fixes topic follow 2014-03-04 15:23:26 -05:00
psychobunny
6e8c618fb1 prevent translator crash if data is undefined; linted/cleanup 2014-03-04 15:18:05 -05:00
psychobunny
cd336006fc optimized cold loading 2014-03-04 15:02:05 -05:00
Baris Soner Usakli
8c11299197 template language fix 2014-03-04 14:56:05 -05:00
psychobunny
10f4fa004e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-04 14:53:31 -05:00
psychobunny
48df0cf889 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/admin.js
2014-03-04 14:50:44 -05:00
Barış Soner Uşaklı
81378e071b Merge pull request #1157 from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
2014-03-04 13:43:04 -05:00
Julian Lam
9b53dd1014 english fallback for 'reset_password' translations 2014-03-04 13:35:20 -05:00
medwards20x6
76b53478ce Don't fire click when closing an alert 2014-03-04 10:30:44 -08:00
Baris Soner Usakli
b28e4846a4 fixed disconnect check 2014-03-04 13:28:24 -05:00
Baris Soner Usakli
3c97ef6829 closes #1156 2014-03-04 13:09:58 -05:00
Baris Soner Usakli
dbb814fe4e category permission page fixes 2014-03-04 12:54:25 -05:00
Baris Soner Usakli
7bb3766ebd 2 column layout for admin index 2014-03-03 22:05:25 -05:00
Baris Soner Usakli
814db2e1d8 icon first 2014-03-03 17:52:00 -05:00
Baris Soner Usakli
4b64b9dcdc closes #951 2014-03-03 17:46:54 -05:00
Baris Soner Usakli
1f7a717bf0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 17:24:52 -05:00
Baris Soner Usakli
50f83abf75 closes 1150 2014-03-03 17:24:38 -05:00
psychobunny
c24c2a5422 search and reset routes, the very last of the views to be refactored :shipit: 2014-03-03 17:16:53 -05:00
psychobunny
8802fc5a33 fixing link tags; misc bug fixes 2014-03-03 16:56:35 -05:00
psychobunny
d3aead7c13 changing renderHeader function signature to req, res, next 2014-03-03 16:54:28 -05:00
Julian Lam
57d0273c13 dutch translations 2014-03-03 16:40:57 -05:00
psychobunny
48b9289002 use the proper footer for admin 2014-03-03 16:40:26 -05:00
psychobunny
7ef6f9bbf5 buckled down and refactored pretty much all of admin routes x_x 2014-03-03 16:35:21 -05:00
Julian Lam
8846f7fb9b fixing mappedPath in windows 2014-03-03 16:32:41 -05:00
Baris Soner Usakli
37aeda14c4 fixed email retrieval in mongo 2014-03-03 16:16:41 -05:00
Baris Soner Usakli
be70b3de57 closes #1090 2014-03-03 15:26:15 -05:00
Baris Soner Usakli
529cd60dd2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-03 14:46:57 -05:00
Baris Soner Usakli
70299ea5c2 better search result page 2014-03-03 14:46:50 -05:00
psychobunny
c26af77a24 fixing cold load of admin/index 2014-03-03 14:43:25 -05:00
psychobunny
d360320441 finally got admin header and footer working 👍 2014-03-03 14:30:39 -05:00
psychobunny
eed97648b1 started moving admin mdw into middleware/admin.js; res.render post-processing to append admin footer/header 2014-03-03 13:17:10 -05:00
psychobunny
e588762aa0 yes, I've finally started on the dreaded admin refactor (not much else left to do :/) 2014-03-03 12:50:21 -05:00
psychobunny
209bcaba8c middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated) 2014-03-03 12:49:47 -05:00
Julian Lam
9c55b202e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-03 12:47:43 -05:00
Julian Lam
dc8839b63c updating validator to 3.4.0 2014-03-03 12:47:40 -05:00
psychobunny
f943a194b6 added plugin deprecation notices to NOTES.md 2014-03-03 12:39:58 -05:00
psychobunny
f785f7f6e3 added deprecation notice to plugins/fireHook 2014-03-03 12:37:57 -05:00
psychobunny
94aeb3ab22 notifications route; added middleware.authenticate to user/uploadpicture api route 2014-03-03 12:30:27 -05:00
psychobunny
5b8e8e4b67 deprecating use of templates.setGlobal on server side in favour of passing in api.config into res.locals (still needs work) 2014-03-03 12:16:46 -05:00
psychobunny
188aeabba8 missed a file in previous commit 2014-03-03 11:45:40 -05:00
psychobunny
7bef58deb1 started moving out api functionality out of the route file into controllers/api.js 2014-03-03 11:45:23 -05:00
psychobunny
138b12e815 re-added linkTags into header; clean up 2014-03-03 11:44:52 -05:00
psychobunny
d18ce28de0 fixxed categories.get; privileges object and currentPage were missing on original route 2014-03-03 11:28:31 -05:00
Julian Lam
64ee792013 fixed #1154 2014-03-03 11:12:28 -05:00
Julian Lam
5a8fa9b1f7 fixed regression in groups management modal 2014-03-03 11:07:37 -05:00
psychobunny
c5066ed100 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-03 10:40:56 -05:00
Julian Lam
30e83fdabe fixing upgrade script if order is not set 2014-03-03 10:17:11 -05:00
psychobunny
31d576e9ed deprecation notice 2014-03-03 00:22:10 -05:00
psychobunny
fe9d4efa98 moved api-only routes into routes/api.js, cleanup & linting 2014-03-03 00:12:25 -05:00
psychobunny
d75bc9578b deprecating middleware.prepareAPI in favour of using app.all('*') in /api namespace 2014-03-02 23:49:15 -05:00
psychobunny
5b25e21606 console.log 2014-03-02 23:45:41 -05:00
psychobunny
8ad24818df fixed FOUS in category sidebar 2014-03-02 23:40:31 -05:00
psychobunny
71675d0aa0 removed required "ajaxifying" class for #content - breaks browsers with noscript turned on. 2014-03-02 23:36:27 -05:00
psychobunny
88ca3733a7 more jshinting 2014-03-02 23:07:16 -05:00
psychobunny
d20501b29d meta.js merge conflict 2014-03-02 22:59:57 -05:00
psychobunny
cdf92c5cda fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object 2014-03-02 22:54:03 -05:00
psychobunny
c44934cc0d all JS files properly required on cold load 2014-03-02 22:51:40 -05:00
psychobunny
52a50a80ba templates.parseTemplateVariables, added optional callback 2014-03-02 22:48:18 -05:00
psychobunny
b9264dea76 ajaxify.loadScript 2014-03-02 22:47:14 -05:00
Julian Lam
fc53385ede removing socket.io library from minfile 2014-03-02 22:34:57 -05:00
psychobunny
fa2b5d1ee6 re-implementing meta and link tags - completified 2014-03-02 22:15:27 -05:00
psychobunny
3eb9f65c2e jshinting controllers/index.js; adding back meta tags to home page 2014-03-02 22:12:08 -05:00
psychobunny
8df33e65ac fixing bug in topics causing meta tags to revert on subsequent refresh 2014-03-02 22:10:57 -05:00
Julian Lam
044347ebca hotfix for vanilla missing socket.io lib 2014-03-02 22:02:55 -05:00
Julian Lam
aadde85e1b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-02 20:41:49 -05:00
Julian Lam
28832a2540 fixing bug where sometimes a pidfile was left over, and nodebb would refuse to start a daemon again. 2014-03-02 20:37:57 -05:00
Baris Soner Usakli
f5ec24e925 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-02 20:01:01 -05:00
Baris Soner Usakli
016642bc16 show 1 ip per line 2014-03-02 20:00:54 -05:00
Julian Lam
34336a1069 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-02 19:56:27 -05:00
Julian Lam
1837a8443c shifting socket.io back to the end :\ 2014-03-02 19:55:50 -05:00
Baris Soner Usakli
98fa8c419d closes #1152 2014-03-02 19:55:26 -05:00
Baris Soner Usakli
55b5d0c209 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-02 16:58:56 -05:00
Baris Soner Usakli
e4b6d0e1ff closes #1096 2014-03-02 16:58:49 -05:00
Julian Lam
a8d2b46911 fixed incorrect path in plugin script inclusion 2014-03-02 16:44:41 -05:00
Julian Lam
e70bc9f163 added deprecation warning for plugins using filter:scripts.get 2014-03-02 16:33:45 -05:00
Julian Lam
5553e07bbd moving socket.IO client lib to top of file, just in case 2014-03-02 16:29:21 -05:00
Julian Lam
4c2a6953f1 concatenating the client scripts, instead of compressing, in development mode 2014-03-02 15:34:12 -05:00
psychobunny
dbbbe21883 re-implementing meta and link tags part 1 2014-03-02 15:14:38 -05:00
psychobunny
6820e9e662 random jshinting expedition 2014-03-02 14:45:57 -05:00
psychobunny
f0dfee5402 clean up 2014-03-02 14:21:24 -05:00
psychobunny
6c3c669e31 moved middleware out of webserver.js and into middleware.js 2014-03-02 14:16:16 -05:00
psychobunny
936e52a43f require db 2014-03-02 14:00:28 -05:00
Julian Lam
3860abdc24 plugins can now pass in scripts in plugin.json, and they will be bundled into nodebb.min.js 2014-03-02 13:58:25 -05:00
psychobunny
4d598dcd63 moved process events out of webserver.js and into app.js 2014-03-02 13:56:46 -05:00
psychobunny
ee5596fad5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-02 13:51:34 -05:00
Julian Lam
14d7453a23 bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
Development mode will not compress the scripts, but will just concatenate.
2014-03-02 13:28:09 -05:00
Julian Lam
033c5d5726 es, fr, nb, sv, zh_CN translations 2014-03-02 11:06:21 -05:00
Baris Soner Usakli
5732994097 reset_code click fix 2014-03-01 23:18:05 -05:00
Baris Soner Usakli
feeb220514 removed console.log 2014-03-01 22:52:30 -05:00
Baris Soner Usakli
1b7f8cc5cb active users fix 2014-03-01 22:51:39 -05:00
Baris Soner Usakli
fb691b23b4 moved topic locked check to topic.reply 2014-03-01 22:03:21 -05:00
Julian Lam
77f5d6ff7d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 22:00:28 -05:00
Julian Lam
1c324f45cf tried fixing absentee detection in active users 2014-03-01 21:59:51 -05:00
Baris Soner Usakli
c6ff8e1042 #1148 2014-03-01 21:55:29 -05:00
Julian Lam
079ed10631 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 21:32:43 -05:00
Julian Lam
2b178ff76d proper tracking of users' reply status when others enter the room 2014-03-01 21:31:50 -05:00
Baris Soner Usakli
2966cc4a49 minor fix 2014-03-01 19:18:15 -05:00
Baris Soner Usakli
b2f9184562 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 19:15:25 -05:00
Baris Soner Usakli
b6d97281d3 closes #1015 2014-03-01 19:15:18 -05:00
Julian Lam
a9b78d2600 minimizing the composer should unregister it 2014-03-01 17:49:39 -05:00
Julian Lam
68fb6ec09a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 17:36:30 -05:00
Baris Soner Usakli
42a7c037e6 removed dupe i var 2014-03-01 17:36:29 -05:00
psychobunny
f46e563b8a moved all route definitions in webserver.js into routes/index.js 2014-03-01 17:35:47 -05:00
Julian Lam
f2ffc2b533 properly referencing the tid of the composer instead of blindly checking templates.get('topic_id') 2014-03-01 17:34:06 -05:00
psychobunny
08a9ce4950 moved all app.configure() code into middleware/index.js + organization/cleanup 2014-03-01 17:26:26 -05:00
Baris Soner Usakli
8cda88790e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 17:11:59 -05:00
Baris Soner Usakli
3c6e4ebda1 possible fix to #1148 2014-03-01 17:11:49 -05:00
Julian Lam
fcb44ae256 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 17:06:02 -05:00
Julian Lam
d012d237bf added back clearInterval 2014-03-01 17:05:57 -05:00
Baris Soner Usakli
c4d1c8feff Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 16:59:13 -05:00
Baris Soner Usakli
87f337f2fb cleanup 2014-03-01 16:59:04 -05:00
Julian Lam
7ef84e0daa switched to 'ping active' system 2014-03-01 16:53:41 -05:00
Julian Lam
7ff9fa1a44 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-03-01 15:46:27 -05:00
Julian Lam
b3d7ae1c86 showing who is replying in the active users block 2014-03-01 15:46:13 -05:00
Baris Soner Usakli
0c9ab5e93f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-03-01 15:45:55 -05:00
psychobunny
804da0d8de removed unused deps in webser.js 2014-03-01 15:45:47 -05:00
Baris Soner Usakli
fff3ba5bec hinted redis.js 2014-03-01 15:45:43 -05:00
psychobunny
26853d024e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-03-01 15:37:57 -05:00
Tommy Parnell
97cb11628d Installation instructions CentOS 6.5
ReadME.MD Adding installation instructions for CentOS 6.5, also adding npm strict-ssl to false to allow some npm packages that have self signed certs.
2014-03-01 15:37:02 -05:00
Julian Lam
ea222a4295 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 23:38:29 -05:00
Julian Lam
0fecbf7cbf entity decoding in filenames 2014-02-28 23:38:04 -05:00
Baris Soner Usakli
8eca195530 updateHeader once on load 2014-02-28 22:08:33 -05:00
Julian Lam
6bc759748f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 20:51:17 -05:00
Julian Lam
1f136c6a72 ninjafix to mappedPath 2014-02-28 20:51:12 -05:00
Baris Soner Usakli
24b669bd39 some fixes for search plugin 2014-02-28 20:47:49 -05:00
Julian Lam
1c19ae48bd fixed #1143 -- also removed near-meaningless info messages saying that a Hook had been registered. 2014-02-28 20:39:27 -05:00
Julian Lam
5540313b7f fixing path resolution for plugins in production mode 2014-02-28 20:13:28 -05:00
Julian Lam
5e2460e17e fixed #1144 2014-02-28 20:05:19 -05:00
Julian Lam
ac915c1190 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 19:56:20 -05:00
Julian Lam
d63ff461f3 changed executable to not run watch-mode using the loader 2014-02-28 19:56:00 -05:00
Baris Soner Usakli
84dc012198 closes #1142 2014-02-28 18:17:17 -05:00
Baris Soner Usakli
e75c303b89 added unique visitor count to admin dashboard 2014-02-28 17:19:42 -05:00
Baris Soner Usakli
7081c7dcc4 moved ip log to api 2014-02-28 16:50:39 -05:00
psychobunny
e73f8d6f37 Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-02-28 16:42:05 -05:00
psychobunny
4b2f5cbfab added NOTES.md to start keeping track of breaking changes in 0.4x refactoring 2014-02-28 16:27:43 -05:00
psychobunny
0211b4484b on cold load, only display page after widgets are rendered 2014-02-28 16:24:56 -05:00
psychobunny
6f21547a8d ajaxify.fadeIn, ajaxify.fadeOut 2014-02-28 16:24:25 -05:00
Baris Soner Usakli
9069f9aedc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-28 16:23:53 -05:00
Baris Soner Usakli
6bf36a0468 if alert is closed dont fire clickfn 2014-02-28 16:23:46 -05:00
Julian Lam
6a649f9b9a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-28 16:21:09 -05:00
Julian Lam
561b42d0f9 new staticDirs format, @mrwaffle 2014-02-28 16:21:02 -05:00
psychobunny
6827dbc9c4 render widgets on cold load 2014-02-28 16:17:35 -05:00
Baris Soner Usakli
eea677655f minor clean up to categories.js 2014-02-28 16:13:19 -05:00
psychobunny
23c283f06c ajaxify.getTemplateMapping 2014-02-28 16:13:00 -05:00
psychobunny
49997639e9 moved widget rendering code into ajaxify.renderWidgets 2014-02-28 16:08:25 -05:00
psychobunny
584347848b trigger action:ajaxify.start and action:ajaxify.end on cold load 2014-02-28 16:08:13 -05:00
psychobunny
f35c14ee07 bugfixes + cleanup for accounts and users routes 2014-02-28 15:58:29 -05:00
Baris Soner Usakli
eac201cae9 no need to do these on every ajaxify into categories 2014-02-28 15:56:30 -05:00
Baris Soner Usakli
7eae79cee9 anons cant chat 2014-02-28 15:36:57 -05:00
psychobunny
fa103b2d6e finally done with routes/user.js; accounts.getUserByUID; bug fixing and cleanup 2014-02-28 15:33:25 -05:00
psychobunny
08d3d9feb3 accounts.uploadPicture 2014-02-28 15:26:39 -05:00
Baris Soner Usakli
ccd29bfd61 added callback to category update 2014-02-28 15:25:50 -05:00
psychobunny
e67f6d2169 re-added filter:footer.build temporarily - to be deprecated for 0.4x 2014-02-28 15:15:00 -05:00
psychobunny
607bc8545b Merge remote-tracking branch 'origin/master' into webserver.js-refactor 2014-02-28 14:35:00 -05:00
psychobunny
cb15655c9c app.checkAccountPermissions middleware; some clean up & bug fixes 2014-02-28 14:34:35 -05:00
psychobunny
bfcb61f37d forgot to port getUserDataByUserSlug 2014-02-28 14:22:49 -05:00
psychobunny
d072ad60de all users/ pages converted 2014-02-28 14:19:43 -05:00
psychobunny
7c873c4314 decided to functionally separate accounts from users 2014-02-28 14:08:06 -05:00
psychobunny
e64d87cb1d all user account pages; all static pages; outgoing page 2014-02-28 14:04:21 -05:00
psychobunny
db0ad5b57c Merge pull request #1140 from mathisonian/patch-1
fix error with undefined callback
2014-02-28 13:07:49 -05:00
Matthew Conlen
a2a9c8fd8a fix error with undefined callback 2014-02-28 12:58:05 -05:00
Baris Soner Usakli
8064f7f0db scroll fix 2014-02-28 00:59:35 -05:00
Baris Soner Usakli
9b4ca12dc1 fixed missing var, posts.js cleanup 2014-02-28 00:14:11 -05:00
Baris Soner Usakli
8c6af7ef59 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 23:45:19 -05:00
Baris Soner Usakli
091723a8c5 closes #1101 2014-02-27 23:45:12 -05:00
Julian Lam
ed0a17b94a reoad, lol 2014-02-27 23:24:52 -05:00
Julian Lam
20b5d577dd ability to restart nodebb via executable 2014-02-27 20:36:04 -05:00
psychobunny
00df660fa5 robots + sitemap; some clean up 2014-02-27 17:16:06 -05:00
psychobunny
942d16a3b4 confirmEmail route 2014-02-27 17:04:41 -05:00
psychobunny
dae7b06f4d initial login and register routes 2014-02-27 16:52:46 -05:00
psychobunny
e193d58112 unreadTotal route 2014-02-27 16:39:34 -05:00
psychobunny
08c0a7fa5e removing old unread and recent routes 2014-02-27 16:38:10 -05:00
psychobunny
beafc881c4 added recent and unread in categoriesController 2014-02-27 16:35:29 -05:00
psychobunny
062e35c89e app.authenticate middleware; added new recent, unread routes 2014-02-27 16:34:58 -05:00
Baris Soner Usakli
0682b5c5ea fix admin users link 2014-02-27 15:44:34 -05:00
Baris Soner Usakli
389fc787a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 15:35:58 -05:00
Baris Soner Usakli
c49c3e3550 fixed jquery ui package 2014-02-27 15:35:50 -05:00
psychobunny
4435a20d90 fixed merge conflict 2014-02-27 15:11:50 -05:00
psychobunny
96d6b96ce4 controllers.home 2014-02-27 15:06:39 -05:00
psychobunny
c084529597 removed old api/home and api/popular 2014-02-27 14:56:54 -05:00
psychobunny
ad222dce2a controller indexx 2014-02-27 14:56:14 -05:00
psychobunny
233e49fd34 topics controller 2014-02-27 14:56:05 -05:00
psychobunny
62a4b419e3 categories controller 2014-02-27 14:55:53 -05:00
psychobunny
27b99d5c56 webserver.js refactor init 2014-02-27 14:55:41 -05:00
psychobunny
1db0651bff removing old api/popular code 2014-02-27 14:44:47 -05:00
psychobunny
4a33b41464 deprecating loadServer in favour of using res.render 2014-02-27 14:44:19 -05:00
Julian Lam
e2fb3dacca pushing new language fallbacks 2014-02-27 14:10:13 -05:00
Julian Lam
dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-27 14:05:55 -05:00
Julian Lam
44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation 2014-02-27 14:05:31 -05:00
Baris Soner Usakli
30eb85f96e fixed conflicts 2014-02-27 12:46:37 -05:00
Baris Soner Usakli
44d40fba35 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-27 12:15:34 -05:00
Baris Soner Usakli
0ca6c58ded closes #1137 2014-02-27 12:15:26 -05:00
Julian Lam
1a85d45567 portuguese and slovak translations 2014-02-27 10:41:59 -05:00
Julian Lam
a7c53519b6 updated executable help 2014-02-27 10:30:09 -05:00
Julian Lam
c7274e11d0 removing the bit of code that disables plugins if the minver does not satisfy (too annoying imo)... now that we have ./nodebb reset, this is moot 2014-02-27 10:28:49 -05:00
Julian Lam
4567e5fbd0 updated help blurb in executable 2014-02-27 10:13:36 -05:00
Julian Lam
5b301772bb added daemon capability to ./nodebb start, npm start/stop scripts 2014-02-27 10:06:31 -05:00
Baris Soner Usakli
38e4a6c8b0 better check 2014-02-27 01:51:33 -05:00
Baris Soner Usakli
b8c089cfaa added check for invalid tags 2014-02-27 01:43:24 -05:00
Baris Soner Usakli
fb1313ec90 load config change 2014-02-27 01:32:20 -05:00
Baris Soner Usakli
dcd3975933 closes #1135 2014-02-27 00:45:29 -05:00
akhoury
2209a55afc - changes per PR conversation 2014-02-26 23:34:03 -05:00
akhoury
0070e1158e removing a boolean left out from the addEventListener definition 2014-02-26 22:32:09 -05:00
Baris Soner Usakli
72aa22d824 removed unused timestamp 2014-02-26 22:19:01 -05:00
akhoury
3f1d5c6656 merge fork with upstream master 2014-02-26 22:01:29 -05:00
Baris Soner Usakli
87ccfdf5eb Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 21:58:12 -05:00
Baris Soner Usakli
d87034b131 use alert for bookmark 2014-02-26 21:58:04 -05:00
akhoury
1b207d8276 IE8 support, general cleanups, from native to $ objects ... 2014-02-26 21:55:29 -05:00
akhoury
b59c10a1e9 took out some overrides out utils to a new overrides.js 2014-02-26 21:49:22 -05:00
Julian Lam
ef2dbe8df6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-26 21:10:15 -05:00
Julian Lam
04b2887d88 fixed it language code 2014-02-26 21:10:05 -05:00
Baris Soner Usakli
81f4767687 user.js hint 2014-02-26 21:04:20 -05:00
Baris Soner Usakli
6a962655e4 jshint for topics.js 2014-02-26 20:38:49 -05:00
Baris Soner Usakli
f1f7b59d58 missed this one 2014-02-26 20:31:30 -05:00
Baris Soner Usakli
d398d4c613 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 19:55:34 -05:00
Baris Soner Usakli
99bf882a1c removed cid from getTopicsByTids 2014-02-26 19:55:28 -05:00
Barış Soner Uşaklı
1ca1ace053 Update README.md 2014-02-26 19:45:07 -05:00
Baris Soner Usakli
ad37715972 empty array if not topics in catgory 2014-02-26 17:34:02 -05:00
Baris Soner Usakli
d5268f5497 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:17:02 -05:00
Baris Soner Usakli
56bbeb9950 use disableSocialButtons from config 2014-02-26 17:16:55 -05:00
psychobunny
2247a8b21f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 17:00:07 -05:00
psychobunny
aee2b2ecd0 allow express to serve parsed tpls via res.render 2014-02-26 17:00:03 -05:00
Baris Soner Usakli
7f2d70d7f6 minor cleanups 2014-02-26 16:58:02 -05:00
Baris Soner Usakli
a83d4a9dd5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 16:43:28 -05:00
Baris Soner Usakli
ea6cf3bbd5 more cleanup and changes to topics 2014-02-26 16:43:21 -05:00
psychobunny
87baeebc3f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 15:58:45 -05:00
psychobunny
5145ba1aac added a route to get moderators by category id 2014-02-26 15:58:42 -05:00
Baris Soner Usakli
d149622f0b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-26 15:32:40 -05:00
Baris Soner Usakli
8da7a6f2f3 cleanup 2014-02-26 15:32:32 -05:00
Julian Lam
74d6392bec added Dutch language 2014-02-26 14:55:45 -05:00
Julian Lam
c38e328377 language files for fi, it, zh_CN, pl, hu 2014-02-26 14:50:44 -05:00
Julian Lam
1397890dd8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-26 13:45:18 -05:00
Julian Lam
7b46d66e68 having the loader play nicely with supervisor -- ./nodebb watch can now hit the restart button 2014-02-26 13:42:39 -05:00
Baris Soner Usakli
8a2266816d make plugin names strong 2014-02-26 13:14:48 -05:00
Julian Lam
3f7e458866 fixed #1127 2014-02-25 23:06:21 -05:00
Baris Soner Usakli
947836f815 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-25 22:05:16 -05:00
Baris Soner Usakli
36bc2967c2 fix highlight on vanilla, dont replaceState if url didnt change 2014-02-25 22:05:07 -05:00
Julian Lam
815e78339f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-25 18:14:11 -05:00
Julian Lam
101a6ab812 minifying css 2014-02-25 18:14:06 -05:00
Baris Soner Usakli
1ba3acfd03 display ips to admins/users on profile 2014-02-25 17:34:42 -05:00
Baris Soner Usakli
de3bc84fde removed logs 2014-02-25 17:23:13 -05:00
Baris Soner Usakli
ebdfd16e48 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-25 17:21:41 -05:00
Baris Soner Usakli
cc8ac2c026 get ips if admin or self 2014-02-25 17:21:30 -05:00
Julian Lam
6545357969 fixing admin stylesheet + lavender minver 2014-02-25 17:15:46 -05:00
Julian Lam
f5d1ba4231 closed #1113 2014-02-25 17:07:27 -05:00
Julian Lam
ee44778e2b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-25 17:00:42 -05:00
Julian Lam
309dcaee06 fixed issue where even dev mode would call the minifier for js 2014-02-25 17:00:26 -05:00
Baris Soner Usakli
9683dc27db Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-25 16:55:11 -05:00
Baris Soner Usakli
8913de4ea8 dont add post-bar to each post 2014-02-25 16:55:05 -05:00
Julian Lam
656131be39 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-25 16:52:49 -05:00
Julian Lam
12e3e45398 closed #1095 - js is now minified and saved to memory the first time it is requested (on prod mode), same with theme CSS 2014-02-25 16:50:58 -05:00
Baris Soner Usakli
3c53ebb02e better scrolling 2014-02-25 16:33:22 -05:00
Baris Soner Usakli
23c20a2821 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-25 15:26:18 -05:00
Baris Soner Usakli
b658c68736 back doesnt work 2014-02-25 15:26:10 -05:00
Julian Lam
4c21b23ea2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-25 15:21:10 -05:00
Julian Lam
bc1c419722 caching compiled CSS locally, so repeated calls to the stylesheet serve from cache 2014-02-25 15:20:21 -05:00
Baris Soner Usakli
a3855a47e5 check replaceState 2014-02-25 15:12:42 -05:00
Baris Soner Usakli
e050c15474 fixed conflict 2014-02-25 15:11:10 -05:00
Baris Soner Usakli
5567378234 change hash take 2 2014-02-25 15:10:50 -05:00
Julian Lam
7f11d78b82 Merge branch 'master' into less-is-moar 2014-02-25 14:59:21 -05:00
Julian Lam
e3ec4e938a Revert "update post has in address bar, #1126"
This reverts commit 4b1c8150d3.
2014-02-25 14:59:07 -05:00
Baris Soner Usakli
4b1c8150d3 update post has in address bar, #1126 2014-02-25 14:51:11 -05:00
Baris Soner Usakli
7c1a46f25d misc cleanup 2014-02-25 14:41:14 -05:00
Baris Soner Usakli
14b298eda8 cleaned updateHeader 2014-02-25 14:29:19 -05:00
Baris Soner Usakli
f39248c83b closes #1123 2014-02-25 14:17:42 -05:00
Julian Lam
53f1e4d3d4 dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme... 2014-02-25 14:13:09 -05:00
Baris Soner Usakli
fd8e7327f0 removed console.log 2014-02-25 14:05:14 -05:00
Baris Soner Usakli
7e5a7c53bd changes to templates 2014-02-25 14:03:47 -05:00
psychobunny
156c0302c9 properly namespacing objects in templates 2014-02-25 13:15:23 -05:00
Baris Soner Usakli
037ac9180b closes #1122 2014-02-24 20:19:31 -05:00
Baris Soner Usakli
0777c96a55 dont highlight reverse infinite loaded posts 2014-02-24 19:26:26 -05:00
Baris Soner Usakli
17f2ff0ed9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-24 19:16:34 -05:00
Baris Soner Usakli
0da2839943 added the class for topic delete 2014-02-24 19:16:23 -05:00
Julian Lam
c48d81379b logging unique IPs as well 2014-02-24 17:49:22 -05:00
Julian Lam
aa71f1e088 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-24 17:20:57 -05:00
Julian Lam
1710b97df5 removed console log 2014-02-24 17:20:45 -05:00
Baris Soner Usakli
2597c4fc37 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-24 17:19:56 -05:00
Baris Soner Usakli
3ed2d21eb6 fixed flag post, added highlight to scroll post 2014-02-24 17:19:49 -05:00
Julian Lam
21685f8c84 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-24 17:17:20 -05:00
Julian Lam
8557c56c45 resolved #1117 2014-02-24 17:06:41 -05:00
Baris Soner Usakli
bbc2df11e1 fixed updateTopicCount 2014-02-24 16:24:21 -05:00
Baris Soner Usakli
8feac114c3 closes #1022 2014-02-24 16:23:11 -05:00
Baris Soner Usakli
f7cdc8c68c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-24 16:01:08 -05:00
Baris Soner Usakli
ed8e76ebce added error check to getTopicDataWithUser 2014-02-24 16:01:01 -05:00
Barış Soner Uşaklı
9216b29b69 Update README.md 2014-02-24 15:54:43 -05:00
Baris Soner Usakli
0f8ee3a671 added instructions class 2014-02-24 15:45:30 -05:00
Baris Soner Usakli
7c49c32ad3 scroll fix 2014-02-24 15:23:26 -05:00
Baris Soner Usakli
cd9bd91ab2 fixes double hashes in share links 2014-02-24 15:10:27 -05:00
psychobunny
acafa9095f added footer widget area to topic.tpl 2014-02-24 14:28:09 -05:00
psychobunny
71ea01edb7 switching topics.thumb conditional back 2014-02-24 13:49:47 -05:00
psychobunny
a79ca2b135 clean up ENDIF conditional if object.value is undefined and is used in an ELSE block 2014-02-24 13:49:15 -05:00
Julian Lam
1052165373 updated messages when toggling themes or plugins 2014-02-23 23:13:32 -05:00
Julian Lam
2baa381917 plugins and themes now trigger a restart 2014-02-23 23:08:54 -05:00
Julian Lam
c797d6251d Revert "emitting alert when restart is attempted in development mode"
This reverts commit 059c5452ea.
2014-02-23 22:52:59 -05:00
Julian Lam
059c5452ea emitting alert when restart is attempted in development mode 2014-02-23 22:51:53 -05:00
Julian Lam
4ef1d83acd Merge branch 'master' into nodebb-loader 2014-02-23 22:48:11 -05:00
Julian Lam
1fa3880ffc Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-23 22:45:21 -05:00
Julian Lam
216ff0f3f9 some checks for handling plugin deletion 2014-02-23 22:44:49 -05:00
psychobunny
8fe9e5ab46 auto installing nodebb-widget-essentials on new setups 2014-02-23 22:22:17 -05:00
Baris Soner Usakli
fd41d93bdb took out if from the src 2014-02-23 22:09:06 -05:00
Baris Soner Usakli
c96d85911f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-23 21:50:09 -05:00
Baris Soner Usakli
e3d01df6a2 closes #980 2014-02-23 21:50:02 -05:00
Julian Lam
590fb2e68a added david dep badge to readme 2014-02-23 21:05:50 -05:00
Baris Soner Usakli
b8b83c2ec2 share buttons 2014-02-23 19:38:26 -05:00
Baris Soner Usakli
f967407805 follow state clean up 2014-02-23 18:38:46 -05:00
Baris Soner Usakli
649bcf49b4 one liner 2014-02-23 18:25:24 -05:00
Baris Soner Usakli
b5c8158ad5 more cleanup 2014-02-23 18:19:10 -05:00
Baris Soner Usakli
403de08d60 cleaned more 2014-02-23 18:05:50 -05:00
Baris Soner Usakli
122d1ad82a less is more 2014-02-23 17:42:31 -05:00
Julian Lam
2088903358 added check to upgrade.upgrade 2014-02-23 16:35:28 -05:00
Baris Soner Usakli
c1e3d95a84 upgrade fix for new installs 2014-02-23 16:19:30 -05:00
Baris Soner Usakli
e35a54bea4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-23 15:08:06 -05:00
Baris Soner Usakli
6c6c57f45f closes #1108 2014-02-23 15:07:47 -05:00
Alejandro Del Rincón
a9f20a7791 More translation 2014-02-23 15:11:10 +01:00
Alejandro Del Rincón
8111b9e91f Finally reviewed spanish transalation
I revised the spanish translation to something more serious and complete. There was a lot of wrong spelled words and some untranslated/bad translated words
2014-02-23 15:00:52 +01:00
Alejandro Del Rincón López
8ef59adb4a Actualización lenguaje español
The translation was very faulty with a lack of accents and some words untranslated
2014-02-23 14:38:50 +01:00
Baris Soner Usakli
a29ea27596 closes #1106 2014-02-22 22:46:58 -05:00
Baris Soner Usakli
6e5a6b8784 upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting 2014-02-22 18:56:37 -05:00
Baris Soner Usakli
d6d9776cde added toPid to posts 2014-02-22 17:56:13 -05:00
Baris Soner Usakli
81555671da Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-22 16:49:07 -05:00
Baris Soner Usakli
60905b2e21 getPidPage fix, pids are strings 2014-02-22 16:48:58 -05:00
Julian Lam
7bd972355e Merge pull request #1105 from lucianojmf/master
Update package.json
2014-02-22 15:09:37 -05:00
Luciano Miranda
d4084b1586 Update package.json 2014-02-22 16:52:13 -03:00
Julian Lam
6bc6c88e89 pruning dependencies, and removed contributors from package.json -- full list can be found at https://github.com/designcreateplay/NodeBB/graphs/contributors 2014-02-22 11:18:16 -05:00
Julian Lam
ca4b9346f3 resolved #1039 2014-02-22 11:08:02 -05:00
Julian Lam
7760a6b207 added restart button to ACP (!!) 2014-02-22 03:11:13 -05:00
Julian Lam
b64e5870b7 loader now handles arguments and ./nodebb watch command updated to not use loader. 2014-02-22 03:01:54 -05:00
Baris Soner Usakli
a8c7b32a04 moved plugin alert to top 2014-02-22 02:44:30 -05:00
Baris Soner Usakli
3f43ca0925 change on click 2014-02-22 02:40:28 -05:00
Julian Lam
d6a1fad527 removing timeout before restarting nodebb, fixing nodebb executable 2014-02-22 02:36:56 -05:00
Baris Soner Usakli
f57e293abb plugin buttons indicate active state 2014-02-22 02:35:33 -05:00
Julian Lam
64c4dd7e63 communication between loader and child 2014-02-22 02:27:14 -05:00
Baris Soner Usakli
cfe5b6aa4a check if thumEl exists before trim 2014-02-22 02:01:08 -05:00
Baris Soner Usakli
bae76ebd70 fixed the redis error when going to unread/recent if nextStart is missing 2014-02-22 00:49:32 -05:00
Julian Lam
ef63d816fe NodeBB will now listen to SIGINT signal 2014-02-21 23:52:23 -05:00
Baris Soner Usakli
f4d23fe5df return version in config 2014-02-21 23:47:55 -05:00
Baris Soner Usakli
3958ee4120 added close db command 2014-02-21 23:42:16 -05:00
Baris Soner Usakli
dfe25d4bc0 only store thumb if is defined 2014-02-21 23:28:19 -05:00
Baris Soner Usakli
02b602f587 removed double translator 2014-02-21 23:16:21 -05:00
Baris Soner Usakli
63dba688ff Merge branch 'master' of https://github.com/designcreateplay/NodeBB into akhoury-topics-thumbnails 2014-02-21 23:15:38 -05:00
Baris Soner Usakli
29ba015d69 fixed topic thumbs 2014-02-21 23:15:25 -05:00
psychobunny
acb935bbc5 requiring translator in meta.js 2014-02-21 23:01:15 -05:00
psychobunny
002e149f42 reasons why comma first is better 2014-02-21 23:00:02 -05:00
Baris Soner Usakli
b7ccc12525 bump topic if its marked unread for all, so it shows up in unread 2014-02-21 22:13:13 -05:00
psychobunny
f862d856fc alright clearly, regex on fridays just don't happen for me. - fixed 2014-02-21 22:04:21 -05:00
psychobunny
027398f5ba unreverting change 2014-02-21 20:57:42 -05:00
psychobunny
6890d319ec Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-21 20:47:53 -05:00
psychobunny
0c54afe576 reverting previous template fix 2014-02-21 20:47:50 -05:00
Baris Soner Usakli
3a30db59c2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-21 20:47:04 -05:00
Baris Soner Usakli
dab71d04bd removed unused var 2014-02-21 20:46:56 -05:00
Julian Lam
a0b6d15b2e closed #1102 2014-02-21 20:05:44 -05:00
Baris Soner Usakli
9eb4945415 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-21 18:32:06 -05:00
Baris Soner Usakli
de34beaf6d closes #1087 2014-02-21 18:31:59 -05:00
psychobunny
2ec6dd1d14 added filter:topic.thread_tools for creating custom admin functionality in topics view 2014-02-21 16:47:40 -05:00
psychobunny
6f7243f42f fixed a bug running multiple blocks in one template on an empty array 2014-02-21 16:46:58 -05:00
psychobunny
32ac3d94d2 moved pin and lock out of .topic-title in popular/recent/unread 2014-02-21 16:15:33 -05:00
psychobunny
e9c7de951b moved pin and lock out of .topic-title 2014-02-21 16:08:43 -05:00
psychobunny
b63fe44da4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-21 16:02:51 -05:00
psychobunny
c7fb34c23f new client-side hooks: filter:categories.new_topic, action:categories.new_topic.loaded 2014-02-21 16:02:48 -05:00
Baris Soner Usakli
eb3b240b04 some cleanup of unread 2014-02-21 15:54:51 -05:00
Baris Soner Usakli
31f877ccee merged 2014-02-21 14:54:01 -05:00
Baris Soner Usakli
ae93c372ff fixed mongo setAdd and setRemove to accept arrays like redis, fixed infinite scroll for mongo 2014-02-21 14:53:31 -05:00
Julian Lam
ea826ce487 type checking 'plugin' when loading 2014-02-21 13:55:04 -05:00
Julian Lam
f6ea278b09 closed #1095 2014-02-21 13:27:40 -05:00
Julian Lam
790b0f98d4 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-21 11:16:46 -05:00
Julian Lam
d3ba03ceae fixed #1089 2014-02-21 11:16:44 -05:00
psychobunny
15f19653c5 action:categories.loading and action.categories.loaded 2014-02-21 01:55:25 -05:00
psychobunny
7e767da73e closes #1086 and #1085 2014-02-21 01:54:48 -05:00
Julian Lam
a2942e22cc Revert "removing exported search methods from redis and mongo"
This reverts commit bba3b76108.
2014-02-21 00:37:03 -05:00
psychobunny
5179fec986 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 21:41:59 -05:00
psychobunny
a3191227de closes #1080 2014-02-20 21:41:56 -05:00
Julian Lam
f10bda49dc Merge remote-tracking branch 'origin/master' into search_hooks 2014-02-20 21:38:46 -05:00
Julian Lam
bba3b76108 removing exported search methods from redis and mongo 2014-02-20 21:38:31 -05:00
psychobunny
8cfa6e9d83 added panel container without header, closes #1081 2014-02-20 21:35:51 -05:00
psychobunny
ef0b610c3c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 21:32:27 -05:00
psychobunny
86dd01154e closes #1079 2014-02-20 21:32:24 -05:00
Baris Soner Usakli
5aed1208c0 lol this was saving to 'uploadPath' 2014-02-20 21:26:05 -05:00
Julian Lam
2ba11dce15 hiding search buttons and route when search is not configured 2014-02-20 21:21:41 -05:00
Julian Lam
0e26fdf1da Merge branch 'master' into search_hooks 2014-02-20 21:08:31 -05:00
psychobunny
f83cd7c133 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 20:33:40 -05:00
psychobunny
251fef9c27 run plugins.reload after activating widget-essentials 2014-02-20 20:33:37 -05:00
Baris Soner Usakli
74b0da78f4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 20:26:53 -05:00
Baris Soner Usakli
a92fb07f02 fixes multiple click handlers in admin users 2014-02-20 20:26:46 -05:00
psychobunny
fffbb1db34 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 20:23:33 -05:00
psychobunny
8059a83870 activate widget-essentials 2014-02-20 20:23:30 -05:00
Julian Lam
d140fa33dd fixing tab default + removing two calls to code.jquery.com 2014-02-20 20:06:14 -05:00
psychobunny
5de6ea0d97 updated cerulean dep to 0.0.13 2014-02-20 19:57:25 -05:00
psychobunny
fc866e4746 added notice to admins to check out the widgets panel IF motd is not set. upgraded motd to widget for lavender 2014-02-20 19:48:08 -05:00
psychobunny
9a5be0b334 updated lavender dep to 0.0.21 2014-02-20 19:39:22 -05:00
psychobunny
596a622197 updated vanilla dep to 0.0.14 2014-02-20 19:25:40 -05:00
psychobunny
52781bb539 Merge remote-tracking branch 'origin/master' into Widgets 2014-02-20 19:23:02 -05:00
psychobunny
e28589bea8 added jumbotron, alert widgets + color picker for alert and panel 2014-02-20 19:22:34 -05:00
psychobunny
2131506d59 widgets - user friendly instructions 2014-02-20 18:50:17 -05:00
psychobunny
ccf529ccca updated upgrade script to add titles and container to category sidebar widgets 2014-02-20 18:45:38 -05:00
psychobunny
8543d2d437 deprecated hard-coded panels in category sidebar, now you can set custom containers in widget ACP 2014-02-20 18:31:16 -05:00
Baris Soner Usakli
7e825c61bd some login changes 2014-02-20 18:30:15 -05:00
psychobunny
68b9e36218 rendering widget's container 2014-02-20 18:10:06 -05:00
psychobunny
80ce4db764 add container field and title field to all widgets by default 2014-02-20 17:58:12 -05:00
psychobunny
ef65f510a5 fomatting 2014-02-20 17:57:41 -05:00
psychobunny
5acf296ada added containers; drag on top of widgets to set a custom container 2014-02-20 17:12:56 -05:00
Baris Soner Usakli
b82a5461ce more cleanup to user routes 2014-02-20 17:03:08 -05:00
psychobunny
1b557d4141 upgrade.js - add forum stats widget to homepage footer 2014-02-20 16:14:24 -05:00
Baris Soner Usakli
905a99e638 user route cleanup 2014-02-20 16:07:22 -05:00
psychobunny
b821dc70cf moved Forum Stats widget out of core and into widget-essentials 2014-02-20 16:03:25 -05:00
psychobunny
3896cbd732 and fixed it again 2014-02-20 15:39:52 -05:00
psychobunny
c39a951727 fixed widget-essentials dep 2014-02-20 15:33:21 -05:00
psychobunny
068402c8ac wrong upgrade message 2014-02-20 15:31:42 -05:00
psychobunny
ae009e04bd added widgets-essentials to deps 2014-02-20 15:30:26 -05:00
psychobunny
0b3fa0c838 upgrade.js - add recentreplies, activeusers, and moderator widgets to the sidebar as default 2014-02-20 15:28:37 -05:00
Baris Soner Usakli
cec718de26 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-20 15:25:46 -05:00
Baris Soner Usakli
020a70ecb6 removed showemail setting from user hash, its in user settings now 2014-02-20 15:25:39 -05:00
Julian Lam
ac116bc9d0 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-20 15:14:27 -05:00
Julian Lam
94f67f518e fixed issue where a URL as the logo caused apple-touch-icon to explode 2014-02-20 15:13:15 -05:00
Baris Soner Usakli
3be0ad5bce wait for user object to be saved before returning from User.create 2014-02-20 14:53:35 -05:00
Baris Soner Usakli
93130b27d5 insert loggedIn before hash' 2014-02-20 14:37:10 -05:00
Baris Soner Usakli
34bf839751 closes #1067 2014-02-20 13:23:29 -05:00
psychobunny
b4a46339f3 Merge pull request #1075 from BitBangersCode/widgets-fix
Fix crash when there would be no widgets
2014-02-20 13:22:41 -05:00
MrWaffle
502886c3b9 Fix crash when there would be no widgets 2014-02-20 19:18:23 +01:00
Baris Soner Usakli
86556989f4 closes #1068 2014-02-20 12:56:35 -05:00
akhoury
63c9269240 merged composer and some other files with master 2014-02-20 02:25:15 -05:00
akhoury
25207852e8 added topics thumbnails support 2014-02-20 02:05:49 -05:00
Julian Lam
bc10080c49 close #1041 2014-02-19 21:47:26 -05:00
Julian Lam
813ff95146 removing useless jqueryUI CSS 2014-02-19 21:32:05 -05:00
Julian Lam
42d33f8338 first pass #899 2014-02-19 21:06:30 -05:00
Jason Nall
7937ecb6b4 Moved CSS above scripts to ensure CSS files are downloaded in parallel. This can improve page load speed in some browsers. 2014-02-19 20:22:42 -05:00
psychobunny
599027f2d3 send full url to widgets as well so they can parse based on path 2014-02-19 19:28:21 -05:00
psychobunny
18369fae7e fixed bug with sorting of widgets 2014-02-19 19:19:25 -05:00
psychobunny
fa4555e26e moved addActiveUser code to widget-essentials 2014-02-19 19:15:04 -05:00
psychobunny
305ec0da28 removed unused language strings from previous sidebar 2014-02-19 19:10:56 -05:00
psychobunny
835b4d61a2 removed active_users + moderator sidebar code from core in favour of widget system 2014-02-19 19:07:56 -05:00
psychobunny
cb986186a1 removing recent replies code + tpls from the core in favour of widget system 2014-02-19 18:53:28 -05:00
Julian Lam
fdd2dc322b first pass #992 2014-02-19 18:44:31 -05:00
psychobunny
1827c8390b filter:category.build_sidebars (custom sidebars in category view) is now deprecated 2014-02-19 18:19:25 -05:00
psychobunny
eda7455be2 using motd class instead of a well 2014-02-19 18:16:18 -05:00
Julian Lam
37bd88d1b2 faux masonry lol 2014-02-19 18:15:55 -05:00
psychobunny
aea7329871 animate page load only after widgets load 2014-02-19 18:15:19 -05:00
Julian Lam
f4ad1ac2dc moving active users list to bottom of admin index 2014-02-19 18:14:15 -05:00
psychobunny
ba657aec4e 110% -> upgrade.js converts existing motd's to html widgets for extra bonus points. 2014-02-19 18:13:56 -05:00
psychobunny
163b0f964e Merge remote-tracking branch 'origin/master' into Widgets 2014-02-19 17:45:40 -05:00
psychobunny
0963e62acb completely removing all motd code in favour of using the widget system 2014-02-19 17:31:13 -05:00
Julian Lam
f50d77bca0 resolved #1060 2014-02-19 17:23:25 -05:00
psychobunny
c0df95b2dc render widgets upon ajaxify - this widget feetorez iz completified! 2014-02-19 17:23:17 -05:00
psychobunny
c4121f6ee6 bugfixes in widgets 2014-02-19 17:22:26 -05:00
psychobunny
79e9819b7f SocketWidgets file 2014-02-19 17:11:07 -05:00
psychobunny
b3978d53bb widgets.render 2014-02-19 17:07:47 -05:00
psychobunny
37d673028a added async to client side 2014-02-19 17:07:19 -05:00
Baris Soner Usakli
ea222c4f8a crash fix for notifications, removed exec_body_script, closes #1058 2014-02-19 16:44:36 -05:00
psychobunny
4e1b3506e8 allow plugins/widgets to define widgets; moved sample widgets out of core and into nodebb-widget-essentials 2014-02-19 16:11:16 -05:00
psychobunny
f4ad1bdeae console.log 2014-02-19 15:43:05 -05:00
Baris Soner Usakli
fd3efd59f9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-19 15:34:06 -05:00
Baris Soner Usakli
495fded6dd closes #1038 2014-02-19 15:33:59 -05:00
Julian Lam
3107e43b64 cleaned up admin panel index a bit 2014-02-19 15:24:39 -05:00
psychobunny
26b0db3bea let plugins.js allow widgets to utilize hooks 2014-02-19 15:14:49 -05:00
psychobunny
86a8103c15 saving, updating, deleting widgets; widget dragging improvements 2014-02-19 15:07:38 -05:00
Julian Lam
0d7e47ded7 closed #1057 2014-02-19 14:47:00 -05:00
Julian Lam
7c7f66c08b bringing language files up to date 2014-02-19 14:34:50 -05:00
Julian Lam
3fdd0c1bff Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-19 14:33:37 -05:00
Julian Lam
031e8128c7 fixed #912, added new page string for popular topics 2014-02-19 14:33:34 -05:00
Baris Soner Usakli
7e2823bf30 show recent event data first' 2014-02-19 13:57:09 -05:00
Baris Soner Usakli
ab60da30da Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-19 13:30:39 -05:00
Baris Soner Usakli
520b349c17 closes #1044 2014-02-19 13:30:31 -05:00
psychobunny
9f8f78f6d4 client-side saving of widgets 2014-02-19 13:22:02 -05:00
psychobunny
447cff1995 got the basic ui, dragging, sorting etc going for widgets acp 2014-02-19 12:46:55 -05:00
psychobunny
fa5f528fb5 filter:widgets.getAreas - allows plugins to define widget locations in tpls 2014-02-19 11:43:25 -05:00
psychobunny
8f972d8cdc added widgets tab to themes acp 2014-02-19 11:38:31 -05:00
psychobunny
6496ad95e8 Revert "closes #992"
This reverts commit ed4b0461b9.
2014-02-19 02:07:48 -05:00
Baris Soner Usakli
bbe1a00d34 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-18 23:06:26 -05:00
Baris Soner Usakli
f33256d628 fixes error alerts if scroll is triggered during transitions 2014-02-18 23:06:18 -05:00
Julian Lam
b5496b5680 fixed executable help echo 2014-02-18 19:41:50 -05:00
Julian Lam
bc7eb501c8 same for topics (translation + pagination) 2014-02-18 19:41:02 -05:00
Julian Lam
0b0b74a559 properly translating strings in category nojs template, and added pagination (so not all topics are loaded on every request) 2014-02-18 19:23:36 -05:00
psychobunny
b71f1a410e added reset flag to ./nodebb script 2014-02-18 22:46:44 +00:00
psychobunny
e912ce038b closes #1035 2014-02-18 17:43:32 -05:00
Baris Soner Usakli
9a02f85620 update motd string 2014-02-18 16:00:59 -05:00
Baris Soner Usakli
8518f26adb closes #1023 2014-02-18 15:46:03 -05:00
Baris Soner Usakli
6140d76f76 fixed index of newly created posts, matched vanilla search form to lavender 2014-02-18 15:14:33 -05:00
Baris Soner Usakli
17cee2cb99 pagination fix if only 1 topic 2014-02-18 12:40:13 -05:00
Baris Soner Usakli
e1f016c075 closes #1046 2014-02-18 12:16:33 -05:00
Baris Soner Usakli
3993259336 closes #1055 2014-02-18 11:48:28 -05:00
Julian Lam
172b617cbc using 'trust proxy' on proxied requests 2014-02-18 10:34:56 -05:00
Julian Lam
3b4985efe5 tx translation update 2014-02-18 10:30:11 -05:00
Baris Soner Usakli
1712fcc9fe dont scroll to 0th post 2014-02-18 01:18:37 -05:00
Baris Soner Usakli
229fe2f80f seems to work better for long posts 2014-02-18 00:42:14 -05:00
Baris Soner Usakli
7aa38adb52 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-18 00:25:37 -05:00
Baris Soner Usakli
83ad454c3e better error message if image upload fails, #1052 2014-02-18 00:25:30 -05:00
psychobunny
d69835e115 allow any hash to be pushed to history 2014-02-18 00:00:42 -05:00
psychobunny
1e47953efd expanding hash regex to alphanumeric 2014-02-17 23:58:47 -05:00
Baris Soner Usakli
9d1a295b85 better topic delete restore 2014-02-17 22:53:01 -05:00
Baris Soner Usakli
9b88dcdc14 removed double if 2014-02-17 21:37:36 -05:00
Baris Soner Usakli
92ebf2975a possible fix for #1050 2014-02-17 21:32:00 -05:00
Baris Soner Usakli
a620a85d85 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-17 20:57:19 -05:00
Baris Soner Usakli
21367a1847 reverse infinite loading 2014-02-17 20:57:12 -05:00
psychobunny
ed4b0461b9 closes #992 2014-02-17 17:47:03 -05:00
Baris Soner Usakli
7918a23835 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-17 12:57:45 -05:00
Baris Soner Usakli
1da75866f4 added global loggedIn to templates' 2014-02-17 12:57:37 -05:00
Julian Lam
e4812fab87 removing console.log 2014-02-17 12:57:26 -05:00
Baris Soner Usakli
e665b79293 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-16 16:20:50 -05:00
Baris Soner Usakli
93257a8597 check if tids and uids array array before calling async 2014-02-16 16:20:44 -05:00
Julian Lam
560fa6ffe8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-16 12:21:49 -05:00
Julian Lam
8e4c126e3c fixing template in favourites.tpl 2014-02-16 12:21:46 -05:00
Baris Soner Usakli
d3f5f9571a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-16 12:15:27 -05:00
Baris Soner Usakli
0ec9f3835f fixed js error in composer 2014-02-16 12:15:20 -05:00
Julian Lam
1a962c03f4 Hungarian, Norwegian, and Polish translation strings updated from Tx 2014-02-16 11:40:59 -05:00
Baris Soner Usakli
0756410684 closes #1012 2014-02-16 11:36:11 -05:00
Baris Soner Usakli
d75cdf8b9f check err firsT 2014-02-16 11:13:37 -05:00
Julian Lam
c6ce42968d Merge pull request #1042 from miksago/config-file-fix
Fix configFile option handling
2014-02-16 00:52:13 -05:00
Micheil Smith
74049dccb1 Added log message about where configuration is being loaded from 2014-02-16 05:36:29 +00:00
Micheil Smith
0672c7276d Fix nconf.file not really using config file 2014-02-16 05:35:44 +00:00
Baris Soner Usakli
8eeb962ebc fixed small bug 2014-02-15 17:17:15 -05:00
Baris Soner Usakli
43e8016dd1 fixes admin user picture edit 2014-02-15 17:12:05 -05:00
Baris Soner Usakli
30cc992f5e closes #1036 2014-02-15 16:12:33 -05:00
Julian Lam
9e64f4e303 passing in a picture into notifications now 2014-02-15 15:43:44 -05:00
Julian Lam
ef45ae9ba3 fixed the rotating bell in notifications loading LOL 2014-02-15 15:14:17 -05:00
Julian Lam
07bd4d68d6 updating mentions minver 2014-02-15 14:54:32 -05:00
Julian Lam
aba1b95cac updating notifications.create to accept a hash instead of discrete arguments - breaking change 2014-02-15 14:52:59 -05:00
Julian Lam
17ae56e555 fixed #1027 2014-02-15 14:16:15 -05:00
Julian Lam
32b0b1f9fc #1034 2014-02-15 14:01:20 -05:00
Julian Lam
ce7c8c9495 updating translations 2014-02-15 12:28:46 -05:00
Julian Lam
d230b17517 polish tx format update 2014-02-15 12:27:18 -05:00
Julian Lam
0c3b3c288f added polish to tx config 2014-02-15 12:25:06 -05:00
unek
bea44ddd18 added polish language 2014-02-15 13:29:02 +01:00
Baris Soner Usakli
8b8fbfa113 added 3 more strings to translations 2014-02-14 22:36:07 -05:00
Baris Soner Usakli
fec1b75030 fixes pagination block on direct page load 2014-02-14 21:41:53 -05:00
Baris Soner Usakli
791a50a01b closes #1028 2014-02-14 20:46:00 -05:00
Baris Soner Usakli
884d42a363 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-14 19:40:45 -05:00
Baris Soner Usakli
0c093c2aaa fixes upgrade on a empty database 2014-02-14 19:40:38 -05:00
Julian Lam
01f2e7dccd 0.3.2 2014-02-14 15:25:18 -05:00
Baris Soner Usakli
893efa5f2a closes #1004 2014-02-14 15:08:56 -05:00
Baris Soner Usakli
8c14a59f93 added new sorted set posts:pid 2014-02-14 14:39:32 -05:00
Baris Soner Usakli
4663e0b8be paranoid 2014-02-14 14:14:05 -05:00
Baris Soner Usakli
1e44ca3a0f upgrade topics:tid to sorted set, topics:recent doesnt have deleted topics 2014-02-14 14:03:54 -05:00
Baris Soner Usakli
8506819a7d added back error check 2014-02-14 13:40:11 -05:00
Baris Soner Usakli
6ddf977166 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-14 13:38:17 -05:00
Baris Soner Usakli
c0e0da0f1d simplified getAllTopics 2014-02-14 13:38:10 -05:00
Julian Lam
8af5e089ff slovak translations by @yangwao 2014-02-14 12:16:23 -05:00
Micheil Smith
ee0f9d2bbe Rename themes_dir to themes_path for consistency with other configuration options 2014-02-14 17:11:25 +00:00
Julian Lam
55aef372e8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-14 12:00:51 -05:00
Julian Lam
15e1b7e571 updating source string for notif message 2014-02-14 12:00:41 -05:00
Baris Soner Usakli
e5727af959 added missing winston to emailer 2014-02-14 11:58:51 -05:00
Julian Lam
d933e81b37 fixed #1025 2014-02-14 11:49:16 -05:00
Julian Lam
734d8f96e8 fixing symbols in plugin static path filenames -- can I tag people in commit messages? @frissdiegurke 2014-02-14 11:38:16 -05:00
Julian Lam
d0d3160fc7 final pass, #999 2014-02-14 11:04:00 -05:00
Julian Lam
8bd6f85478 first pass, #999 2014-02-14 10:49:43 -05:00
Julian Lam
28731e2dbd minor typo, and a fix I missed 2014-02-14 01:05:38 -05:00
Julian Lam
f698166395 minor fixes to paths accidentally introduced in #1020 2014-02-14 00:23:54 -05:00
Julian Lam
9d8aff5e63 fixed theme previews 2014-02-14 00:19:36 -05:00
Julian Lam
b6b795dbc6 Merge pull request #1020 from miksago/themes_dir
Implemented `themes_dir` configuration option.
2014-02-14 00:11:52 -05:00
Micheil Smith
a857d4cab0 Added logging on start up detailing where themes are being loaded from. 2014-02-14 05:04:08 +00:00
Micheil Smith
8866de8b30 Improved logging at startup 2014-02-14 05:03:38 +00:00
Micheil Smith
ceffd2e1e0 Remove warnings about themes being out of date 2014-02-14 05:02:17 +00:00
Micheil Smith
691fde0a27 Added ability to change where themes are stored via themes_dir configuration option
themes_dir is resolved to be relative to the root of the NodeBB install.
2014-02-14 05:01:02 +00:00
Julian Lam
20c95731ae Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-13 22:38:59 -05:00
Julian Lam
bbdcd5d460 resolved #997 2014-02-13 22:38:24 -05:00
Baris Soner Usakli
a909a25393 closes #1016 2014-02-13 21:06:41 -05:00
Baris Soner Usakli
695891ffd7 added missing file 2014-02-13 20:43:19 -05:00
Baris Soner Usakli
bdc93409a7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-13 19:42:00 -05:00
Baris Soner Usakli
075c6c01f2 upload changes, show progres in composer 2014-02-13 19:41:54 -05:00
psychobunny
fe2e86da81 added optional 'reverse' parameter to Posts.getPostsByTid and Topics.getTopicPosts (incoming signature adjustment for 0.4x) 2014-02-13 15:21:24 -05:00
psychobunny
1f8f65308b added api/user/uid route 2014-02-13 14:08:16 -05:00
Julian Lam
843cb1b35b fixed #936 2014-02-13 13:51:00 -05:00
Julian Lam
cb012ffa7a #936 2014-02-13 13:10:40 -05:00
Julian Lam
750ce1f7f8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-13 12:26:46 -05:00
Julian Lam
e2c6eca36e fixed #1006 2014-02-13 12:26:43 -05:00
Baris Soner Usakli
99a212d141 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-13 11:35:34 -05:00
Baris Soner Usakli
ce4896f2c5 fixed read notifications 2014-02-13 11:35:27 -05:00
Julian Lam
3e3250ccde pull-right first, then pull-left. 2014-02-12 22:50:41 -05:00
Baris Soner Usakli
9f663411db brand logo fix 2014-02-12 22:31:08 -05:00
Baris Soner Usakli
d4bc6904fb fixed socket crash 2014-02-12 17:30:49 -05:00
Baris Soner Usakli
53af836bdb 24 users 2014-02-12 17:29:37 -05:00
Baris Soner Usakli
7f4a1cd685 display 4 rows of active users 2014-02-12 17:24:51 -05:00
Baris Soner Usakli
1c14bcd1ed dont update last online time if status is offline 2014-02-12 17:16:16 -05:00
Baris Soner Usakli
b912dcb2f0 topic title 2014-02-12 16:02:07 -05:00
Baris Soner Usakli
896af72a25 added topic title to header 2014-02-12 15:44:48 -05:00
Baris Soner Usakli
ab9ff94713 fw changes 2014-02-12 14:03:02 -05:00
Baris Soner Usakli
860aabe0d3 oops fixed 2014-02-12 13:15:13 -05:00
Baris Soner Usakli
7b4f098cb4 dont allow negative or zero pagination values for user setting 2014-02-12 13:11:28 -05:00
Baris Soner Usakli
ccfa5bd618 copy pasta is bad for your health 2014-02-12 12:51:07 -05:00
Baris Soner Usakli
a4fd972b2b fixed again fail 2014-02-12 12:50:09 -05:00
Baris Soner Usakli
c703dba3dd closes #1009 2014-02-12 12:46:56 -05:00
Baris Soner Usakli
d0100176ef Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-12 12:31:15 -05:00
Baris Soner Usakli
7f298c596f fixed category save 2014-02-12 12:31:08 -05:00
Julian Lam
a106211956 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-12 12:11:34 -05:00
Julian Lam
bc1df3b10c sv translations 2014-02-12 12:11:26 -05:00
Baris Soner Usakli
2a41c3a312 crash fix 2014-02-12 11:35:53 -05:00
Baris Soner Usakli
639ebe9b71 added space to fix motd 2014-02-12 11:34:18 -05:00
Baris Soner Usakli
475f9bea04 closes #1011, last online wont give away your invisible status 2014-02-12 10:53:34 -05:00
Baris Soner Usakli
dcebb0cc4c removed whitespace 2014-02-12 10:43:32 -05:00
Baris Soner Usakli
4c6fb72db0 move cursor to end in share input 2014-02-12 10:36:17 -05:00
Baris Soner Usakli
b5d31dd889 replace eachSeries with map 2014-02-12 10:03:28 -05:00
Baris Soner Usakli
400af61e12 fixed minor issue, removed unused postPerPage 2014-02-12 09:42:52 -05:00
Baris Soner Usakli
9f1e0187ee fixed settings 2014-02-12 00:09:02 -05:00
Baris Soner Usakli
a813b3639e another eachSeries gone horray 2014-02-11 23:44:14 -05:00
Baris Soner Usakli
c560f8fb75 reduced DRY fail 2014-02-11 23:38:25 -05:00
Baris Soner Usakli
8456025f28 2 more maps 2014-02-11 23:14:41 -05:00
Baris Soner Usakli
5e0435677b function name is good enough :) 2014-02-11 23:00:13 -05:00
Baris Soner Usakli
a8e5c7d149 error checks more err first, replaced a eachSeries with async.map 2014-02-11 22:57:01 -05:00
Baris Soner Usakli
1b5e44a763 fix unreplied on getTopic 2014-02-11 22:27:40 -05:00
Baris Soner Usakli
521b3f02be removed log, lol 2014-02-11 20:40:06 -05:00
Baris Soner Usakli
bb59158bbc closes #721, admins can edit other users from their edit page 2014-02-11 20:39:07 -05:00
Baris Soner Usakli
1861273d45 delegated event for category save 2014-02-11 19:44:11 -05:00
Baris Soner Usakli
a274a8cc12 more unread changes 2014-02-11 18:58:46 -05:00
Baris Soner Usakli
859ca8dd18 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-11 18:22:11 -05:00
Baris Soner Usakli
d27ba5239e unread changes 2014-02-11 18:22:02 -05:00
psychobunny
ecb1fa928c console.log 2014-02-11 17:58:27 -05:00
psychobunny
ef9965832a updating account settings templates + client side to allow for dynamic parsing of user settings 2014-02-11 17:57:30 -05:00
psychobunny
53ef9c1b9f new hook - filter:user.settings allows plugins to generate custom user settings on account page 2014-02-11 17:57:29 -05:00
psychobunny
ad9209ec38 modifying user.getSettings / user.saveSettings to allow passing in custom data 2014-02-11 17:57:29 -05:00
psychobunny
225e8c012b SocketUser.getSettings 2014-02-11 17:57:28 -05:00
Baris Soner Usakli
85d4bc7232 fixed event log 2014-02-11 17:44:44 -05:00
Baris Soner Usakli
8ca3b667c7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-11 17:16:23 -05:00
Baris Soner Usakli
4ff62f4e30 closes #1005 2014-02-11 17:16:17 -05:00
psychobunny
2781153640 removed some unused stuff in account settings 2014-02-11 16:48:34 -05:00
psychobunny
4f1f812062 reorganizing account settings 2014-02-11 16:48:34 -05:00
Baris Soner Usakli
39ec9e9ecb Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-11 16:44:05 -05:00
Baris Soner Usakli
02048e551f assorted CP changes 2014-02-11 16:43:57 -05:00
psychobunny
8dfd8c3bbb README - OK I promise I won't touch this again for at least a few months. 2014-02-11 15:42:15 -05:00
psychobunny
804997862b decided to move screenshots back up one level since we're using thumbnails instead 2014-02-11 15:28:33 -05:00
psychobunny
666cb4c927 README: forgot to credit manchester united forums 2014-02-11 15:26:48 -05:00
psychobunny
2c7ec620d0 README: added a few more screenshots to even things up a bit; emphasis on like/follow/star 2014-02-11 15:25:47 -05:00
Baris Soner Usakli
2f84a0a130 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-11 15:13:09 -05:00
Baris Soner Usakli
daa1154797 added timing to prune 2014-02-11 15:13:02 -05:00
psychobunny
ec21ea5df4 README: using thumbnails instead 2014-02-11 15:11:48 -05:00
psychobunny
a05f17b702 updated README: added links to blog, plugins, themes; added new screenshots (old ones were 0.2x); other minor changes 2014-02-11 15:01:37 -05:00
Baris Soner Usakli
11b0f44ae9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-11 14:40:50 -05:00
Baris Soner Usakli
20dd194171 show error in composer if upload fails 2014-02-11 14:40:43 -05:00
Julian Lam
01f7caa3af Proper handling of windows path separators in plugin js gets 2014-02-11 10:57:51 -05:00
Julian Lam
6d1ec8c7fe hebrew translations by orweinberger 2014-02-11 09:35:41 -05:00
Baris Soner Usakli
d0452dcc80 small pagination fix 2014-02-10 22:45:52 -05:00
Baris Soner Usakli
bc7fd3a724 fix for favicon 2014-02-10 22:24:36 -05:00
Baris Soner Usakli
cacde313cd closes #995 2014-02-10 19:59:04 -05:00
Baris Soner Usakli
fba16fdfce Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-10 19:14:57 -05:00
Baris Soner Usakli
55951fec6f removed marked from motd' 2014-02-10 19:14:50 -05:00
psychobunny
e8d30da006 removing qunit from ACP, since we don't actually use it anymore 2014-02-10 17:44:05 -05:00
Julian Lam
4429014d2f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-10 17:32:04 -05:00
Julian Lam
97e52fd169 adding new client-side hook and post_uuid to composer template 2014-02-10 17:31:51 -05:00
Baris Soner Usakli
84446e255d added parseInt 2014-02-10 16:32:47 -05:00
Barış Soner Uşaklı
2f764dcbb5 Merge pull request #991 from Maxorq/master
No point in having anonymous users as a link.
2014-02-10 14:42:17 -05:00
Maciej Benke
34338c3265 No point in having anonymous users as a link. 2014-02-10 20:35:35 +01:00
Baris Soner Usakli
b75877d61f some language strings 2014-02-10 14:21:45 -05:00
Baris Soner Usakli
8e756b5b26 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-10 14:15:58 -05:00
Baris Soner Usakli
242927d702 user selectable pagination 2014-02-10 14:15:54 -05:00
psychobunny
8c2611aeb5 potentially fixes #823 2014-02-10 14:05:09 -05:00
psychobunny
83a201acce closes #918 2014-02-10 13:55:47 -05:00
Julian Lam
e231a52369 new translations, plus fallbacks for new strings to English 2014-02-10 13:31:53 -05:00
Julian Lam
f24e6bdace Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-10 13:30:31 -05:00
Julian Lam
55b39f1eff second pass, #981 2014-02-10 13:30:26 -05:00
psychobunny
d02a1ef40a actually fixes #985 2014-02-10 13:29:59 -05:00
Julian Lam
e9852a804c language updates 2014-02-10 13:00:20 -05:00
Julian Lam
5f8bfaa871 reverting some fixes 2014-02-10 12:51:52 -05:00
Julian Lam
8f369d9dbc added 'topic' back to string 2014-02-10 12:47:01 -05:00
Julian Lam
37a1fbd9cd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-10 12:41:34 -05:00
Julian Lam
b6e96541e7 first pass, #981 2014-02-10 12:41:29 -05:00
Baris Soner Usakli
93f5f320fe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-10 12:27:46 -05:00
Baris Soner Usakli
02483b34bf closes #987 2014-02-10 12:27:43 -05:00
Julian Lam
3bdbd28532 removing console log in search template 2014-02-10 12:02:28 -05:00
Julian Lam
5b8585fafb fixed #985 2014-02-10 11:54:47 -05:00
Julian Lam
92d029f072 removed regex removal of @first block on infinite post load in favour of DOM method 2014-02-10 11:41:25 -05:00
psychobunny
ff9d7c6c24 removed unnecessary conditionals from app.updateHeader 2014-02-10 10:45:24 -05:00
Baris Soner Usakli
ca8f86c4ee fixed minor issue in prev PR 2014-02-09 18:49:34 -05:00
Barış Soner Uşaklı
8fad323d80 Merge pull request #984 from miksago/reorg-feed-routes
Move feed routing and logic to src/routes/feeds.js
2014-02-09 18:46:31 -05:00
Baris Soner Usakli
6ab5f42ef0 only update anon count if on online page 2014-02-09 18:45:41 -05:00
Micheil Smith
33607e0cd9 Move feed routing and logic to src/routes/feeds.js 2014-02-09 23:23:17 +00:00
Barış Soner Uşaklı
fdfe796fe3 Merge pull request #983 from miksago/improve-startup
Reworked startup sequence to respect server.listen() failures and timings
2014-02-09 18:13:26 -05:00
Micheil Smith
8cd1005a03 Reworked startup sequence to respect server.listen() failures and timings. 2014-02-09 23:07:12 +00:00
Julian Lam
83b22a357c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-09 17:22:57 -05:00
Julian Lam
03a30c8583 temporarily commenting out apple-touch-icon, since it seems to be duplicating sessions on every reload 2014-02-09 17:22:38 -05:00
Baris Soner Usakli
6d8a1eb1f4 removed console.log 2014-02-09 17:14:56 -05:00
Baris Soner Usakli
49254f268e added missing next callbacks 2014-02-09 17:14:31 -05:00
Baris Soner Usakli
654f53f142 removed unused uids 2014-02-09 17:03:25 -05:00
Baris Soner Usakli
d063d4eac1 updated upgrade date 2014-02-09 17:00:45 -05:00
Barış Soner Uşaklı
59e56f0e28 Merge pull request #979 from miksago/ondemand-feeds
On-demand feeds
2014-02-09 16:55:43 -05:00
Micheil Smith
ffe798b494 Change Feed.forTopic to cap at 25 items, not infinite 2014-02-09 21:33:20 +00:00
Micheil Smith
a3bb9f4e3d Changed feeds to be generated on-demand
No longer are we writing them to disk, instead, we simply generate on demand.
2014-02-09 21:29:21 +00:00
Micheil Smith
12b52e5320 Removed storage of tid:lastFeedUpdate now that feeds are on-demand 2014-02-09 21:26:11 +00:00
Micheil Smith
cfaa0b3754 Added schema upgrade to delete the tid:lastFeedUpdate key 2014-02-09 21:25:28 +00:00
Julian Lam
5b16223923 proper RTL handling f hebrew and arabic 2014-02-09 15:52:02 -05:00
Julian Lam
b0bd015389 dir settings for languages 2014-02-09 15:48:49 -05:00
Julian Lam
88fe989fa2 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-09 15:41:29 -05:00
Julian Lam
e578b76b49 dir string in language 2014-02-09 15:41:23 -05:00
Micheil Smith
c619301735 Remove calls to feed.js 2014-02-09 20:34:11 +00:00
Baris Soner Usakli
e18d9dc1b4 closes #975 2014-02-09 15:11:58 -05:00
Baris Soner Usakli
2c18bbddbe upload changes, just pass filename to plugin or base64 data 2014-02-09 14:51:18 -05:00
Julian Lam
daa76e821c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-09 13:24:51 -05:00
Julian Lam
2075049ae0 default en_GB 2014-02-09 13:24:45 -05:00
Baris Soner Usakli
042df13611 merged 2014-02-09 13:09:36 -05:00
Baris Soner Usakli
253c19abeb removed unused var added error log 2014-02-09 13:08:25 -05:00
Julian Lam
62f1b8b8f4 retrieving only the latest 25 posts in category rss feed now - issue #973 2014-02-09 12:35:26 -05:00
Julian Lam
7d736f9352 fixed hebrew language string and introducing fallback to english if wrong language is set 2014-02-09 12:15:47 -05:00
Julian Lam
90cd46815a adding Hebrew language 2014-02-09 12:03:25 -05:00
Julian Lam
7644ae1c21 removing npm from apt-get install command 2014-02-09 10:10:30 -05:00
Baris Soner Usakli
194c404857 more fixes to admin users 2014-02-09 01:45:56 -05:00
Baris Soner Usakli
0719baf8b2 fixes error in admin users page 2014-02-09 01:37:27 -05:00
Baris Soner Usakli
cbe13b6069 language fixes 2014-02-09 01:25:19 -05:00
Baris Soner Usakli
1c058658e6 small tweak 2014-02-09 00:47:08 -05:00
Baris Soner Usakli
20ec8ca768 added image file 2014-02-09 00:34:05 -05:00
Baris Soner Usakli
26849ba2b7 added hooks for image uploads into user and admin routes 2014-02-09 00:33:10 -05:00
Baris Soner Usakli
e163282995 added filter:post.uploadFile 2014-02-08 22:34:50 -05:00
Baris Soner Usakli
1fc4568333 changed hook name to filter:post.uploadImage 2014-02-08 22:21:57 -05:00
Baris Soner Usakli
378ccc3cb7 removed imgur from core 2014-02-08 22:09:28 -05:00
Baris Soner Usakli
94588e15f2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-08 21:02:13 -05:00
Baris Soner Usakli
0f2e7fa8bd added a hook to post image upload for starters, more coming 2014-02-08 21:02:06 -05:00
Julian Lam
b5e8c6aeae pushing fr translation updates 2014-02-08 17:08:22 -05:00
Baris Soner Usakli
c78942b7a4 added warnings if no pwd setup for db, #936 2014-02-08 14:05:45 -05:00
Baris Soner Usakli
2630a72f81 closes #965 2014-02-08 13:58:40 -05:00
Baris Soner Usakli
64687fef6a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-08 13:44:26 -05:00
Baris Soner Usakli
c219935633 cleanup 2014-02-08 13:44:15 -05:00
Julian Lam
5a1046f15f Adding Русский language 2014-02-08 12:00:23 -05:00
Julian Lam
7ea379d4f1 added client side hooks: "action:topic.loading" and "action:topic.loaded" 2014-02-08 00:53:35 -05:00
Baris Soner Usakli
27381bfc35 misc responsive fixes 2014-02-07 22:18:18 -05:00
Baris Soner Usakli
3b1c26eae6 removed well from search tpl 2014-02-07 21:40:44 -05:00
Baris Soner Usakli
7dd2412655 profile 2014-02-07 21:28:05 -05:00
Baris Soner Usakli
d5938e4024 removed BS class, not needed 2014-02-07 20:44:10 -05:00
Baris Soner Usakli
0c4f0dff6f closes #962 2014-02-07 20:30:10 -05:00
Baris Soner Usakli
917458d48d minor cleanup 2014-02-07 20:04:14 -05:00
Baris Soner Usakli
e06a7a343a userslug for new chat messages 2014-02-07 19:29:54 -05:00
Baris Soner Usakli
7531d9dd2c fixes username in account page 2014-02-07 16:58:56 -05:00
Baris Soner Usakli
1d5239b9a5 closes #966 2014-02-07 16:24:09 -05:00
Baris Soner Usakli
d4c2a47c8e allow images in home and category 2014-02-07 15:00:53 -05:00
Baris Soner Usakli
e4c92880ea Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-07 13:25:21 -05:00
Baris Soner Usakli
b2d3578eac check if callback is function 2014-02-07 13:25:14 -05:00
Julian Lam
0670382992 final pass - resolved #961 2014-02-07 12:47:19 -05:00
Baris Soner Usakli
8da065d8fd Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-07 12:28:01 -05:00
Baris Soner Usakli
9b147edb36 closes #964 2014-02-07 12:27:55 -05:00
Julian Lam
69f90c0766 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-07 12:11:18 -05:00
Julian Lam
f8ea87b003 issue #961 - fixed bug where if a moderators group was not found, it would cause the active users box to derp out. Also renamed the moderators priv group name 2014-02-07 12:10:46 -05:00
Baris Soner Usakli
d6780652ad closes #960 2014-02-07 12:09:24 -05:00
Baris Soner Usakli
8efea65e87 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-07 11:45:19 -05:00
Baris Soner Usakli
72c35db6fd cleanup in move rencet replies' 2014-02-07 11:45:13 -05:00
Julian Lam
e176abae50 started #961, first pass 2014-02-07 11:21:23 -05:00
Baris Soner Usakli
d2bed7791c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-06 18:40:10 -05:00
Baris Soner Usakli
a142789c25 if status is not set assume online 2014-02-06 18:40:01 -05:00
psychobunny
3c863feac2 fixes translation bug with app.alert 2014-02-06 17:21:58 -05:00
Baris Soner Usakli
a1807f3e12 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-06 17:12:19 -05:00
Baris Soner Usakli
11e8fa31ab small fix to online user visiblity 2014-02-06 17:12:13 -05:00
Julian Lam
720644b964 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-06 17:09:50 -05:00
Julian Lam
d360a9bcac resolved #868 2014-02-06 17:09:36 -05:00
Baris Soner Usakli
1bde667245 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-06 16:58:50 -05:00
Baris Soner Usakli
f05dc95aa5 removed console.log 2014-02-06 16:58:43 -05:00
psychobunny
a9fbd5be8a derp, upgrade was upvoting your own favourited posts as well 2014-02-06 16:55:41 -05:00
psychobunny
d9f61385ca cleanup 2014-02-06 16:50:39 -05:00
psychobunny
2c81d1f2d9 half hearted deprecation warning (maybe for 0.5x?) 2014-02-06 16:50:39 -05:00
psychobunny
37affe2489 no need to use mget, app.alert already translates 2014-02-06 16:50:38 -05:00
psychobunny
1b1bdd7912 upgrade script upvotes all previously favourited posts 2014-02-06 16:50:37 -05:00
psychobunny
1e955b769b refactoring favourites 2014-02-06 16:50:37 -05:00
psychobunny
25a6302c01 upvoting / downvoting complete 2014-02-06 16:50:36 -05:00
psychobunny
af805d3ca4 Favourites.hasVoted 2014-02-06 16:50:36 -05:00
psychobunny
d35dc2d89b favouriting no longer affects reputation 2014-02-06 16:50:35 -05:00
psychobunny
6ffab73784 removing reputation from favourites, adding voting buttons to template 2014-02-06 16:50:34 -05:00
psychobunny
ef1fdbed71 server-side voting logic 2014-02-06 16:50:34 -05:00
psychobunny
cf3f72feb9 client-side voting logic 2014-02-06 16:50:33 -05:00
psychobunny
113e5a381b voting en_GB lang keys 2014-02-06 16:50:33 -05:00
psychobunny
60ec23b200 upvote/downvote/unvote socket calls 2014-02-06 16:50:32 -05:00
Baris Soner Usakli
71c64de8bb pass error to next 2014-02-06 16:35:14 -05:00
Baris Soner Usakli
493ea79a0b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-06 16:32:16 -05:00
Baris Soner Usakli
56cdc86a37 took out userSockets, using io.sockets.clients() now' 2014-02-06 16:32:11 -05:00
Julian Lam
4e776cad96 fixing unintentional bolding in category view in Turkish language 2014-02-06 16:19:50 -05:00
Julian Lam
b7cb0d02f8 resolved #944 2014-02-06 16:02:42 -05:00
Julian Lam
1e7adda054 for #944 2014-02-06 15:58:27 -05:00
Julian Lam
f3b2771802 fixing indentation 2014-02-06 15:50:49 -05:00
Julian Lam
054fd46924 Merge branch 'master' of github.com:greynaert/NodeBB into greynaert-master 2014-02-06 15:49:48 -05:00
Julian Lam
0fd9a88a3e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-06 15:45:30 -05:00
Julian Lam
f949af70ad fixed #949 2014-02-06 15:45:21 -05:00
ferncoder
9fede2cb05 (issue #929) Admin users can now see offline users
Add the check of the req.user to allow anonymous user to watch de /user
pages
2014-02-06 21:12:12 +01:00
Baris Soner Usakli
dc592853fc closes #942 2014-02-06 14:27:37 -05:00
ferncoder
183f27b167 (issue #929) Admin users can now see offline users
https://github.com/designcreateplay/NodeBB/issues/929
2014-02-06 19:35:58 +01:00
Baris Soner Usakli
dedf4add53 better incr for mongo 2014-02-06 00:00:21 -05:00
Baris Soner Usakli
a0195ffa32 fixes users online loadmore 2014-02-05 22:49:10 -05:00
Baris Soner Usakli
3e92644104 removed console.log 2014-02-05 21:20:31 -05:00
Baris Soner Usakli
6d866ccc86 chat profile picture will go to users profile 2014-02-05 20:29:13 -05:00
Baris Soner Usakli
8ef9d787f5 human readable profile page numbers 2014-02-05 20:20:04 -05:00
Baris Soner Usakli
01cb67d1f3 closes #945 2014-02-05 18:25:13 -05:00
Baris Soner Usakli
a01008cf7d only logged in users increase profile view count 2014-02-04 19:19:57 -05:00
Baris Soner Usakli
d83b45a427 changed placed 2014-02-04 18:43:31 -05:00
Baris Soner Usakli
388532eedc closes #943 2014-02-04 18:16:45 -05:00
Baris Soner Usakli
9823ff0960 more fixes 2014-02-04 18:06:38 -05:00
Baris Soner Usakli
c17b8ae9a1 fixes 2014-02-04 17:46:28 -05:00
Baris Soner Usakli
574e981de9 closes #831, user profile changes 2014-02-04 17:31:05 -05:00
psychobunny
3c63b135c7 closes #939 2014-02-04 11:50:50 -05:00
psychobunny
cecd3fe969 adding return false to favouriting and following. using jq for follow code 2014-02-04 10:37:33 -05:00
Julian Lam
5c957e8f8b Merge pull request #940 from pillows/master
We must advance!
2014-02-04 04:47:49 -08:00
Hack Pie
c8208f2a3e We must advance! 2014-02-04 02:18:43 -05:00
Julian Lam
15728e90f6 okay, ACTUALLY adding those language strings. 2014-02-03 22:33:59 -05:00
Julian Lam
2b9106b5ce properly added Turkish, Norwegian, and Hungarian 2014-02-03 21:54:41 -05:00
Julian Lam
db00b01c4a updates to pt_BR 2014-02-03 21:41:43 -05:00
Julian Lam
bd4bce0e3f removing stuff that shouldn't have been committed 2014-02-03 21:40:35 -05:00
Julian Lam
a3cf42c072 Hungarian, Norwegian Bokmål, Turkish :) 2014-02-03 20:51:56 -05:00
Julian Lam
25b48c43eb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-03 20:41:58 -05:00
Julian Lam
f7d1738a8e typechecking plugin loading 2014-02-03 20:41:42 -05:00
Baris Soner Usakli
de56107c2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-03 19:24:37 -05:00
Baris Soner Usakli
c7195290c8 added infinite load to user favourites page 2014-02-03 19:24:27 -05:00
Julian Lam
8ad8a60987 0.3.1 2014-02-03 18:15:38 -05:00
Baris Soner Usakli
d53480015b removed dupe route 2014-02-03 16:16:39 -05:00
Baris Soner Usakli
e8dd8db010 helper function to create routes 2014-02-03 15:18:06 -05:00
Baris Soner Usakli
5bed729682 closes #935 2014-02-03 13:23:57 -05:00
Baris Soner Usakli
d0592412e6 added status to template 2014-02-03 12:54:16 -05:00
Baris Soner Usakli
c2652f908a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 15:43:36 -05:00
Baris Soner Usakli
8bba4889d2 moving deleted topics wont cause topic count to go negative 2014-02-02 15:43:33 -05:00
psychobunny
a53c35f071 added back 'body' trigger - to be deprecated in 0.4x 2014-02-02 15:11:33 -05:00
psychobunny
3955ca560f changed hook triggers to window from body 2014-02-02 15:10:44 -05:00
Baris Soner Usakli
3d61a1b15b use map instead of eachSeries 2014-02-02 15:02:27 -05:00
Baris Soner Usakli
6bd79a2fa0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:51:26 -05:00
psychobunny
4abeed3802 client side hooks - action:connected, action:reconnected, action:disconnected 2014-02-02 14:51:16 -05:00
Baris Soner Usakli
60b13cd2f7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:51:10 -05:00
Baris Soner Usakli
d788ad7cdf return offine status if user isnt online 2014-02-02 14:51:02 -05:00
psychobunny
609821029b app.isAdmin available client-side 2014-02-02 14:47:49 -05:00
psychobunny
1c1c5da8f2 isAdmin in header 2014-02-02 14:38:09 -05:00
Baris Soner Usakli
214b74abc9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:25:38 -05:00
Baris Soner Usakli
148438f7a0 closes #928, closes #930 2014-02-02 14:25:35 -05:00
psychobunny
3f0f2bc956 console.log 2014-02-02 13:53:50 -05:00
psychobunny
ecc1c315cc closes #927 2014-02-02 13:53:23 -05:00
Julian Lam
d1eba104d2 minor tweak to var names 2014-02-02 13:36:47 -05:00
Julian Lam
3d40cb095f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-02 13:03:02 -05:00
Julian Lam
79af442306 resolved #926 2014-02-02 13:02:52 -05:00
Baris Soner Usakli
0afd4ffdda app.js cleanup 2014-02-02 01:38:46 -05:00
Baris Soner Usakli
94ae80010b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-01 23:14:50 -05:00
Baris Soner Usakli
ca06a24df2 only logged in users can flag 2014-02-01 23:14:44 -05:00
Julian Lam
a942f4086c new german translations, yay! 2014-02-01 22:46:28 -05:00
Julian Lam
53285d70a9 just sneaking tabIndent into NodeBB core -- nothing to see here... 2014-02-01 22:38:52 -05:00
Julian Lam
29de88456b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-01 14:59:51 -05:00
Julian Lam
8ac7ccb4f8 calling auth immediately after client connection (apparently, not doing so throws errors on install?) 2014-02-01 14:59:45 -05:00
Baris Soner Usakli
825c568bc1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-01 13:41:39 -05:00
Baris Soner Usakli
15479a31c2 unread fix 2014-02-01 13:41:32 -05:00
Julian Lam
d9feaf6abc new tx strings with fallback (+ french translations) 2014-02-01 00:16:25 -05:00
Barış Soner Uşaklı
0517a63068 Update README.md 2014-01-31 23:56:18 -05:00
Baris Soner Usakli
5aa80619c8 default image for anon users 2014-01-31 23:27:54 -05:00
Baris Soner Usakli
0a8db4e4a7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 23:04:09 -05:00
Baris Soner Usakli
23f3111173 fixes alert close 2014-01-31 23:04:01 -05:00
Julian Lam
3c55672f62 seconds != milliseconds *facepalm* 2014-01-31 22:59:49 -05:00
Julian Lam
cb5baec4eb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 22:52:17 -05:00
Julian Lam
d7b44789fc updating stati to use sibling classes 2014-01-31 22:52:11 -05:00
Baris Soner Usakli
cb6116c6cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 22:26:05 -05:00
Baris Soner Usakli
db309ce8a1 closes #661 2014-01-31 22:25:59 -05:00
Julian Lam
c0ec0b2800 casing 2014-01-31 22:20:38 -05:00
Baris Soner Usakli
2cdddd2637 closes #925 2014-01-31 21:27:11 -05:00
Baris Soner Usakli
9e22b7c8fd focus composer text area after drag resize 2014-01-31 21:16:51 -05:00
Baris Soner Usakli
63a3bfd51d after drag focus input in chat, closes #924 2014-01-31 21:13:56 -05:00
Baris Soner Usakli
6c2a74bd38 if user status is offline dont show them in room browsing text 2014-01-31 20:19:59 -05:00
Baris Soner Usakli
27f0c0c910 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 18:17:20 -05:00
Baris Soner Usakli
1eb7ff9ff3 closes #923 2014-01-31 18:17:13 -05:00
Julian Lam
2e407b1f78 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 16:42:56 -05:00
Julian Lam
30f90fee31 running npm install for all plugins and themes as well, because npm (N) 2014-01-31 16:42:34 -05:00
Baris Soner Usakli
384834328c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 16:21:48 -05:00
Baris Soner Usakli
c2746b3bb1 minor tweaks to status 2014-01-31 16:21:41 -05:00
Julian Lam
252af4e8cc fixing bug where new installs exposed the administrators group. 2014-01-31 16:04:33 -05:00
Baris Soner Usakli
feaea6dcea Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 15:47:42 -05:00
Baris Soner Usakli
52962a7e9b dont show invisible users in online users page 2014-01-31 15:47:26 -05:00
Julian Lam
b288edfb6b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 15:27:28 -05:00
Julian Lam
9e8addee81 fixed #859 2014-01-31 15:27:13 -05:00
Baris Soner Usakli
700876fe58 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 15:13:58 -05:00
Baris Soner Usakli
97e0e48b07 closes #714, closes #824 2014-01-31 15:13:52 -05:00
Julian Lam
c9bb65133a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 13:17:48 -05:00
Julian Lam
37f7d1d08a resolved issue #913 2014-01-31 13:17:28 -05:00
Baris Soner Usakli
1fa88b9475 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 13:01:06 -05:00
Baris Soner Usakli
22bc3e9571 added statuses into dropdown 2014-01-31 13:00:59 -05:00
Julian Lam
7fe5c33048 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 12:27:52 -05:00
Julian Lam
29c6b789a2 tweak to prev commit 2014-01-31 12:25:53 -05:00
Baris Soner Usakli
6fbed193f7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 12:23:05 -05:00
Baris Soner Usakli
aa856e2f5c closes #847 2014-01-31 12:22:59 -05:00
Julian Lam
77cacda0fa Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 12:19:35 -05:00
Julian Lam
748055ac52 hiding development block from ACP if not in dev mode 2014-01-31 12:19:30 -05:00
Baris Soner Usakli
c122492470 added back the template if 2014-01-31 12:11:49 -05:00
Baris Soner Usakli
14b2fd050e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 11:59:42 -05:00
Baris Soner Usakli
bdd4bb0003 closes #920' 2014-01-31 11:59:35 -05:00
Julian Lam
59d1a90820 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 11:48:15 -05:00
Julian Lam
1b794f00bd slovak updates 2014-01-31 11:48:05 -05:00
psychobunny
5b3862f58e updated links on ACP home page, part of #461 2014-01-31 11:47:11 -05:00
psychobunny
4647b88071 added optional forum terms of use to ACP, closes #775 2014-01-31 11:38:23 -05:00
Baris Soner Usakli
267e7a3d5b fixed redirect 2014-01-31 11:37:24 -05:00
Baris Soner Usakli
c042d4253b added popular rss feed 2014-01-31 11:16:23 -05:00
psychobunny
347d402f48 closes #752 2014-01-31 11:07:47 -05:00
psychobunny
e91ab5c660 closes #917 2014-01-31 10:56:43 -05:00
Julian Lam
4d23b46916 latest transifex changes 2014-01-31 10:17:21 -05:00
Barış Soner Uşaklı
f95725369a Merge pull request #922 from mattijle/master
err.message is undefined use err instead
2014-01-31 06:57:16 -08:00
Julian Lam
c89bc3b9d5 fixing missing template requirement on /reset 2014-01-31 09:03:06 -05:00
Matti Leppänen
b71607ea7d err.message is undefined use err instead 2014-01-31 15:19:45 +02:00
Julian Lam
bb316bd949 new transifex strings 2014-01-30 21:42:52 -05:00
Julian Lam
eff99ffabe fixed #915 2014-01-30 21:05:59 -05:00
Julian Lam
63437571b8 fixing header favicon to look for type as well 2014-01-30 20:51:14 -05:00
Julian Lam
ec61d62c63 recommit to Transifex formatting 2014-01-30 20:22:25 -05:00
Julian Lam
3f1582e053 Transifex config file 2014-01-30 20:19:57 -05:00
Julian Lam
a137fb76ed Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-30 20:14:33 -05:00
Julian Lam
a940915e48 re-encoding some pt_BR language files in UTF-8 2014-01-30 20:14:01 -05:00
Baris Soner Usakli
ab2b0e6560 fixed direct loading of popular page 2014-01-30 19:52:32 -05:00
Baris Soner Usakli
817546c6cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 19:46:32 -05:00
Baris Soner Usakli
a86ddc9934 closes #726 2014-01-30 19:46:25 -05:00
Julian Lam
39842b5ea9 Merge pull request #919 from tedr56/master
Fr translation - Flag
2014-01-30 16:16:55 -08:00
TedVJ
18051435e5 Fr translation - Flag 2014-01-31 01:12:36 +01:00
Baris Soner Usakli
45e2f7f7f5 removed console.log 2014-01-30 17:44:47 -05:00
Baris Soner Usakli
36ae568349 #656 2014-01-30 17:41:54 -05:00
Baris Soner Usakli
e48014ba61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 16:44:45 -05:00
Baris Soner Usakli
0f5b3ae859 added img-responsive to images in chat messages 2014-01-30 16:44:36 -05:00
Julian Lam
55b67ed735 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	src/routes/api.js
2014-01-30 15:40:44 -05:00
Julian Lam
0376e3d574 renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English 2014-01-30 15:39:51 -05:00
Baris Soner Usakli
9fbd5ed596 removed unused function 2014-01-30 15:21:00 -05:00
psychobunny
23c711947b added support for !array.length 2014-01-30 14:33:03 -05:00
psychobunny
0cca8e0bcf closes #783, support for array.length 2014-01-30 14:26:55 -05:00
Baris Soner Usakli
efa45ad907 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 14:04:27 -05:00
Baris Soner Usakli
89e554b333 closes #906 2014-01-30 14:04:20 -05:00
psychobunny
112a9cb532 closes #689 2014-01-30 13:51:28 -05:00
psychobunny
68105c6289 send environment state to client 2014-01-30 13:37:30 -05:00
psychobunny
303a32dce6 closes #855 - app.alert strings are now passed through translator so we can finally start getting rid of the remainder of hardcoded strings 2014-01-30 13:31:05 -05:00
Baris Soner Usakli
fa910bac20 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 13:16:52 -05:00
Baris Soner Usakli
1291f31f3c closes #897 2014-01-30 13:16:45 -05:00
psychobunny
c253760737 converted filter:posts.custom_profile_info to accept an array instead of building a string for better themability. closes #886 2014-01-30 13:06:35 -05:00
Baris Soner Usakli
9afef92763 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 12:56:02 -05:00
Baris Soner Usakli
8607ea9a84 notifications fix 2014-01-30 12:55:55 -05:00
psychobunny
c673cf84c2 themes able to call upon hooks as well. closes #830 2014-01-30 11:57:55 -05:00
psychobunny
92725ee3df Merge pull request #874 from BitBangersCode/templates-fix
Add custom templates to /api/get_templates_listing
2014-01-30 08:38:16 -08:00
Baris Soner Usakli
a7d9944cc1 icons on register login in mobile menu 2014-01-30 11:33:58 -05:00
psychobunny
24d2ac270c changed notifications code to jq - prevents crashes if notification element does not exist 2014-01-30 11:06:29 -05:00
Julian Lam
d8eec5dd2e fixed missing og:title on category view 2014-01-30 10:12:45 -05:00
Julian Lam
b954668636 browser title, #911 2014-01-30 10:02:19 -05:00
Julian Lam
de751ed623 fixed #900 - api calls hopefully no longer cached 2014-01-30 09:31:53 -05:00
Julian Lam
fb2b54b314 refactored meta and link tag generation to template (yay frontend processing!)
cache busters now always added in template, instead of throughout code
2014-01-30 09:20:43 -05:00
Baris Soner Usakli
1a55f9217d turn off click events to prevent multiple calls' 2014-01-29 20:51:59 -05:00
Baris Soner Usakli
06ca569554 closes #909 2014-01-29 15:49:36 -05:00
Baris Soner Usakli
d0702f663b disable scroll events on ajaxify' 2014-01-29 15:19:54 -05:00
Baris Soner Usakli
3c273f4a66 error checks for missing after 2014-01-29 15:08:14 -05:00
Baris Soner Usakli
6a78221261 closes #903 2014-01-29 15:02:34 -05:00
Julian Lam
fe8156793a Merge branch 'master' of github.com:henrock/NodeBB into henrock-master 2014-01-29 14:41:20 -05:00
Julian Lam
3f876fec80 added ajaxify.start and ajaxify.end client-side hooks 2014-01-29 14:29:45 -05:00
Julian Lam
024cfc17c5 tweak 2014-01-29 12:58:52 -05:00
Julian Lam
95d671281a moved port 80 and 443 warnings to its own conditional 2014-01-29 12:42:33 -05:00
Julian Lam
38ee3fd5a3 don't bother firing hooks received by js unless a listener exists 2014-01-29 12:28:21 -05:00
Henrik Jerlenius
52ee5096af fixed translation on recent replies feed 2014-01-29 12:48:50 +01:00
Henrik Jerlenius
4f4fef3832 fixed another 'Fork' ;) 2014-01-29 12:34:47 +01:00
Henrik Jerlenius
ec72818988 updated all swedish translations 2014-01-29 12:25:54 +01:00
Henrik Jerlenius
8fad39725b updated all swedish translations 2014-01-29 12:23:10 +01:00
Henrik Jerlenius
b3718a1605 changed language info 2014-01-29 08:43:59 +01:00
Henrik Jerlenius
8784961e1e First commit on swedish translation 2014-01-29 08:34:23 +01:00
Julian Lam
133188f14c introducing cache buster to plugin CSS and loaded scripts 2014-01-28 22:06:27 -05:00
Baris Soner Usakli
cccaf642a6 closes #898 2014-01-28 20:10:53 -05:00
Baris Soner Usakli
38886f6b58 making a socket call will set lastonline 2014-01-28 16:14:56 -05:00
Baris Soner Usakli
ed401de169 closes #896 2014-01-27 20:21:14 -05:00
Baris Soner Usakli
5759b1b1a2 closes #857 2014-01-27 19:58:03 -05:00
Baris Soner Usakli
f68b692ce4 closes #863 2014-01-27 17:15:17 -05:00
Baris Soner Usakli
c06320e28b closes #870 2014-01-27 15:41:08 -05:00
Baris Soner Usakli
c0184ba350 blocked 2014-01-27 14:57:25 -05:00
Julian Lam
4e659cfeee Merge pull request #892 from tedr56/master
Fr translation update
2014-01-27 11:07:01 -08:00
Julian Lam
50c4a707e5 removing empty login.js 2014-01-27 13:40:35 -05:00
TedVJ
1cef31e47b Fr translation update 2014-01-27 19:38:43 +01:00
Julian Lam
744b6517bf issue #891 2014-01-27 13:37:31 -05:00
Julian Lam
4ae8824faf tweaks and formatting 2014-01-27 13:04:03 -05:00
Julian Lam
7edf041747 Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master 2014-01-27 12:52:52 -05:00
Julian Lam
db62e10673 upgrade scripts for sso plugins 2014-01-27 12:50:50 -05:00
Julian Lam
f51d525d9c errant semicolon 2014-01-27 12:29:48 -05:00
Julian Lam
d924d01677 timeago fix for brasilian portugueso 2014-01-27 12:28:36 -05:00
Julian Lam
aa81b25fe6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-27 12:20:24 -05:00
Julian Lam
2d72956591 updated language files to match english pages.json 2014-01-27 12:20:11 -05:00
Julian Lam
fac55160fa new translation strings for pages, proper unicode handling in parseFragment 2014-01-27 12:19:25 -05:00
Julian Lam
e69f5fff3b added "pages" translation file to languages 2014-01-27 11:39:00 -05:00
Julian Lam
5482146bc4 simplified a conditional 2014-01-27 11:12:54 -05:00
Julian Lam
208fe454bb Merge pull request #890 from tedr56/master
Fr Translation Update
2014-01-27 08:05:42 -08:00
TedVJ
9a876f7003 Fr Translation Update 2014-01-27 16:21:54 +01:00
Julian Lam
6514504ddd fixed #889 2014-01-27 09:09:55 -05:00
Matti Leppänen
98c4b08f15 Merge remote-tracking branch 'upstream/master' 2014-01-27 16:07:08 +02:00
Leonardo Galani
90352cd858 adding brazilian portuguese language translations 2014-01-27 07:53:04 -05:00
Baris Soner Usakli
71ccd0854d fixes notification header icon 2014-01-27 01:58:16 -05:00
Baris Soner Usakli
f874059fe9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-27 01:48:50 -05:00
Baris Soner Usakli
9cb232c198 added header tooltips 2014-01-27 01:48:43 -05:00
Julian Lam
8e1137b5dd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-26 23:35:11 -05:00
Julian Lam
ef39c128c2 Removing Google Plus integration from core - adios! 2014-01-26 23:34:54 -05:00
Baris Soner Usakli
c18788fbc9 crash fix if topic has no posts, and check confirm obj 2014-01-26 23:20:37 -05:00
Baris Soner Usakli
31a57cf0dd closes #885 2014-01-26 22:36:06 -05:00
Baris Soner Usakli
8e4236a3a9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 22:23:15 -05:00
Baris Soner Usakli
e4d60b7a55 Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master 2014-01-26 22:14:04 -05:00
psychobunny
f8be072b99 chats - isNew flag, and sending in userData.uid now 2014-01-26 22:10:12 -05:00
Baris Soner Usakli
d54e2fba9e closes #810 2014-01-26 21:32:53 -05:00
Matti Leppänen
4f495e2b46 quote gets added to the active composer instead of starting a new one. 2014-01-27 02:51:49 +02:00
Baris Soner Usakli
fb8fbb2372 removed console.log 2014-01-26 18:40:28 -05:00
Baris Soner Usakli
c0e818afc6 closes #854 2014-01-26 18:36:07 -05:00
Baris Soner Usakli
26673d3ada delegated events in admin categories 2014-01-26 17:55:51 -05:00
Julian Lam
7e3c46db61 Removing Twitter SSO - toodles! 2014-01-26 17:42:48 -05:00
Julian Lam
e7eab83d8f removing facebook SSO from core 2014-01-26 17:26:56 -05:00
Baris Soner Usakli
25c4648e2e load 20 in recent 2014-01-26 17:25:18 -05:00
Baris Soner Usakli
8770284661 removed console.log 2014-01-26 17:23:28 -05:00
Baris Soner Usakli
8d0b880e5a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 17:17:49 -05:00
Baris Soner Usakli
25442a89ca closes #878 2014-01-26 17:17:34 -05:00
psychobunny
6ab08e91a2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:52:07 -05:00
psychobunny
45a5b88824 added filter:messaging.parse hook 2014-01-26 16:50:59 -05:00
Baris Soner Usakli
fac2cd9464 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:23:39 -05:00
Baris Soner Usakli
da626a4035 more fixes 2014-01-26 16:23:37 -05:00
Julian Lam
0c71707fb5 fixed #877 2014-01-26 16:22:50 -05:00
Julian Lam
0869765e2b Merge remote-tracking branch 'origin/master' 2014-01-26 16:01:36 -05:00
Julian Lam
22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool 2014-01-26 15:59:22 -05:00
Baris Soner Usakli
2560704839 recent unread cleanup 2014-01-26 14:56:16 -05:00
Baris Soner Usakli
c6d48f477c fixes recent topic post notification 2014-01-26 14:03:33 -05:00
Julian Lam
96b2a15290 user registration now no longer sends a welcome email if no emailers are present 2014-01-26 13:21:23 -05:00
Julian Lam
d7d4290099 resolved #879 2014-01-26 13:10:39 -05:00
Baris Soner Usakli
14e68bc9e2 dropup for bottom post bar 2014-01-26 01:34:40 -05:00
Baris Soner Usakli
bd0b5f4cdb more error checks in thread move 2014-01-25 22:43:49 -05:00
Baris Soner Usakli
810095d287 fixed infinite loading on categories 2014-01-25 22:30:48 -05:00
Baris Soner Usakli
2988230b07 some more fixes, cant quote and see deleted messages 2014-01-25 22:19:51 -05:00
Julian Lam
5fde1eb3e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-25 22:00:13 -05:00
Julian Lam
d42beda3da added page selection if you click on the pipe 2014-01-25 21:44:47 -05:00
Baris Soner Usakli
bf81159558 fixes a pagination bug 2014-01-25 21:35:09 -05:00
Baris Soner Usakli
dcefad1427 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-25 21:26:03 -05:00
Baris Soner Usakli
1afd7ae332 trim pagination numberS 2014-01-25 21:25:56 -05:00
Julian Lam
197b7f2a6c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-25 20:42:37 -05:00
Julian Lam
a240fc81ce fixed #869 2014-01-25 20:42:29 -05:00
Baris Soner Usakli
6628db89af added saerch array 2014-01-25 20:36:55 -05:00
Baris Soner Usakli
b4ea8e58fa removed check for no topics in category, you should be able to go into empty categories 2014-01-25 20:08:02 -05:00
Baris Soner Usakli
6ff11c5243 check for number 2014-01-25 19:57:25 -05:00
Baris Soner Usakli
75f178636b more fixes 2014-01-25 19:50:50 -05:00
Baris Soner Usakli
1084523c92 lots of pagination work, query params, ajaxify to pids 2014-01-25 19:19:25 -05:00
MrWaffle
869f9e0d86 Add custom templates to /api/get_templates_listing 2014-01-25 23:13:51 +01:00
Baris Soner Usakli
8744013013 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-25 16:42:06 -05:00
Baris Soner Usakli
2e786cc4d1 closes #873, removed global translator, templates and server objects 2014-01-25 16:39:27 -05:00
Baris Soner Usakli
393bb7245c closes #866 2014-01-25 12:05:48 -05:00
Baris Soner Usakli
d718eca935 fixes global meta leak, and categories meta require, #873 2014-01-25 01:34:56 -05:00
psychobunny
46e29dfb2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-25 00:05:45 -05:00
psychobunny
d67ae5c2be changing undetected minified JS file warning to info message instead 2014-01-25 00:05:41 -05:00
Baris Soner Usakli
b23960e8d7 fixes to category pagination 2014-01-24 23:05:59 -05:00
Baris Soner Usakli
ef6fd35e85 lots of cleanup, moved pagination to requirejs module 2014-01-24 22:26:11 -05:00
Baris Soner Usakli
aa73a10fc4 added pagination to vanilla topic template 2014-01-24 21:01:28 -05:00
Baris Soner Usakli
0580d0c8a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 20:51:02 -05:00
Baris Soner Usakli
5f0c6e508d some cleanup 2014-01-24 20:50:55 -05:00
Baris Soner Usakli
606367701f pagination on posts 2014-01-24 20:00:56 -05:00
Julian Lam
1cce38cae6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 19:55:34 -05:00
Julian Lam
d5534cf545 fixing upgrade script on edge builds 2014-01-24 19:55:19 -05:00
psychobunny
0a749023cb fixing if statements inside a @first / @last block 2014-01-24 14:19:24 -05:00
Baris Soner Usakli
8d007e7029 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 13:27:45 -05:00
Baris Soner Usakli
cf39c66017 some pagination work 2014-01-24 13:27:36 -05:00
Julian Lam
e09132350d re-adding conditional to hide quote/reply block if no write perm 2014-01-24 13:26:50 -05:00
psychobunny
503e59b12b clean up conditionals only at the very end of parsing 2014-01-24 13:25:33 -05:00
Julian Lam
26848641cd restoring post/quote buttons pending template system fix for IFs 2014-01-24 13:11:30 -05:00
Julian Lam
a3fe390810 reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry! 2014-01-24 13:09:44 -05:00
Julian Lam
be86f84ef8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 12:29:28 -05:00
Julian Lam
ab85ef6b7b fixed issue where back button stopped ajaxifying internally. 2014-01-24 12:29:11 -05:00
Baris Soner Usakli
620ff65cbe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-24 12:11:29 -05:00
Baris Soner Usakli
7f23f848fe fix for mismatch between favourite count and number of people in favourited seT 2014-01-24 12:11:22 -05:00
Julian Lam
459d5ddccd fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load 2014-01-24 10:09:28 -05:00
Julian Lam
43808c01ec reduced the number of 'ajaxify.go' calls to one, in /src 2014-01-24 10:00:57 -05:00
Julian Lam
b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack. 2014-01-24 09:48:41 -05:00
Julian Lam
ef450edfea Revert "possible fix to #840", please see #867
This reverts commit 1d666bf7f0.
2014-01-24 08:48:40 -05:00
Julian Lam
dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 08:18:02 -05:00
Barış Soner Uşaklı
c91ae0c4c4 Update categories.js 2014-01-24 00:42:34 -05:00
Baris Soner Usakli
f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing 2014-01-23 23:31:10 -05:00
Baris Soner Usakli
1d666bf7f0 possible fix to #840 2014-01-23 22:45:11 -05:00
Baris Soner Usakli
3ea7d4d217 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-23 21:35:33 -05:00
Baris Soner Usakli
3793ddc2e8 fixes user tooltips on infinit load 2014-01-23 21:35:25 -05:00
Julian Lam
3fa9e3f31b Merge pull request #862 from akhoury/master
removed use_proxy config, cleaned-up some comments
2014-01-23 18:23:33 -08:00
akhoury
dcc6ec797e removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820 2014-01-23 20:35:53 -05:00
Baris Soner Usakli
b0ef974590 lots of cleanup and refactor 2014-01-23 19:01:30 -05:00
Baris Soner Usakli
f62c82c797 send app to action:app.load 2014-01-23 17:08:33 -05:00
Baris Soner Usakli
6da12d1a39 and for andrew 2014-01-23 16:37:11 -05:00
Baris Soner Usakli
bc1cde38da added getObjectKeys for julian :) 2014-01-23 16:34:54 -05:00
Julian Lam
2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-23 16:20:46 -05:00
Julian Lam
d380f69310 support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden 2014-01-23 16:19:10 -05:00
Baris Soner Usakli
824c5072e8 topics should be marked read correctly if you are already in it 2014-01-23 15:46:39 -05:00
Julian Lam
a0e9e52e70 adding xregexp to ACP header 2014-01-23 15:16:30 -05:00
Baris Soner Usakli
47c32738a6 removed tests from acp 2014-01-23 12:51:54 -05:00
Julian Lam
f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
2014-01-23 08:15:16 -05:00
Matti Leppänen
4cfd970d5f Added Finnish language translation 2014-01-23 13:10:07 +02:00
Aziz Khoury
659817b4f1 Update comment 2014-01-23 01:07:10 -05:00
Aziz Khoury
7e3d8d65f5 Update login.js 2014-01-23 01:04:01 -05:00
Baris Soner Usakli
b717c74a81 closes #856 2014-01-22 23:58:21 -05:00
Baris Soner Usakli
042174290f removed console.log 2014-01-22 20:35:57 -05:00
Baris Soner Usakli
8aebb7f84d Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-22 19:48:01 -05:00
Baris Soner Usakli
b325212182 crash fix for admin verify email, temp fix 2014-01-22 19:47:55 -05:00
Julian Lam
1e99945515 Merge branch 'yangwao-master' 2014-01-22 19:37:06 -05:00
Julian Lam
f0e47e43bc fb and tw strings for traditional chinese 2014-01-22 19:34:06 -05:00
wao
7b150ab407 added Slovak language translation 2014-01-23 00:45:47 +01:00
Baris Soner Usakli
044382047d removed commented out section 2014-01-22 17:29:23 -05:00
Baris Soner Usakli
46fb6377ee fixed topic reply if title was 255, better notif text in unread and recent,removed console.log 2014-01-22 17:23:20 -05:00
Baris Soner Usakli
79803d2b3d Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy 2014-01-22 15:28:09 -05:00
MrWaffle
d63ced8a5c Move to client side 2014-01-22 21:08:43 +01:00
MrWaffle
03d92eb5cd Thought I'd refactor this for you guys 2014-01-22 20:29:37 +01:00
MrWaffle
da317b5a85 async wooo 2014-01-22 20:27:42 +01:00
MrWaffle
c0e2e9d011 Remove log 2014-01-22 20:21:56 +01:00
MrWaffle
69b54337bb Limit to 5 users 2014-01-22 20:21:12 +01:00
Baris Soner Usakli
b945dfc71d closes #843 2014-01-22 14:04:04 -05:00
MrWaffle
b887b76c29 Implement favourite tooltip to show who favourited a post 2014-01-22 19:46:34 +01:00
Baris Soner Usakli
45d2affdfb closes #833 2014-01-22 12:46:37 -05:00
Baris Soner Usakli
baa74958c5 can set image class for categories 2014-01-22 11:46:50 -05:00
Baris Soner Usakli
eac6b23811 closes #841 2014-01-22 11:08:52 -05:00
Barış Soner Uşaklı
c709fae251 Merge pull request #828 from BitBangersCode/admin-group-fix
Admin group fix
2014-01-22 08:03:01 -08:00
Richie Preece
d959aad41f Changed to bcrypt.js 2014-01-21 20:56:12 -07:00
Julian Lam
4c01fc4c0e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 22:30:25 -05:00
Julian Lam
7db231ca54 traditional chinese language pack - 很好? 2014-01-21 22:30:03 -05:00
Baris Soner Usakli
18075b85c7 winston.error 2014-01-21 20:57:02 -05:00
Baris Soner Usakli
e997c63480 return error 2014-01-21 20:47:03 -05:00
Baris Soner Usakli
9393a39452 fixes translation in recent 2014-01-21 19:07:03 -05:00
Julian Lam
74786a32ac 0.3.0 2014-01-21 16:58:06 -05:00
Julian Lam
308110db49 adding lavender to dependencies 2014-01-21 16:57:28 -05:00
psychobunny
3b4f0a8f4e updating motd for incoming theme 2014-01-21 16:51:04 -05:00
Josh
4c211b7110 Fixed tabbing/spacing 2014-01-21 21:15:34 +00:00
Josh Rickers
21f6b10023 fixed indenting 2014-01-21 20:44:41 +00:00
Josh Rickers
f9e6fab3ea Fixed line spacing/tabbing 2014-01-21 20:40:55 +00:00
Julian Lam
53a1474785 second pass for #773, blocked for now 2014-01-21 15:29:34 -05:00
Julian Lam
bafc8caaf5 first pass at #773 2014-01-21 15:17:41 -05:00
Josh Rickers
55b0270b34 Merge branch 'master' into admin-group-fix 2014-01-21 19:59:21 +00:00
Josh Rickers
4c36083354 Added yourid so it can be used in groups.js 2014-01-21 19:39:06 +00:00
Josh Rickers
a91e464787 updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:41 +00:00
Josh Rickers
bac1a5ec3e updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:01 +00:00
Julian Lam
397861c3cc Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 14:01:38 -05:00
Julian Lam
0020f278a5 stopped using unnecessary regex in user search 2014-01-21 13:59:03 -05:00
Baris Soner Usakli
56c789ed61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-21 12:35:41 -05:00
Baris Soner Usakli
aa2978976c notif fix 2014-01-21 12:35:34 -05:00
Julian Lam
73d9d6e1d3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 12:33:22 -05:00
Julian Lam
92706a6550 fixed #826 2014-01-21 12:33:11 -05:00
Baris Soner Usakli
74ccfd1e4d moved islatin out too 2014-01-21 12:02:46 -05:00
Baris Soner Usakli
8f8ea4de92 slug fix 2014-01-21 12:01:09 -05:00
Baris Soner Usakli
104ec7de6e last poster is visible, slugify check for latin #777 2014-01-21 11:48:56 -05:00
Baris Soner Usakli
a1149b8f8d notif unread class 2014-01-21 10:38:20 -05:00
Baris Soner Usakli
f107803550 fix 2014-01-21 10:07:24 -05:00
Baris Soner Usakli
039f02456d if user is in the topic when a new post comes in mark the topic read 2014-01-21 10:06:13 -05:00
Baris Soner Usakli
9400e5bcc9 motd 2014-01-21 01:27:39 -05:00
Baris Soner Usakli
4cae491438 last one for the night 2014-01-21 00:47:33 -05:00
Baris Soner Usakli
93534832b9 small 2014-01-21 00:21:59 -05:00
Baris Soner Usakli
9cd2b36c97 minor fix to topic.tpl 2014-01-21 00:16:35 -05:00
Baris Soner Usakli
a0b80e4061 shouldnt be in template 2014-01-20 23:25:27 -05:00
Baris Soner Usakli
ccc62a202b dont go to top on search icon click 2014-01-20 21:41:04 -05:00
Baris Soner Usakli
0a1d45b0b9 default panle 2014-01-20 21:33:13 -05:00
Baris Soner Usakli
56fcae1cb2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:29:22 -05:00
Baris Soner Usakli
7c16a8be31 recent reply fix 2014-01-20 21:29:14 -05:00
Julian Lam
cc236c1f72 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 21:15:55 -05:00
Julian Lam
39d9dd76dc removed preview button from ACP/themes 2014-01-20 21:15:52 -05:00
Baris Soner Usakli
f282dcd677 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:00:21 -05:00
Baris Soner Usakli
55d4a5fe3a template fixes closes #825 2014-01-20 21:00:10 -05:00
Julian Lam
affa51856b closed #801 pending explanation 2014-01-20 19:05:19 -05:00
Baris Soner Usakli
12a5b6b4c6 body margin for composer 2014-01-20 16:50:39 -05:00
Aziz Khoury
da647d105b removing couple of console.log 2014-01-20 16:34:12 -05:00
Aziz Khoury
74f23497dc password should be passed to action hook, and it was being ovewritten 2014-01-20 16:29:46 -05:00
Aziz Khoury
4fad334e18 Merge remote-tracking branch 'upstream/master' 2014-01-20 16:21:57 -05:00
Barış Soner Uşaklı
94f38d0622 Merge pull request #822 from BitBangersCode/admin-fix
Confirmation when removing user from a group
2014-01-20 13:18:52 -08:00
Josh
f7a290d0b3 removed function
removed function that did not work
2014-01-20 20:55:53 +00:00
Josh
a86ff15f7b Removed code for yourid
removed code that will give the current user id in a var called yourid
2014-01-20 20:54:19 +00:00
Baris Soner Usakli
030cfbffa4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 15:35:17 -05:00
Baris Soner Usakli
ed1c276739 only drag chat modal from header 2014-01-20 15:35:10 -05:00
Josh
f14ad11dd0 add remove user from group confirmation
Added confirmation request when removing user from a group.
2014-01-20 20:28:46 +00:00
Julian Lam
9c9fadb5a1 upping mentions minver 2014-01-20 14:53:09 -05:00
Julian Lam
663aff4b24 fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL 2014-01-20 13:41:46 -05:00
Aziz Khoury
a13c321de8 added "trust proxy" config option with default to true 2014-01-20 13:23:40 -05:00
Aziz Khoury
ba85ffb292 Merge remote-tracking branch 'upstream/master' 2014-01-20 13:22:16 -05:00
Julian Lam
2654a8e86a added cache buster to ACP theme 2014-01-20 13:22:03 -05:00
Julian Lam
cef54fbf6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 13:17:17 -05:00
Julian Lam
f9e8178d25 fixed timeagago for zh_cn 2014-01-20 13:16:23 -05:00
Baris Soner Usakli
71888adb09 closes #815, closes #816 2014-01-20 12:56:09 -05:00
Aziz Khoury
f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well 2014-01-20 12:41:35 -05:00
Julian Lam
e2960e3ed6 Merge pull request #819 from BitBangersCode/mongo-fix
Add callback to mongo.searchRemove, fixes infinite schema update
2014-01-20 08:28:23 -08:00
MrWaffle
e4d8ddcf1b Add callback to mongo.removeSearch, fixes infinite schema update 2014-01-20 17:21:45 +01:00
Julian Lam
d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
	public/templates/composer.tpl
2014-01-20 11:15:16 -05:00
Julian Lam
e1a9fe9691 Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
	src/webserver.js
2014-01-20 11:08:41 -05:00
Julian Lam
33c84d4684 Merge branch 'akhoury-master' 2014-01-20 11:04:10 -05:00
Julian Lam
95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary 2014-01-20 11:04:06 -05:00
Julian Lam
938b78786e closed #818 - case insensitive user search 2014-01-20 10:55:29 -05:00
Julian Lam
895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master 2014-01-20 10:48:06 -05:00
Julian Lam
cf69b9fcb3 fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap 2014-01-20 10:46:49 -05:00
akhoury
58525bd09c f'in arabs 2014-01-20 01:39:11 -05:00
Baris Soner Usakli
5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:44:16 -05:00
Baris Soner Usakli
84aa1ab527 motd string and class 2014-01-19 22:44:13 -05:00
Julian Lam
2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 22:29:36 -05:00
Julian Lam
ee6ac77f8b new upgrade directive 2014-01-19 22:29:28 -05:00
Julian Lam
b6aa31b245 removed references to Reds user search 2014-01-19 22:11:34 -05:00
Julian Lam
e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins 2014-01-19 22:07:29 -05:00
Baris Soner Usakli
f7aa808fa7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:06:33 -05:00
Baris Soner Usakli
050ab738e4 fixed drop area top 2014-01-19 22:06:25 -05:00
Julian Lam
483ad87c1d first pass 2014-01-19 21:46:39 -05:00
Julian Lam
cfe46f38ee Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:35:23 -05:00
Baris Soner Usakli
d1ccc692ae pull right dropdowns 2014-01-19 18:35:18 -05:00
Julian Lam
0c0ae6560a re: #808 -- removed upgrade directives for v0.2.x branch, and added minSchemaDate check so that if you try to upgrade without doing all upgrades in a previous branch, it will abort. 2014-01-19 18:34:11 -05:00
Baris Soner Usakli
c9f43a60b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 18:18:55 -05:00
Baris Soner Usakli
3d30c0bd87 tmp fix for nested if 2014-01-19 18:18:47 -05:00
Julian Lam
3624717d84 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:02:07 -05:00
Julian Lam
07b286650c adding cache buster to ACP, removing bootstrap css in ACP 2014-01-19 18:02:03 -05:00
Baris Soner Usakli
4273fc4d23 added check for valid field 2014-01-19 18:02:01 -05:00
Baris Soner Usakli
32adbc8c77 close modal on error 2014-01-19 17:49:16 -05:00
Baris Soner Usakli
7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 17:28:15 -05:00
Baris Soner Usakli
189e69284e fixes for post privileges 2014-01-19 17:28:08 -05:00
Julian Lam
0ccb8a77ba Merge pull request #811 from BitBangersCode/alternate_title_fix
Only alternate title when not focused
2014-01-19 14:25:15 -08:00
Julian Lam
e8d6df22cb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 17:18:18 -05:00
Julian Lam
5861630dec - removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
2014-01-19 17:17:40 -05:00
MrWaffle
c1fea52a93 Only alternate title when not focused 2014-01-19 22:38:44 +01:00
Baris Soner Usakli
1980e945da fixed admin page active sockets 2014-01-19 14:42:47 -05:00
Baris Soner Usakli
16a42619b5 closes #809 2014-01-19 14:27:07 -05:00
Baris Soner Usakli
54c05f9027 title is no longer centered in composer 2014-01-19 12:59:45 -05:00
Baris Soner Usakli
9879f645f6 added check for undefined, null empty string 2014-01-18 23:28:13 -05:00
Baris Soner Usakli
bbac361670 fixed crash if empty topic was loaded without ajaxify 2014-01-18 23:18:58 -05:00
Baris Soner Usakli
84cbcc5a97 closes #798 2014-01-18 22:23:25 -05:00
Baris Soner Usakli
8c1c844007 closes #806 2014-01-18 21:57:06 -05:00
Baris Soner Usakli
1dddd77ae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 19:15:17 -05:00
Baris Soner Usakli
72447c9b9c grouped post buttons in dropdowns 2014-01-18 19:15:07 -05:00
psychobunny
025e1293fa removed deprecated cssSrc, replaced with optional bootswatchCSS 2014-01-18 16:13:01 -05:00
psychobunny
df53d836e5 fixed dependency check for cerulean 2014-01-18 16:01:14 -05:00
Baris Soner Usakli
e83e7870ce Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 16:00:12 -05:00
Baris Soner Usakli
d8e14acbbf closes #799 2014-01-18 16:00:05 -05:00
psychobunny
4ef5ffe7fd upped minver of cerulean to 0.0.12 - please upgrade 2014-01-18 15:59:39 -05:00
Baris Soner Usakli
5072b9c8a5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 15:35:58 -05:00
Baris Soner Usakli
959e6e83ea closes #796 2014-01-18 15:35:51 -05:00
psychobunny
1528c70a30 deleted BS css files from core - please update vanilla 2014-01-18 15:12:49 -05:00
psychobunny
6af143900a upped minver of vanilla to 0.0.13 - please update 2014-01-18 15:12:35 -05:00
Dr.Z
43cc975ff7 Add Simplized Chinese.
Just modified the .json in language folder and some .tpl in the
templates folder(except the admin folder). Noted there are a lot of
front-end related code in the .js files, I’ll move on to them.
2014-01-19 01:04:12 +08:00
Julian Lam
0397773b22 Merge pull request #802 from tedr56/master
Fr translation Updates
2014-01-18 06:30:26 -08:00
MrWaffle
5ed77b032e Fix plugin CSS files on Windows 2014-01-18 14:58:20 +01:00
TedVJ
b5ed7b8b72 Fr translation fixes 2014-01-18 14:47:41 +01:00
TedVJ
a2165403a7 Fr translation for fd92d7b02a 2014-01-18 14:33:25 +01:00
Baris Soner Usakli
324bec41c4 chain 2014-01-17 20:10:09 -05:00
Baris Soner Usakli
0db6423c26 closes #792, fixes multiple composers 2014-01-17 19:42:20 -05:00
Baris Soner Usakli
dc27638ca8 sitemap fix 2014-01-17 18:58:38 -05:00
Baris Soner Usakli
c00bd0b8d0 oops fixed 2014-01-17 18:14:00 -05:00
Baris Soner Usakli
22e1b0f22e check result for null 2014-01-17 18:12:56 -05:00
Baris Soner Usakli
e6a9f5a704 error check 2014-01-17 18:11:36 -05:00
Baris Soner Usakli
fd92d7b02a can mark topic unread for all 2014-01-17 17:26:07 -05:00
Baris Soner Usakli
25b50323fa markdown text in composer 2014-01-17 17:07:09 -05:00
Baris Soner Usakli
7752d24b21 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-17 16:30:12 -05:00
Baris Soner Usakli
00c6fc17ac removed console.log 2014-01-17 16:27:17 -05:00
psychobunny
4e5dfbc1c9 find .post-row instead of any li 2014-01-17 16:26:32 -05:00
Baris Soner Usakli
24ceb0f083 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-17 16:16:07 -05:00
Baris Soner Usakli
48eb6a3f22 composer changeS 2014-01-17 16:16:00 -05:00
Julian Lam
123f92ca1e fixed #711 2014-01-17 15:36:10 -05:00
Julian Lam
917dfe74e6 removing console log and removing a bit of code that would cause infinite loader to take 2.5s extra each round :P 2014-01-17 14:52:43 -05:00
Julian Lam
d8c4609ee0 fixed #649 - Once you hit the end, infinite loader will stop for good. If infinite loader is active when the browser hits the bottom, updateHeader will not assume 100%. 2014-01-17 14:47:18 -05:00
Julian Lam
962955f06a fixed bug with search (getTopicsByTids became error-first) 2014-01-17 14:29:46 -05:00
Julian Lam
51abf60b3a Merge branch 'socketAL-fix' 2014-01-17 14:15:56 -05:00
Julian Lam
48c22567c2 fixed #791 2014-01-17 14:13:23 -05:00
Julian Lam
17f98804c6 commented out "remember me" checkbox because it actually does nothing... :x 2014-01-17 14:08:12 -05:00
Baris Soner Usakli
e884ff1f59 modules fixes 2014-01-17 12:55:38 -05:00
Baris Soner Usakli
a34775a6c2 meta fixes 2014-01-17 12:52:04 -05:00
Baris Soner Usakli
c0712583f2 fixed category sockets 2014-01-17 12:49:21 -05:00
Baris Soner Usakli
d72926a5bb Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-17 12:42:26 -05:00
Baris Soner Usakli
a802dc4b68 admin.js socket fixes 2014-01-17 12:42:19 -05:00
Julian Lam
af6eb5359e Merge branch 'master' into socketAL-fix
Conflicts:
	public/language/cs/global.json
	public/language/fr/global.json
	src/routes/api.js
2014-01-17 12:10:49 -05:00
Julian Lam
727ad4b651 added cache buster to nodebb.min.js even if it has not changed 2014-01-17 12:07:33 -05:00
Julian Lam
5e695d3222 fixed incorrect language string used in fb button in default motd 2014-01-17 12:02:12 -05:00
Julian Lam
55c296a229 Merge pull request #790 from tedr56/master
Fr Translation Update
2014-01-17 08:33:15 -08:00
TedVJ
27762c2ab9 Fr Translation update #3 2014-01-17 16:41:04 +01:00
TedVJ
f63ab0faeb Fr Translation update #2 2014-01-17 16:35:32 +01:00
TedVJ
cfbbc238f6 Fr Translation Update 2014-01-17 16:16:51 +01:00
Julian Lam
2b32ede4d8 fixed czech welcome message 2014-01-17 09:09:43 -05:00
Julian Lam
04da0447b5 fixed global:motd.get in es 2014-01-17 08:58:53 -05:00
Julian Lam
45ce0566e7 added translation to default MOTD 2014-01-17 08:58:46 -05:00
Julian Lam
14b31cf4c8 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:58:40 -05:00
Julian Lam
c1c9438220 patching translator to ignore non-js files 2014-01-17 08:58:33 -05:00
Julian Lam
13ae2e9401 fixed global:motd.get in es 2014-01-17 08:54:34 -05:00
Julian Lam
beec96416f added translation to default MOTD 2014-01-17 08:53:23 -05:00
Julian Lam
253913f8d9 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:12:30 -05:00
Julian Lam
7e9d344487 patching translator to ignore non-js files 2014-01-17 08:04:23 -05:00
Baris Soner Usakli
cfaa6556d6 pass err 2014-01-17 00:07:02 -05:00
Baris Soner Usakli
b062af2c4b fixed user pwd reset 2014-01-16 23:46:08 -05:00
Baris Soner Usakli
b7f0c90bf7 more fixes 2014-01-16 22:44:34 -05:00
Baris Soner Usakli
b3816b98a1 more post fixes 2014-01-16 22:06:23 -05:00
Baris Soner Usakli
9e6f7fa960 reset 2014-01-16 21:19:57 -05:00
Baris Soner Usakli
31d353ab0e more fixes 2014-01-16 21:19:29 -05:00
Barış Soner Uşaklı
3a57c3b6d8 removed disabled attrib from reset button 2014-01-16 20:59:01 -05:00
Baris Soner Usakli
8740cc0fc7 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:53:42 -05:00
Baris Soner Usakli
ae76bb3928 lots of err first fixeS 2014-01-16 20:53:32 -05:00
Julian Lam
111776d878 notifications socket callbacks 2014-01-16 20:29:11 -05:00
Julian Lam
e95da77fe8 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:14:19 -05:00
Julian Lam
bc48ba874d fixed module.js callback format 2014-01-16 20:14:09 -05:00
Baris Soner Usakli
ced37044ca Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:59:03 -05:00
Baris Soner Usakli
426d3e871f more fixes 2014-01-16 19:58:57 -05:00
Julian Lam
cbb630fd6b fixed categories.js socket callbacks 2014-01-16 19:57:28 -05:00
Julian Lam
8041bee9fd Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:10:30 -05:00
Baris Soner Usakli
6da6baa213 more crash fixes to socketS 2014-01-16 18:50:45 -05:00
Baris Soner Usakli
ba8e98520c added data checks to user calls 2014-01-16 18:18:42 -05:00
Baris Soner Usakli
ddb9a4a60e fixed user load more 2014-01-16 18:12:31 -05:00
Baris Soner Usakli
4366c11ec0 users.js fix 2014-01-16 18:10:38 -05:00
Baris Soner Usakli
39b631a3a8 more fixes 2014-01-16 18:06:19 -05:00
Baris Soner Usakli
e061978bd5 more fixes 2014-01-16 17:52:46 -05:00
Baris Soner Usakli
2515ba9455 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 17:32:45 -05:00
Baris Soner Usakli
afe97233aa more fixes 2014-01-16 17:32:33 -05:00
Julian Lam
8b1ed1297b linting 2014-01-16 17:25:14 -05:00
Julian Lam
765402a2a0 fixed ACP online count 2014-01-16 17:22:11 -05:00
Baris Soner Usakli
e5c8caf5ff more fixes 2014-01-16 17:15:00 -05:00
Baris Soner Usakli
1ec21c2bfd metatitle 2014-01-16 17:11:27 -05:00
Baris Soner Usakli
7470c1bbd9 more fixes 2014-01-16 17:07:34 -05:00
Baris Soner Usakli
2893693d17 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:50:48 -05:00
Baris Soner Usakli
0b132cadcf user fixes 2014-01-16 16:50:41 -05:00
Julian Lam
3177fdfa74 partially fixed acp active users 2014-01-16 16:26:47 -05:00
Julian Lam
08f97efcd4 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:11:30 -05:00
Julian Lam
71f1f7137a fixes 2014-01-16 16:11:23 -05:00
Baris Soner Usakli
220b40ff9c topics.js 2014-01-16 16:10:23 -05:00
Julian Lam
97eff9c8a1 fixing index call and meta.js 2014-01-16 15:57:13 -05:00
Baris Soner Usakli
adf4a5c407 user.js changes 2014-01-16 15:46:37 -05:00
Julian Lam
42d6880ac4 migrating posts to new socketAL format 2014-01-16 15:34:43 -05:00
Julian Lam
35aa06c230 migrating notifications to new socketAL format 2014-01-16 15:31:57 -05:00
Julian Lam
be3284e05e migrating modules.js to new socketAL style 2014-01-16 15:28:21 -05:00
Baris Soner Usakli
8bb24fa034 fixed update header 2014-01-16 15:25:04 -05:00
Julian Lam
2235dbd2a0 migrating meta.js to new socketAL format 2014-01-16 15:19:07 -05:00
Baris Soner Usakli
f6bd52014e fixed conflict 2014-01-16 15:18:13 -05:00
Baris Soner Usakli
accde93fff removed api: from server 2014-01-16 15:17:25 -05:00
Julian Lam
69a9570186 migrated catefories.js to new socketAL format 2014-01-16 15:16:12 -05:00
Julian Lam
c215e61541 fixed up admin.js 2014-01-16 15:13:22 -05:00
Baris Soner Usakli
67799eac95 removed api: from client side socket calls 2014-01-16 15:10:37 -05:00
Julian Lam
4184574164 WIP admin.js socket underping 2014-01-16 15:00:49 -05:00
Baris Soner Usakli
d234dbdca2 first set of changes 2014-01-16 14:57:03 -05:00
Julian Lam
dfd2df99e6 removed "mark all as read" language strings and removed button from notifications page -- fixes #785 2014-01-16 14:25:46 -05:00
Julian Lam
b32887f2ce Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-16 12:35:18 -05:00
Julian Lam
a48a7acd51 fixing issue where after a user changed their username, the new name was not reindexed by Reds 2014-01-16 12:34:48 -05:00
Baris Soner Usakli
8f9f5b2849 added user images to profile button in mobile view 2014-01-16 02:37:55 -05:00
Baris Soner Usakli
72fd78ac26 fixed indent in chat.tpl 2014-01-15 19:22:11 -05:00
Baris Soner Usakli
16aeb2d09d added fb to motd default 2014-01-15 18:58:31 -05:00
Baris Soner Usakli
2d87ba534c can paste images directly from clipboard 2014-01-15 18:44:09 -05:00
Baris Soner Usakli
e671f0343e closes #782 2014-01-15 17:36:06 -05:00
Baris Soner Usakli
e16c3f3f80 added try catch to socket calls 2014-01-15 13:23:53 -05:00
Baris Soner Usakli
b303fdcfd7 removed inline css 2014-01-15 12:58:43 -05:00
MrWaffle
b78dc3eca8 Chat now supports markdown 2014-01-15 18:20:05 +01:00
Baris Soner Usakli
1bf3d33765 prevent clicks on autocomplete to scroll window to the top 2014-01-15 03:22:49 -05:00
Baris Soner Usakli
cd4cb240c8 upload file icon in composer was visible even when uploads were disabled 2014-01-15 02:33:20 -05:00
Baris Soner Usakli
82bc0aec6b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-14 19:23:33 -05:00
Baris Soner Usakli
c94da47ae8 added profile func, shorter getRecentReplies 2014-01-14 19:23:27 -05:00
Julian Lam
7de540dc74 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 19:01:53 -05:00
Julian Lam
b3f23d41d3 fixed #744 2014-01-14 19:01:12 -05:00
Baris Soner Usakli
466c02a886 removed teaser_text 2014-01-14 19:00:18 -05:00
Baris Soner Usakli
265d1f6331 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-14 18:05:02 -05:00
Baris Soner Usakli
dcf47f558e limit search in db 2014-01-14 18:04:54 -05:00
Julian Lam
facacc65aa Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 17:03:13 -05:00
Julian Lam
442c543d27 fixed #776 2014-01-14 17:02:54 -05:00
psychobunny
8c5a458798 fixed 403 redirect from logged out /admin 2014-01-14 14:33:43 -05:00
psychobunny
98d42b0ade moving social sharing parsing code from server side to client side & cleaned up templates 2014-01-14 14:30:14 -05:00
Baris Soner Usakli
75850bd315 closes #772 2014-01-14 13:10:31 -05:00
Julian Lam
5efc1e5de8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 12:34:54 -05:00
Julian Lam
d48e749d54 removed confirmation prompt in upgrade option in nodebb executable 2014-01-14 12:34:29 -05:00
psychobunny
6f129d9c68 allow password fields to be saved in ACP 2014-01-14 12:25:27 -05:00
Julian Lam
acc390f6ef added timeago locales, fixed timeago template error in ACP. 2014-01-14 11:13:58 -05:00
Julian Lam
c8a514aa37 updated new timeago path 2014-01-14 11:03:49 -05:00
Julian Lam
0ea09972b4 fixed issue where outgoing links warning page would intercept clicks to the search button in the headerbar (thanks @dove)
- linted some files
2014-01-14 10:31:21 -05:00
Julian Lam
3837841882 removed automatic "visible-xs-inline" on links added by static-page or -42 2014-01-14 10:13:12 -05:00
Julian Lam
a05d2d44e9 fixed cerulean version 2014-01-14 09:31:24 -05:00
Julian Lam
ebcf8eb03b upping cerulean minver 2014-01-14 09:28:44 -05:00
Julian Lam
bc407ee59c fixing topic moving 2014-01-14 09:19:33 -05:00
Julian Lam
a32aee60c2 reversing accidentally committed code to socket.io/index 2014-01-14 08:54:42 -05:00
Julian Lam
0266c5516c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 08:53:25 -05:00
Julian Lam
32470efb22 fixing upgrade script console.log and missing sessionData for topic moving 2014-01-14 08:53:10 -05:00
Baris Soner Usakli
bbcc2312db better redis info parser from node-redis 2014-01-14 08:20:41 -05:00
Baris Soner Usakli
07085f1ff2 fixed sockettopics.post 2014-01-14 07:39:01 -05:00
Baris Soner Usakli
0198024db0 parseInt uid 2014-01-14 07:36:01 -05:00
Baris Soner Usakli
bc835f59d4 mongo getListRange fix 2014-01-13 20:46:43 -05:00
Baris Soner Usakli
a97ee201d8 makes recent unread and category pages a lot faster, added logging when a user changes their username 2014-01-13 18:02:06 -05:00
Baris Soner Usakli
c07bf466b2 added back search limiting 2014-01-13 15:45:50 -05:00
Baris Soner Usakli
3475ed59c8 removed reds from install.js 2014-01-13 15:38:27 -05:00
Baris Soner Usakli
93292e701d added error check to setOnEmpty 2014-01-13 14:28:05 -05:00
Baris Soner Usakli
243cb5af61 fixed mobile search link 2014-01-13 14:19:08 -05:00
Baris Soner Usakli
26274bd75a closes #767 2014-01-13 13:50:33 -05:00
Julian Lam
97cc6cde67 closed #733 - after upgrade script, all users will be in a system "registered users" group 2014-01-13 13:32:49 -05:00
Julian Lam
619fe74fc0 moved groups admin socket calls into admin file instead of standalone groups file 2014-01-13 12:09:13 -05:00
Julian Lam
4453d055ea linted socket/admin.js 2014-01-13 12:05:13 -05:00
Julian Lam
aa689a7a29 fixed active users socket calls in ACP 2014-01-13 12:01:42 -05:00
Julian Lam
3fb44d7693 who needs recursion, bitch?
- enhanced socket abs layer so that a method call of infinite depth is supported (theoretically).
2014-01-13 11:40:08 -05:00
Julian Lam
5db9ff11d5 linting and adding missing require'd dep 2014-01-13 11:23:21 -05:00
Julian Lam
5e538ef051 fixed #710 - added labels to the top bar (update vanilla!)
merged "loading" and "more_posts" in topic i18n data, changed behaviour so that on mobile, only the spinner shows.
2014-01-13 10:47:48 -05:00
Julian Lam
2078fa25f8 added classname to chat dropdown if there are no chats 2014-01-13 10:11:23 -05:00
Julian Lam
b86ae3f7f0 fixed #756 - sequestering Notifications and Chat DOM functions in their module, and not in footer 2014-01-13 10:06:00 -05:00
Julian Lam
e36f92b18e closed #764 2014-01-13 09:50:29 -05:00
Barış Soner Uşaklı
dea43ee008 Merge pull request #763 from bdharrington7/master
added login register selectors to close the nav when clicked
2014-01-12 15:22:07 -08:00
Baris Soner Usakli
6053a8caa5 search icon should be hidden-xs 2014-01-12 18:21:00 -05:00
bdharrington7
bf96903d6e removed submenu for login / register in guest menu options 2014-01-12 15:10:10 -08:00
bdharrington7
e8c7860f12 Merge branch 'master' of https://github.com/bdharrington7/NodeBB 2014-01-12 14:15:14 -08:00
bdharrington7
2b63b2c52a fixed bug that hid the login menu option 2014-01-12 13:45:27 -08:00
bdharrington7
0ad1f1576b Fix: login / register collapses on click, Search unavailable if not allowed 2014-01-12 13:45:27 -08:00
Baris Soner Usakli
5febb3dc23 clicking the pagination block no longer sends page to top 2014-01-12 13:45:27 -08:00
Baris Soner Usakli
a885444740 fixes toggle_mod_tools undefined error 2014-01-12 13:45:27 -08:00
bdharrington7
d60151a6cc excluding .DS_Store 2014-01-12 13:45:26 -08:00
bdharrington7
3ccc11d53c fixed bug that hid the login menu option 2014-01-12 13:36:15 -08:00
bdharrington7
cfda0a93c4 Fix: login / register collapses on click, Search unavailable if not allowed 2014-01-12 13:12:13 -08:00
Baris Soner Usakli
92894277a9 clicking the pagination block no longer sends page to top 2014-01-12 15:52:44 -05:00
Baris Soner Usakli
1580226757 fixes toggle_mod_tools undefined error 2014-01-12 15:37:33 -05:00
bdharrington7
ffa1f1703d Merge branch 'master' of https://github.com/bdharrington7/NodeBB 2014-01-12 12:32:48 -08:00
bdharrington7
99dc989c39 excluding .DS_Store 2014-01-12 12:32:18 -08:00
Julian Lam
8d71098a0f fixed detection for admin client-side scripts 2014-01-12 14:38:54 -05:00
Lumir Mrkva
bd0d09584b added czech translation 2014-01-12 19:24:02 +01:00
Baris Soner Usakli
1e59147d64 closes #760 2014-01-12 00:04:02 -05:00
Julian Lam
3da96faa12 fixed email exists error... weird. 2014-01-11 22:14:20 -05:00
Julian Lam
98e4257939 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-11 22:09:30 -05:00
Julian Lam
eb974ec1d8 fixing user register socket calls 2014-01-11 22:09:23 -05:00
Baris Soner Usakli
30ad852492 closes #758 2014-01-11 17:48:24 -05:00
Baris Soner Usakli
8bc0096b00 dont closed composer if callback isn't called 2014-01-11 16:15:50 -05:00
Baris Soner Usakli
f73c81d6c3 closes #755 2014-01-11 15:33:58 -05:00
Julian Lam
ee963e0c2a moved reconnected socket call to SocketsMeta 2014-01-11 14:03:50 -05:00
Julian Lam
99af660e48 adding missing modules.json files in languages 2014-01-11 14:03:28 -05:00
Julian Lam
6d300e1110 updated chat i18n strings to use new modules.json file, added said files to language dirs 2014-01-11 12:12:04 -05:00
Julian Lam
b61614f87b fixed htmlentities in italian translation 2014-01-11 11:52:43 -05:00
Francesco
fd83769bde added italian language files 2014-01-11 11:44:08 -05:00
Julian Lam
eabe3ada6f upped mentions minver to 0.2 2014-01-11 11:29:05 -05:00
Julian Lam
3264658269 Merge remote-tracking branch 'origin/master' into socketAL 2014-01-11 11:26:52 -05:00
Julian Lam
73cbde4098 removed websockets.js wooo 2014-01-11 11:26:44 -05:00
bdharrington7
e5fc0819b4 excluding .DS_Store 2014-01-10 20:22:17 -08:00
psychobunny
97ec312c72 console.log 2014-01-10 17:08:01 -05:00
psychobunny
05edfdc9c1 templates.js - if custom theme is missing a template, render default template 2014-01-10 17:06:56 -05:00
Julian Lam
067a7a544b Merge remote-tracking branch 'origin/master' into socketAL 2014-01-10 16:09:04 -05:00
Julian Lam
a150691b5e that's the last of it!! :D 2014-01-10 16:00:03 -05:00
Baris Soner Usakli
b8d858ccca Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-10 14:12:04 -05:00
Baris Soner Usakli
ee1ac1b2c3 fixes post move 2014-01-10 14:11:55 -05:00
Julian Lam
a2329980c8 Merge remote-tracking branch 'origin/master' into socketAL 2014-01-10 13:28:11 -05:00
Julian Lam
ea8aa3fff2 admin stuff, removed deprecated install templates, blah blah 2014-01-10 13:27:50 -05:00
Julian Lam
c5d8a5a6b2 thread tools (phew!) -- sessionData is getting larger :P 2014-01-10 10:50:05 -05:00
psychobunny
ef01717562 allow themes to set path to a frameworkCSS so you can include a customized BS or another framework altogether 2014-01-10 03:08:46 -05:00
Julian Lam
8dd8412ae3 so far so good... user, meta, notifications, categories 2014-01-09 22:47:07 -05:00
Julian Lam
5a589c885a Merge remote-tracking branch 'origin/master' into socketAL 2014-01-09 21:27:57 -05:00
Julian Lam
dfa9f203e6 crashing a lot less now, heh 2014-01-09 21:27:50 -05:00
Julian Lam
adb8f80b86 interim commit - removed calls to websockets.js, beginning porting to namespaced files 2014-01-09 20:13:17 -05:00
Baris Soner Usakli
92ca739002 center on load 2014-01-09 20:04:50 -05:00
Baris Soner Usakli
c19d3e8063 closes #738 2014-01-09 19:34:51 -05:00
Baris Soner Usakli
30624d4ad8 tabbified the admin settings page 2014-01-09 17:51:26 -05:00
Baris Soner Usakli
9c60182da4 closes #749 2014-01-09 15:58:31 -05:00
psychobunny
1caaa8c20a re-initialize translator when language is changed in ACP 2014-01-09 14:21:58 -05:00
Julian Lam
c2a1cd94d0 addressing issue for #728 where existing NodeBBs don't have a defaultLang set 2014-01-09 13:42:35 -05:00
Julian Lam
df4c6ca1c8 integrating client side translator into new languages tab in ACP 2014-01-09 13:37:25 -05:00
Julian Lam
cd6af45afb added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
2014-01-09 13:29:41 -05:00
Julian Lam
119079ace5 added missing link, numRecentReplies, and class values to category.create... fixed #754, fixed #751 2014-01-09 11:50:24 -05:00
Baris Soner Usakli
dff10045da removed my console.logs as usual 2014-01-08 22:55:33 -05:00
Baris Soner Usakli
dda4586a2f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 22:54:03 -05:00
Baris Soner Usakli
dabd2f29af closes #747 2014-01-08 22:53:55 -05:00
Julian Lam
029b91a323 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-08 21:50:26 -05:00
Julian Lam
ac04e04016 fixed #719 2014-01-08 21:50:19 -05:00
Baris Soner Usakli
3a6db04be5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 21:47:16 -05:00
Baris Soner Usakli
eb65c5ad1b reindex user name after change, #745 2014-01-08 21:47:09 -05:00
Julian Lam
c2c1632c0e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-08 21:25:11 -05:00
Julian Lam
2495b5b89b refactored group category permissions, removed getCategoryAccess method call 2014-01-08 21:25:01 -05:00
Baris Soner Usakli
176ac54cdf closes #745 2014-01-08 21:19:32 -05:00
Baris Soner Usakli
e07c848da7 closes #737 2014-01-08 16:30:27 -05:00
Baris Soner Usakli
6b8f7dba4f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 16:11:59 -05:00
Baris Soner Usakli
825e4cca5a closes #744 2014-01-08 16:11:47 -05:00
Julian Lam
ab16b1184d fixing issue where nojs mode of a private category would show the category topics, even if the requesting user was not allowed inside 2014-01-08 15:09:24 -05:00
Julian Lam
127261100e fixed #698 - ajaxify.go will now cancel any active API requests when it is called 2014-01-08 14:53:32 -05:00
Baris Soner Usakli
67f8af7e3e #744 2014-01-08 06:19:22 -05:00
Baris Soner Usakli
d2c0aa9949 fixed auto complete for insertion in the middle, 6am commits FTW 2014-01-08 06:15:48 -05:00
Baris Soner Usakli
0d26b21a2c prevent double res.send/json if error occurs in profile image upload 2014-01-08 02:59:14 -05:00
Baris Soner Usakli
2d384a68d2 oops extra $ 2014-01-08 02:39:50 -05:00
Baris Soner Usakli
414eaea413 username mention auto completes 2014-01-08 02:39:06 -05:00
Baris Soner Usakli
a4ae9c70df closes #742, closes #741 2014-01-07 17:30:29 -05:00
Baris Soner Usakli
6f94acd0f2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-07 15:00:12 -05:00
Baris Soner Usakli
8e6606fb5a move post 2014-01-07 15:00:05 -05:00
psychobunny
cfa4256df5 admin - download emails.csv, thanks to @akhoury for the gist 2014-01-07 14:01:32 -05:00
Baris Soner Usakli
4912b8a893 fixed language regex 2014-01-07 00:14:20 -05:00
Baris Soner Usakli
f75e55aa11 fixed path 2014-01-06 23:45:31 -05:00
Baris Soner Usakli
88305b3350 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-06 23:44:39 -05:00
Baris Soner Usakli
d6333a3969 fixed plugin css files for relative path 2014-01-06 23:44:32 -05:00
Julian Lam
538bb3e871 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-06 19:24:24 -05:00
Julian Lam
649d8af36b updated help doc for executable 2014-01-06 19:24:09 -05:00
Baris Soner Usakli
faf5ea2122 check if we have edit permission on the pids that we want to move 2014-01-06 19:20:01 -05:00
Baris Soner Usakli
291aa872c4 cant fork if not logged in 2014-01-06 19:12:34 -05:00
Baris Soner Usakli
2e575bb2d8 closes #524 2014-01-06 17:37:42 -05:00
psychobunny
7c8c735e05 i8n - if translation not present, use a readable key 2014-01-06 02:49:41 -05:00
psychobunny
b21a202142 my data went on a date and found out we have out of date data 2014-01-06 00:14:33 -05:00
psychobunny
032d46465d closes #551 2014-01-05 23:57:43 -05:00
psychobunny
6f120ff34a closes #732, custom robots.txt 2014-01-05 23:19:52 -05:00
psychobunny
0e5358a701 closes #698 2014-01-05 23:09:28 -05:00
psychobunny
7be16eab06 closes #722 2014-01-05 23:02:19 -05:00
Baris Soner Usakli
58580bd866 closes #716, also moved chat to its own template 2014-01-05 22:09:13 -05:00
Baris Soner Usakli
be316ff602 fixed mongo listRemoveAll 2014-01-05 20:44:06 -05:00
Baris Soner Usakli
dfc8aacbae closes #735, removed create collection calls 2014-01-05 19:08:36 -05:00
Baris Soner Usakli
8c04e8e56c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-05 18:30:21 -05:00
Baris Soner Usakli
cd6750a38d minor fix 2014-01-05 18:30:14 -05:00
Julian Lam
71681b936f fixed #731 2014-01-05 18:27:13 -05:00
Julian Lam
4923c79496 tweaking upgrade script 2014-01-05 14:17:37 -05:00
Julian Lam
3f0f5a09a0 new upgrade directive to re-slugify usernames again 2014-01-05 14:07:26 -05:00
Julian Lam
f7b7af3004 so xregexp uses double backslashes... 2014-01-05 13:59:02 -05:00
Julian Lam
5a88a5ca60 allow underscores in slugs 2014-01-05 12:55:39 -05:00
Julian Lam
6567819294 commented out "language" directive in executable (didn't do anything anyway), and added "upgrade" directive 2014-01-05 12:15:23 -05:00
Baris Soner Usakli
e69611fa22 if email didnt change dont update and dont log 2014-01-05 01:53:01 -05:00
Baris Soner Usakli
48074ea93b redirect if category is accessed directly 2014-01-05 01:39:33 -05:00
Baris Soner Usakli
4dc8f2c2e1 closes #665 2014-01-05 01:26:23 -05:00
psychobunny
b131dacf39 set external link for categories 2014-01-05 01:16:39 -05:00
Baris Soner Usakli
32f17d5e13 closes #729 2014-01-05 00:39:15 -05:00
Julian Lam
bee3c06a07 clicking 'quote' now shows the quoted username before said quote 2014-01-04 21:41:22 -05:00
Julian Lam
8aa227b052 added note re: third-party emailer pluginses 2014-01-04 21:09:21 -05:00
Julian Lam
eaf25c4a5f removing SMTP settings fields in email settings portion of settings tab in ACP 2014-01-04 21:07:10 -05:00
Julian Lam
f90beca449 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-04 20:09:03 -05:00
Julian Lam
724dcb88c0 added translator integration to emailer 2014-01-04 20:08:59 -05:00
Baris Soner Usakli
e5ec5242c6 added relative_path 2014-01-04 19:35:02 -05:00
Baris Soner Usakli
c3f7faffd3 added relative_path in admin site templaets 2014-01-04 19:30:09 -05:00
Baris Soner Usakli
43a1ce66a1 added relative_path to recent_replies and browsing users 2014-01-04 19:20:59 -05:00
Baris Soner Usakli
9da165c1a7 added relative_path to templates 2014-01-04 19:08:09 -05:00
Baris Soner Usakli
02e550d3ad Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 18:28:01 -05:00
Baris Soner Usakli
680fac0674 added relative_path to header.tpl 2014-01-04 18:27:54 -05:00
psychobunny
ea49295774 some translator methods useful for plugins that wish to support i8n 2014-01-04 18:15:10 -05:00
Baris Soner Usakli
0edb895c2c indent 2014-01-04 18:09:43 -05:00
Baris Soner Usakli
981719dee1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 18:05:22 -05:00
Baris Soner Usakli
1466e68aa1 ssl support 101 2014-01-04 18:05:15 -05:00
Julian Lam
f1412193ef Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-04 18:04:12 -05:00
Julian Lam
b6fdc5595d removed handlebars dependency for emailer, using ANDREWBARS now 2014-01-04 18:03:54 -05:00
psychobunny
fda68bc5dd added templates.setGlobal - allows you to add default template vars that are sent to all tpls upon parsing; added relative_path as global 2014-01-04 17:44:13 -05:00
Baris Soner Usakli
487281cc7a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 17:11:04 -05:00
Baris Soner Usakli
751dc73ebe fixes login/register and auth routes in relative path install 2014-01-04 17:10:56 -05:00
psychobunny
7f8836daa4 simplified filter:server.create_routes - routes no longer require you to pass in req, res, name, route (the latter two was a mistake)
tl;dr - just content is all that is required. see
http://www.github.com/psychobunny/nodebb-plugin-static-page for more
info
2014-01-04 17:01:01 -05:00
Julian Lam
5c048ac20a closed #727 2014-01-04 14:24:50 -05:00
Julian Lam
11ed9e8c85 tweaks to emailer, implemented emailer hook for password reset 2014-01-04 11:55:41 -05:00
Julian Lam
0ac9ec6001 Merge remote-tracking branch 'origin/master' into email-revamp 2014-01-04 11:19:23 -05:00
Baris Soner Usakli
ecb64a0aa2 removed extra , 2014-01-04 02:10:37 -05:00
Baris Soner Usakli
8626122679 category active users are stored in a sorted set now 2014-01-04 01:15:41 -05:00
Baris Soner Usakli
8ab539b518 0.2.1 2014-01-04 00:50:23 -05:00
Baris Soner Usakli
9078c2a536 0.2.0 2014-01-04 00:49:10 -05:00
Baris Soner Usakli
fd20e4a400 5% more 2014-01-04 00:41:25 -05:00
Baris Soner Usakli
1a64e40b21 upgrade check 2014-01-04 00:38:43 -05:00
Julian Lam
cbfba4b45b 0.2.1 2014-01-04 00:04:37 -05:00
Baris Soner Usakli
f21a98f37f first pass, #524, #667 2014-01-03 21:33:41 -05:00
psychobunny
0edd6985ec templates.js added support for !@first and !@last conditionals 2014-01-03 21:23:08 -05:00
psychobunny
98a646fa62 changed numRecentTopics to numRecentReplies, that makes more sense now 2014-01-03 20:37:29 -05:00
psychobunny
1d69436b44 fix to getRecentReplies causing count = 0 to return unlimited 2014-01-03 20:36:00 -05:00
psychobunny
d6c7551120 pull # of recent replies based on settings 2014-01-03 20:29:09 -05:00
psychobunny
fb53e89023 upgrade.js - categories.numRecentTopics 2014-01-03 20:20:23 -05:00
psychobunny
d28beaa4dc admin - add "# recent topics to display" to categories 2014-01-03 20:17:55 -05:00
psychobunny
ac06567617 admin - add custom class to categories (forgot to commit this) 2014-01-03 20:14:26 -05:00
Baris Soner Usakli
d0a2c077ff refactored posts.create to use waterfall 2014-01-03 19:32:52 -05:00
psychobunny
ebf07626de use categories.class instead of hardcoded columns 2014-01-03 17:22:37 -05:00
psychobunny
9ef8bb4cdc woops, fail at iteration 2014-01-03 17:22:23 -05:00
psychobunny
bc8a53aadd upgrade.js - adding categories.class and categories.link 2014-01-03 17:09:19 -05:00
psychobunny
03c4a1bc73 remove console.log(file) - no more exploding terminals 2014-01-03 15:59:49 -05:00
Julian Lam
d93163896f Merge pull request #701 from aonz1982/install_automated_setup
Install automated setup
2014-01-02 18:47:38 -08:00
Julian Lam
08bdbc0bcc cleanup of PR - fixed some logic bugs and linted 2014-01-02 21:44:13 -05:00
Julian Lam
35d6a99775 Merge branch 'AdminButton' of github.com:genderup/NodeBB into genderup-AdminButton 2014-01-02 21:34:03 -05:00
Julian Lam
cdb0b4b49e Merge branch 'master' into email-revamp 2014-01-02 18:14:07 -05:00
Julian Lam
e45e86fcc1 fixed width icons in ACP. Also, who uses single quotes in HTML? ARGH 2014-01-02 18:13:46 -05:00
Julian Lam
24944762d7 fixing 'back to nodebb' ext, and revamping email confirm logic 2014-01-02 16:26:56 -05:00
Baris Soner Usakli
9589d340b9 removed console.log 2014-01-02 16:00:24 -05:00
Baris Soner Usakli
91afbf106e removed console.log 2014-01-02 16:00:05 -05:00
Baris Soner Usakli
aff11359ae Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-02 15:59:34 -05:00
Baris Soner Usakli
aff8cef5f3 closes #717 2014-01-02 15:59:25 -05:00
Julian Lam
d6e0625fc8 Merge remote-tracking branch 'origin/master' into email-revamp 2014-01-02 15:21:59 -05:00
Julian Lam
879855744d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-02 15:21:00 -05:00
Julian Lam
b5ab0c9097 updated minvers for markdown and mentions 2014-01-02 15:20:54 -05:00
psychobunny
2c398f81d2 fixed the twitter link to @NodeBB 2014-01-02 15:06:08 -05:00
Baris Soner Usakli
520fcadd3f closes #456 2014-01-02 14:53:27 -05:00
Baris Soner Usakli
e8eb9f91b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-02 14:26:30 -05:00
Baris Soner Usakli
8bfb338eee #712 2014-01-02 14:26:08 -05:00
Julian Lam
bbb655abdd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-02 02:17:55 -05:00
Julian Lam
095e5527e3 upping markdown minver 2014-01-02 02:17:47 -05:00
Barış Soner Uşaklı
4eb8c34855 Merge pull request #715 from cmastudios/age
Calculate age based on days instead of years
2014-01-01 18:35:47 -08:00
cmastudios
e3185b9560 Calculate age based on days instead of years
Calculating the age based on the year only caused issues in the display of the age because it was off. Example: Person who was born in march of 1999 is displayed as 15 instead of 14 after the turn of the year.
2014-01-01 19:46:11 -05:00
Julian Lam
449adfae59 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-01 15:31:32 -05:00
Julian Lam
714e61b137 upping markdown minver 2014-01-01 15:31:27 -05:00
Baris Soner Usakli
d0e4689907 removed extra event in websocket.js 2014-01-01 14:44:15 -05:00
Baris Soner Usakli
1996e64c9b if imgur client id is not set but local file uploads are enabled use that 2014-01-01 14:38:12 -05:00
Baris Soner Usakli
e2fb617cc0 thread delete restore fix 2014-01-01 14:15:53 -05:00
Baris Soner Usakli
fd88aff195 mongo string fix 2014-01-01 14:11:12 -05:00
Julian Lam
f7a1cca861 properly fixed #713 2013-12-31 20:53:24 -05:00
Julian Lam
e3fb996a80 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 20:28:37 -05:00
Julian Lam
fe53037e53 hopefully fixing #713 2013-12-31 20:28:31 -05:00
Baris Soner Usakli
438f90d859 expire functionality in dbal 2013-12-31 19:08:38 -05:00
Julian Lam
339ed4e47b implemented emailer for welcome email (though the email confirmation system is horribly broken) 2013-12-31 18:00:10 -05:00
Julian Lam
5a527de287 fixed debug output when plugin method is not found 2013-12-31 17:19:37 -05:00
Julian Lam
3ff550914f Merge remote-tracking branch 'origin/master' into email-revamp
Conflicts:
	package.json
2013-12-31 17:15:38 -05:00
Baris Soner Usakli
742c8fb43c closes #712 2013-12-31 17:14:27 -05:00
Baris Soner Usakli
d43f3cebc6 closes #707, closes #686 2013-12-31 17:01:51 -05:00
Julian Lam
9d452241ad Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 14:46:33 -05:00
Julian Lam
c19a51e1b6 tweaking slugify code to not remove numbers 2013-12-31 14:46:28 -05:00
Baris Soner Usakli
1b41a8f467 fixed typo 2013-12-31 14:32:16 -05:00
Baris Soner Usakli
f933fc0167 forgot topics.js oops 2013-12-31 14:27:56 -05:00
Baris Soner Usakli
8cfb239aac closes #705 2013-12-31 14:25:26 -05:00
Baris Soner Usakli
a974c6fa99 possible fix for mongo crash 2013-12-31 13:45:37 -05:00
Julian Lam
998f780fd2 fuck, I am dumb. 2013-12-31 13:11:32 -05:00
Julian Lam
b022d46d47 upgrade script for Topic titless and Usernames - closes #709 2013-12-31 13:04:29 -05:00
Julian Lam
f7793e54b1 adding events.log 2013-12-31 10:49:26 -05:00
Julian Lam
1e61033667 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 10:49:05 -05:00
Julian Lam
53caa5e422 full unicode support in slugify method, thanks to XRegExp 2013-12-31 10:48:59 -05:00
Julian Lam
dd72e73284 emailer invocation for new users 2013-12-31 09:33:25 -05:00
Baris Soner Usakli
40d20846d8 moar refactor 2013-12-31 03:36:42 -05:00
Baris Soner Usakli
204913c63d Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-31 03:14:29 -05:00
Baris Soner Usakli
6c30437c47 closes #706, refactor admin image uploads, fixed gif uploads 2013-12-31 03:14:22 -05:00
Barış Soner Uşaklı
dd7fe47dfd Merge pull request #704 from akhoury/master
guarding against Errors on Socket Disconnect
2013-12-30 16:55:21 -08:00
Aziz Khoury
50323c3d23 guarding against Errors on Socket Disconnect
Saw this 

```
TypeError: Cannot call method 'indexOf' of undefined
    at Socket.<anonymous> (/home/admin/NodeBB/src/websockets.js:108:33)
    at Socket.EventEmitter.emit [as $emit] (events.js:95:17)
    at Socket.onDisconnect (/home/admin/NodeBB/node_modules/socket.io/lib/socket.js:153:10)
    at SocketNamespace.handleDisconnect (/home/admin/NodeBB/node_modules/socket.io/lib/namespace.js:229:46)
```

and this

```
/home/admin/NodeBB/src/websockets.js:113
			if (userSockets[uid].length === 0) {
			                    ^
TypeError: Cannot read property 'length' of undefined
    at Socket.<anonymous> (/home/admin/NodeBB/src/websockets.js:113:24)
```

in my logs, when users are disconnecting
2013-12-30 19:40:57 -05:00
psychobunny
69e0aa338d resolved some todo that's been in there for many months 2013-12-30 17:11:59 -05:00
psychobunny
6dcd06b63c removed unused parameter in templates.prepare 2013-12-30 16:26:30 -05:00
psychobunny
42d77080f3 plugins: filter:server.create_routes - allow plugins to add custom templates and/or modify individual blocks withiin a template 2013-12-30 16:20:05 -05:00
Baris Soner Usakli
fbb4998999 closes #676 2013-12-30 16:09:07 -05:00
Julian Lam
e4e57ce31f initial commit to emailer system overhaul 2013-12-30 14:02:43 -05:00
Julian Lam
14744a854f fixes #703 - topic feeds were not saving (who knows for how long!) 2013-12-30 12:39:13 -05:00
Pongsan Sayampol
2c6afb4244 Add a way to set social network logins 2013-12-30 11:46:33 +07:00
Pongsan Sayampol
24907e456d Fix the issue that the default values are saved to config.json 2013-12-30 11:45:10 +07:00
Baris Soner Usakli
2039885d96 removed console.logs 2013-12-29 23:35:04 -05:00
Baris Soner Usakli
daacdb50f3 closes #645 2013-12-29 23:33:28 -05:00
Baris Soner Usakli
21155b1b80 recent rss link fix 2013-12-29 21:35:03 -05:00
Barış Soner Uşaklı
5d69167a64 updated pictures 2013-12-29 20:55:46 -05:00
psychobunny
5db27a835f fix for minification of plugins static directories 2013-12-29 19:36:18 -05:00
Baris Soner Usakli
c8e423e9cf check if item is valid 2013-12-29 18:25:21 -05:00
Baris Soner Usakli
be3465c5ca display events in admin page events section 2013-12-29 18:10:42 -05:00
Baris Soner Usakli
637e037e27 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-29 16:03:32 -05:00
Baris Soner Usakli
3e6bcd83cc fixed typo in user reset 2013-12-29 16:03:25 -05:00
psychobunny
dc4aeca427 also send notification data along with event:new_notification socket call 2013-12-29 15:09:34 -05:00
Baris Soner Usakli
9eb09f14cb updated vanilla ver 2013-12-29 13:57:04 -05:00
Baris Soner Usakli
a55fc364a0 closes #697 2013-12-29 13:47:34 -05:00
Baris Soner Usakli
2f90949560 vanilla color fixes 2013-12-28 14:36:33 -05:00
Baris Soner Usakli
a940219321 remvoed the timeout on the login call 2013-12-28 13:11:49 -05:00
Michael Mitchell
aaf6b11dc9 removed extraneous 2013-12-28 08:34:59 -08:00
Michael Mitchell
0f0913bfe5 add admin button 2013-12-27 14:18:30 -08:00
Michael Mitchell
5569337c40 first 2013-12-27 14:09:27 -08:00
Baris Soner Usakli
ba2f47ead6 closes #690, closes #691 2013-12-27 14:09:22 -05:00
Julian Lam
b52782deb8 removed use of strip_tags and using String library instead 2013-12-26 21:10:26 -05:00
Julian Lam
2c6bf93eb5 added String parsing library, sanitizing meta tag "description" for
topics, and added og:description meta tag -- fixes #688
2013-12-26 20:37:45 -05:00
Julian Lam
4a11307b24 0.2.0 2013-12-26 16:04:06 -05:00
Julian Lam
d8183c056c added cache buster to require.js files - fixes #687 2013-12-26 15:58:46 -05:00
Julian Lam
6ad28dadd4 Merge pull request #685 from akhoury/master
can i haz header-icons pls, merry xmas
2013-12-26 12:21:35 -08:00
Baris Soner Usakli
2c489c600c closes #675 2013-12-24 13:12:25 -05:00
akhoury
abc782f5e6 can i haz header-icons pls, merry xmas 2013-12-24 13:00:04 -05:00
Baris Soner Usakli
a18e366493 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-23 22:07:21 -05:00
Baris Soner Usakli
12e95df068 removed console.log 2013-12-23 22:07:13 -05:00
Julian Lam
a078f73e84 omg I don't know what I am doing 2013-12-23 22:06:53 -05:00
Julian Lam
8f879cd3eb topics will no longer show up in /recent if user cannot access them 2013-12-23 21:50:47 -05:00
Julian Lam
8385ceef79 topics in private categories can no longer be accessed via ajaxify or by
direct link
2013-12-23 21:42:34 -05:00
Baris Soner Usakli
83cc8f3ba8 fixed header template value too 2013-12-23 21:03:45 -05:00
Baris Soner Usakli
cab6ab8e17 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-23 21:00:02 -05:00
Baris Soner Usakli
e9fbed71ae closes #613, fixed allowRegistration incase its undefined 2013-12-23 20:59:55 -05:00
Julian Lam
b4121f262d removing serializeUser console.log -- how long has this ben here? haha 2013-12-23 20:51:17 -05:00
Julian Lam
256a2fa9c6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-23 20:12:43 -05:00
Julian Lam
0f362b7fac updated bootstrap - because why not 2013-12-23 20:07:00 -05:00
Baris Soner Usakli
b504e2cd11 closes #658 2013-12-23 19:17:03 -05:00
Baris Soner Usakli
ea84fd70af Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-23 15:40:24 -05:00
Baris Soner Usakli
09efb83ef3 make sure relativeTime doesn't display negative values 2013-12-23 15:40:16 -05:00
Julian Lam
b2aeb14094 upping vanilla minver 2013-12-23 15:28:39 -05:00
Julian Lam
0ed8fd6cbd Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-23 15:23:45 -05:00
Julian Lam
2f1a3b9789 enabled touch events for composer resizing -- composer is now ipad
supported!
2013-12-23 15:23:08 -05:00
Baris Soner Usakli
d068139d81 changed header links to icons 2013-12-23 14:40:58 -05:00
Baris Soner Usakli
764e937c43 removed inline style 2013-12-23 14:21:28 -05:00
Baris Soner Usakli
f72cf35348 closes #680 2013-12-23 13:59:12 -05:00
Baris Soner Usakli
fe1a75d1fd paginator starts hidden 2013-12-23 13:49:24 -05:00
Baris Soner Usakli
3dc9e2f4fa added the success alert 2013-12-23 13:31:13 -05:00
Baris Soner Usakli
3bd8cf69a1 admins can create users from admin/users panel 2013-12-23 13:27:26 -05:00
Baris Soner Usakli
2c8725558e added allowRegistration to install 2013-12-23 12:31:51 -05:00
Baris Soner Usakli
f68f02d346 closes #679 2013-12-23 12:22:50 -05:00
Barış Soner Uşaklı
8fd78199e2 Merge pull request #678 from aonz1982/install_mongo_username
Installation problem when selecting MongoDB
2013-12-23 08:23:56 -08:00
Pongsan Sayampol
1bde86a33f MongoDB username is not saved to the config file during the installation. 2013-12-23 23:07:18 +07:00
Baris Soner Usakli
b6d4ae2732 removed mobile menu 2013-12-22 15:20:11 -05:00
Baris Soner Usakli
680dbf138a closes #669 2013-12-22 15:15:59 -05:00
Baris Soner Usakli
3752a1c691 small fixes 2013-12-21 19:42:21 -05:00
Baris Soner Usakli
3a00c177d3 closes #150 2013-12-21 19:42:07 -05:00
Baris Soner Usakli
845e5e7986 no need to store taskbar 2013-12-21 00:18:11 -05:00
Baris Soner Usakli
57d2db36e6 if not term just use empty string 2013-12-21 00:07:00 -05:00
Baris Soner Usakli
8bfea656c4 Merge branch 'master' of https://github.com/akhoury/NodeBB into akhoury-master 2013-12-20 23:53:53 -05:00
Baris Soner Usakli
ea2c03e28b closes #670 2013-12-20 23:35:40 -05:00
Baris Soner Usakli
f29b375ed4 refactored composer so that it uses a different div for each instance, closes #575 2013-12-20 18:41:56 -05:00
Julian Lam
07f1e0bcb5 ninjafix -- if you don't have a saved composer width, it doesn't set a
width (default ot 50%)
2013-12-20 12:34:26 -05:00
Julian Lam
0b94297c64 Merge remote-tracking branch 'origin/master' into composer-revamp 2013-12-19 18:36:20 -05:00
Baris Soner Usakli
8655c2d2a6 removed console.log 2013-12-19 15:43:15 -05:00
Baris Usakli
da9c673ec4 closes #651 2013-12-19 14:57:59 -05:00
Julian Lam
1e6863ee19 adjusting snap guide sensitivity 2013-12-19 00:08:47 -05:00
Julian Lam
00eb6b4efc responsive fixes for new composer 2013-12-19 00:02:14 -05:00
Julian Lam
002826d84f resizing the post composer now saves the size for future windows 2013-12-18 23:56:59 -05:00
Julian Lam
289e081e2e fixed new composer posting (woot) 2013-12-18 23:18:12 -05:00
Baris Soner Usakli
a717e9626e closes #666, the issue of the beast 2013-12-18 19:23:11 -05:00
Julian Lam
83f20c1cdb OMG SNAPS 2013-12-18 18:48:42 -05:00
Baris Soner Usakli
bc8adff70a fixed plugin deactivation 2013-12-18 15:32:38 -05:00
Julian Lam
c4623e2447 Merge remote-tracking branch 'origin/master' into composer-revamp 2013-12-18 15:12:30 -05:00
Julian Lam
99fba3b83a fixing issue where composer pushing didn't wait for the template to
properly render :P
2013-12-18 10:03:49 -05:00
Baris Soner Usakli
2580caf864 fixing #591 again looks like it got overwritter by merge 2013-12-18 05:35:06 -05:00
Julian Lam
f2d631e42d new composer window template (WIP!) 2013-12-17 23:42:02 -05:00
Julian Lam
d86aefb518 removing defunct "template" argument in ajaxify.go 2013-12-17 21:53:50 -05:00
psychobunny
3782ae1647 don't show profile fields if they are hidden. closes #660. also added missing language keys to EN 2013-12-17 18:05:58 -05:00
psychobunny
36e1a121ed removing some console.log's 2013-12-17 17:48:51 -05:00
psychobunny
2e52dd59ee Merge pull request #664 from ifuyivara/master
Adding support for restricting category read access based on user groups
2013-12-17 14:47:25 -08:00
psychobunny
d7a444d9ab dynamically update post count in post footer on new post 2013-12-17 16:10:32 -05:00
psychobunny
f9e2b50826 dynamically update user rep in post footer if reputation is increased 2013-12-17 16:01:08 -05:00
psychobunny
32a32fcf5c match login.tpl button to look like register.tpl 2013-12-17 15:42:01 -05:00
psychobunny
9435acfa71 skip debug messages for supervisor 2013-12-17 15:37:42 -05:00
root
35ad3be969 Adding support for restricting category read access based on user groups 2013-12-17 20:34:21 +00:00
Baris Soner Usakli
9cb20c3886 added callback to api categories.get 2013-12-16 19:12:26 -05:00
psychobunny
a2c9867902 plugins - woops, wrong namespace for admin api calls 2013-12-16 15:45:52 -05:00
psychobunny
58a3f33200 plugins - added api routes to filter:admin.create_routes 2013-12-16 15:40:59 -05:00
psychobunny
25bac03bab fixed facebook + gplus authentication - callbackURL was invalid 2013-12-15 14:12:36 -05:00
Baris Soner Usakli
770cea9329 added more error first to some functions 2013-12-14 16:29:33 -05:00
Baris Soner Usakli
30c11a8b42 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-13 16:36:38 -05:00
Baris Soner Usakli
27a01f6c61 closes #657 2013-12-13 16:36:29 -05:00
psychobunny
bf27ade251 admin - added ability to remove icon from categories 2013-12-13 16:26:32 -05:00
psychobunny
9d88b9eed3 default motd now shows @NodeBB, and not @dcplabs 2013-12-13 15:55:24 -05:00
akhoury
04ea573caa removed jQuery from iife, the $ is global 2013-12-12 22:52:44 -05:00
akhoury
d9eefd667c fixed potential guestSearch config bug 2013-12-12 22:51:17 -05:00
akhoury
3ad98f3783 remove uncessary checks in guest config upgrade 2013-12-12 22:50:49 -05:00
akhoury
b89cf6f480 Merge remote-tracking branch 'upstream/master' 2013-12-12 22:40:25 -05:00
psychobunny
4397da144f fixes crash introduced @1021615848e49da3434f00cfdb6fb79ab5990b47 2013-12-12 16:07:15 -05:00
psychobunny
cf8f0ca225 cleanup 2013-12-12 16:02:12 -05:00
Baris Soner Usakli
885242018f one more 2013-12-12 12:19:03 -05:00
Baris Soner Usakli
1abfe5de63 added err to addUserInfoToPost 2013-12-12 12:17:58 -05:00
akhoury
04dd1f9dac Merge remote-tracking branch 'upstream/master' 2013-12-11 22:51:04 -05:00
akhoury
114294e24a allowGuestSearching config .. second attempt 2013-12-11 22:50:36 -05:00
Baris Soner Usakli
dfa4cd4ae3 closes #653 2013-12-11 21:40:55 -05:00
Julian Lam
65d5a6cb81 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-11 16:10:22 -05:00
Julian Lam
64e87b761f closed #652 2013-12-11 16:10:08 -05:00
Baris Soner Usakli
1021615848 added err first to some calls 2013-12-11 16:08:20 -05:00
Julian Lam
69c1ec97c9 re: issue #652, this took longer than expected... 2013-12-11 16:02:29 -05:00
Julian Lam
45e7d64aeb fixing extra padding around 'in' that jshinter added for no goddamn reason 2013-12-11 12:29:35 -05:00
Julian Lam
b86a01ded1 moving cache buster to production builds only (*facepalm* I'm bad at this) 2013-12-10 22:20:11 -05:00
Julian Lam
e67af67180 fixing derped plugin css files due to cache buster 2013-12-10 22:16:43 -05:00
Julian Lam
9d03147f4e upping mentions minver 2013-12-10 22:07:10 -05:00
Julian Lam
c313c4501b pushNotifCount method for real-time updating of notification bell + favicon for multiple tabs (closes #219) 2013-12-10 22:05:37 -05:00
Julian Lam
538356846d fixed regression introduced by #643. Non-logo favicon is now properly
referenced (absolute url, not relative)
2013-12-10 21:20:54 -05:00
Baris Usakli
55d008d71f added err to callbacks 2013-12-10 15:39:53 -05:00
Baris Usakli
401a30e02c fixed categories.getRecentReplies so it only returns count posts instead of getting 10, posts are added and removed from sorted set when they are deleted restored 2013-12-10 15:33:35 -05:00
Baris Usakli
9816272b7b if there are more than 50 results only return 50, issue #648 2013-12-10 15:02:22 -05:00
Julian Lam
d72d2decd5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-09 14:50:59 -05:00
Julian Lam
43c05d1d85 adding cache busters to client side files (closed #586) 2013-12-09 14:50:40 -05:00
Barış Soner Uşaklı
14f35a8c6b Update README.md 2013-12-09 14:49:57 -05:00
Barış Soner Uşaklı
ffe1549cad Update README.md 2013-12-09 14:49:03 -05:00
Barış Soner Uşaklı
3ca58a438d Update README.md 2013-12-09 14:44:26 -05:00
Baris Usakli
5da4cead67 closes #631 2013-12-09 14:37:13 -05:00
Baris Usakli
0000a7f0b9 #631 2013-12-09 14:16:04 -05:00
Baris Usakli
27ac24b1e3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-09 13:56:18 -05:00
Baris Usakli
95495926fc some fixes to composer image upload 2013-12-09 13:56:09 -05:00
psychobunny
0f254c0b6c moved theme.css to top 2013-12-09 13:36:48 -05:00
psychobunny
b27478876e moved favicon link to top of header 2013-12-09 13:36:47 -05:00
psychobunny
a3734f2e15 completed custom favicon upload, closes #643 2013-12-09 13:36:47 -05:00
psychobunny
1b843fba9c added admin route to upload favicon 2013-12-09 13:36:46 -05:00
psychobunny
35f17db141 added button in admin to upload favicon + show current favicon image 2013-12-09 13:36:45 -05:00
Barış Soner Uşaklı
bcb364c4d4 Merge pull request #644 from designcreateplay/dbal
Dbal
2013-12-09 09:47:24 -08:00
Baris Usakli
6e16cb4b30 fixed conflicts 2013-12-09 12:46:27 -05:00
Baris Usakli
40e71299a1 closes #642 2013-12-09 12:39:36 -05:00
Julian Lam
0148cf06d0 replaced all instances of missing config.relative_path to RELATIVE_PATH 2013-12-09 10:02:34 -05:00
Julian Lam
ffa31ca0e7 upping markdown minver 2013-12-08 16:59:21 -05:00
Barış Soner Uşaklı
ba3b8a21ae Merge pull request #640 from akhoury/master
issue#635
2013-12-08 12:26:24 -08:00
akhoury
05209b01b9 setting initialValues for 'global' object closes #635 2013-12-08 15:18:00 -05:00
akhoury
4e0d0c2c20 adding error.log .gitignore, winston is that you? 2013-12-08 15:16:37 -05:00
Baris Soner Usakli
225284073f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-08 14:50:11 -05:00
psychobunny
ccef51095a fix typo 2013-12-08 14:49:47 -05:00
Baris Soner Usakli
cd77a1a457 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-08 14:42:54 -05:00
Baris Soner Usakli
6aeca98cd4 closes #633 2013-12-08 14:42:47 -05:00
psychobunny
07a3b3f00b added delete button to category image uploader in case you wanted to revert to bgColor 2013-12-08 14:37:44 -05:00
Barış Soner Uşaklı
77e0cdcc3e Merge pull request #637 from akhoury/master
Auto install fix
2013-12-08 11:22:17 -08:00
psychobunny
e316dd3330 fixed a bug in create category 2013-12-08 14:20:57 -05:00
psychobunny
b511653e74 fixes #622 2013-12-08 14:15:03 -05:00
psychobunny
b5e37a6ce8 fixes #123, parse object properties in template outside of namespace 2013-12-08 13:50:11 -05:00
psychobunny
a34ed92fac console.log 2013-12-08 13:27:41 -05:00
psychobunny
4ff8509a0e clean up from the last admin/categories refactor 2013-12-08 13:19:20 -05:00
psychobunny
e76936abfc added ability to upload category images. closes #638, closes #532 2013-12-08 13:13:13 -05:00
Baris Soner Usakli
9471fd8e46 closes #635 2013-12-08 13:04:38 -05:00
akhoury
2d4ceb8f9f should close #634 2013-12-08 11:59:48 -05:00
psychobunny
4c40ee8e6e fixed missing language key on image uploader modal 2013-12-08 11:31:57 -05:00
psychobunny
ddcf46fc73 uploading picture didn't update profile image until refreshed - fixed 2013-12-08 11:30:29 -05:00
psychobunny
7db234f958 added setting to convert profile iamges to png in control panel 2013-12-08 11:26:55 -05:00
psychobunny
f6f7959d28 convert profile images to static png if setting is checked in control panel, closes #562 2013-12-08 11:25:15 -05:00
psychobunny
7fa2f474fe fixes bug introduced in c0721e105f 2013-12-08 10:55:34 -05:00
psychobunny
d5e8044575 ability to disable privilege threshold system, closes #528 2013-12-08 10:49:42 -05:00
psychobunny
c0721e105f added setting to disable privilege threshold system 2013-12-08 10:47:05 -05:00
psychobunny
a475e38078 if app is not focused and chat message comes in, activate alternatingTitle. closes #620 2013-12-08 10:40:02 -05:00
psychobunny
932b960aa9 app.isFocused; app.js cleanup 2013-12-08 10:38:09 -05:00
psychobunny
24b12e23ea fixes #636, conditionals broken from f1ad469861 2013-12-08 10:31:18 -05:00
psychobunny
2a5d6e04fc fixes #583 (aka. "son, we heard you like containers so we put containers inside your containers") -- duly fixed 2013-12-08 10:23:47 -05:00
psychobunny
4459d9d4e0 closes #551 2013-12-07 19:18:57 -05:00
psychobunny
2be3158aff added semver dep, pls run npm install semver 2013-12-07 19:11:50 -05:00
psychobunny
f1ad469861 templates - don't clean up selector conditionals; fixes topic posting bug introduced at 090d35f306 2013-12-07 19:07:51 -05:00
psychobunny
0c05ee82b1 #621, moved everything out of parallel - poster doesn't need to wait for these functions to happen
also renamed topics.markUnRead to topics.markAsUnreadForAll
2013-12-07 18:58:27 -05:00
psychobunny
4f97275d24 closes #621 2013-12-07 18:45:26 -05:00
psychobunny
4b9bfca767 français, deutsche, and español support for 202a4c4105 2013-12-07 18:22:31 -05:00
psychobunny
202a4c4105 added rep + post count metrics to post body, closes #443 2013-12-07 18:19:06 -05:00
psychobunny
090bc2ad10 403 all guests on /search & /search/term regardless of mobile/desktop - closes #612 2013-12-07 17:45:51 -05:00
psychobunny
000c7efb1a Merge pull request #623 from tedr56/master
French language files
2013-12-07 14:29:10 -08:00
psychobunny
90ad08a00d fixes #616 2013-12-07 17:17:47 -05:00
psychobunny
90e1e2436c closes #539 2013-12-07 17:03:16 -05:00
Baris Soner Usakli
21f5dad1d2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-07 17:03:14 -05:00
Baris Soner Usakli
bc8bb352a8 added stdout check to exec 2013-12-07 17:03:07 -05:00
psychobunny
274310e35a removed notification count in title, removed api calls to it (left method intact) so hopefully title building is faster too. closes #625 2013-12-07 16:57:49 -05:00
Baris Soner Usakli
0bcc1642c7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-07 16:51:57 -05:00
Baris Soner Usakli
d1d6605dcf closes #501 2013-12-07 16:51:47 -05:00
psychobunny
da94d6214b when new notification comes in, refresh notification page - closes #608 2013-12-07 16:42:17 -05:00
psychobunny
67e49db797 ajaxify.refresh(); removed console.log 2013-12-07 16:40:14 -05:00
psychobunny
de9100c489 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-07 16:33:56 -05:00
psychobunny
4348e1efa4 use ajaxify.currentPage to find the user's location easily 2013-12-07 16:33:42 -05:00
Julian Lam
6de3dba239 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-07 16:33:41 -05:00
Julian Lam
021cf9b8f6 fixes to language template usage 2013-12-07 16:33:37 -05:00
psychobunny
ca087e6fa7 fixes #576 2013-12-07 16:27:22 -05:00
psychobunny
6c9e28232f added translation method to recent's infinite loader 2013-12-07 16:21:12 -05:00
psychobunny
ceac8e2dc9 added translation to unread infinite loader 2013-12-07 16:20:31 -05:00
psychobunny
98cf6eec71 shift clicking now opens links in a new window, closes #630 2013-12-07 16:18:07 -05:00
Baris Soner Usakli
5a00767370 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-07 16:15:15 -05:00
Baris Soner Usakli
4c90d22e43 closes #619 2013-12-07 16:15:07 -05:00
psychobunny
e0e153eafb added translation to category infinite loader method 2013-12-07 16:14:51 -05:00
psychobunny
5c3c2623f2 added translation to new post creation, closes #627 2013-12-07 16:14:51 -05:00
Baris Soner Usakli
34fc326a37 closes #618 2013-12-07 15:59:44 -05:00
psychobunny
36745608bf removed console.log 2013-12-07 15:49:48 -05:00
psychobunny
090d35f306 clean up conditional comments in the DOM; conditionals now treat undefined variables as false; closes #617 2013-12-07 15:48:35 -05:00
Julian Lam
347f5c132e updates to language files, capitalizing some values across languages 2013-12-07 15:47:00 -05:00
Julian Lam
d6f8162f17 upping markdown minver again? 2013-12-07 15:02:00 -05:00
Julian Lam
b0b0f3640c closed #629 2013-12-07 15:00:12 -05:00
Julian Lam
4fd08332cc Merge branch 'dbal' of github.com:designcreateplay/NodeBB into dbal 2013-12-07 13:12:07 -05:00
Julian Lam
aaaffb823f upgrading markdown minver 2013-12-07 13:11:59 -05:00
Baris Soner Usakli
76636b64db small fixes 2013-12-06 21:08:21 -05:00
Baris Soner Usakli
be6ed43223 removed the setName from sorted sets and stored them with _key like everything else 2013-12-06 18:58:22 -05:00
Barış Soner Uşaklı
9f2196abfb Merge pull request #626 from designcreateplay/dbal
Dbal
2013-12-06 15:08:32 -08:00
Baris Soner Usakli
90a75ee045 added check for unknown db 2013-12-06 17:51:16 -05:00
Baris Soner Usakli
2a21b4855e fixed instruction in database.js 2013-12-06 17:47:48 -05:00
Baris Soner Usakli
8f769d53a3 fixed missing winston 2013-12-06 17:46:03 -05:00
Baris Usakli
9ee250b597 fixes humanreadable numbers in infinite scrolling 2013-12-06 16:26:07 -05:00
Baris Usakli
074d7e7c8d Merge remote-tracking branch 'origin/master' into dbal 2013-12-06 15:58:58 -05:00
Barış Soner Uşaklı
870d48dc81 Merge pull request #603 from Joopmicroop/master
added account class for account template pages for easy styling
2013-12-06 12:38:32 -08:00
Baris Usakli
9ca10c25d4 fixed return in posts.create 2013-12-06 15:23:48 -05:00
tedr56
8e2cc1c883 Correct english language file 2013-12-06 21:06:07 +01:00
tedr56
af09f4aca8 added french language files 2013-12-06 21:04:57 +01:00
Baris Usakli
ab63ca6d92 store strings in sorted sets and lists to mimic redis 2013-12-06 14:53:03 -05:00
Baris Usakli
400845ce6c cleanup mongo init 2013-12-06 14:34:25 -05:00
Baris Usakli
351b07bb34 added authentication to mongo 2013-12-06 14:31:11 -05:00
Baris Usakli
f861d44d55 updated upgrade script to use mongo or redis 2013-12-06 14:22:31 -05:00
Baris Usakli
2b7e4cbdf4 moved tests from debug to tests folder 2013-12-06 13:46:12 -05:00
Baris Usakli
df10bde2db added 1 more parseInt 2013-12-06 13:30:44 -05:00
Baris Usakli
0da141e7bc removed redismock, added database mocked, fixed tests to work with dbal 2013-12-06 13:21:21 -05:00
Baris Usakli
6313a5eeb1 Merge remote-tracking branch 'origin/master' into dbal 2013-12-06 12:59:32 -05:00
Pablo Macaluso
26de85c1de updated es translations with new strings added from #607 2013-12-06 12:21:34 -05:00
Julian Lam
a54f464a13 updating language files with missing files for es 2013-12-06 11:57:03 -05:00
Julian Lam
bfbc596348 fixing extra comma in es language file 2013-12-06 11:38:33 -05:00
Julian Lam
7508bd216e new executable 2013-12-06 11:27:34 -05:00
Pablo Macaluso
8cfc5dda37 added spanish language files (courtesy of Pablo Macaluso) 2013-12-06 10:51:20 -05:00
Julian Lam
b81737bc0f moved refreshTitle into app.js, messaging someone now invokes an alternating title, hehe 2013-12-05 23:24:47 -05:00
Baris Soner Usakli
1c23be8911 removed console.log 2013-12-05 21:53:24 -05:00
Baris Soner Usakli
5f86e31d1e fixed favouriting 2013-12-05 21:51:05 -05:00
Baris Soner Usakli
746119bd45 remove dataFileVersion it breaks templates 2013-12-05 21:45:21 -05:00
Julian Lam
385aa6df92 fixed last couple tweaks, ready t'merge 2013-12-05 21:36:21 -05:00
Baris Soner Usakli
097810a057 parseInt fixes getObjects fix 2013-12-05 21:29:51 -05:00
Baris Soner Usakli
3a7fcc2d3d search in mongo 2013-12-05 21:07:35 -05:00
Baris Soner Usakli
95bb838699 Merge remote-tracking branch 'origin/master' into dbal 2013-12-05 21:04:00 -05:00
Baris Soner Usakli
81055523a0 fixed bracket 2013-12-05 20:24:25 -05:00
Baris Soner Usakli
e9fbab0f26 need mongo 2.4+ for text search' 2013-12-05 20:11:05 -05:00
Baris Soner Usakli
53ca7a1143 added search functions to database files, removed reds from nodebb moved it to redis 2013-12-05 20:06:36 -05:00
Baris Soner Usakli
6c70d37f1c removed reds from app.js 2013-12-05 18:32:45 -05:00
Baris Soner Usakli
447073560f moved reds into redis, fixed notifications prune param 2013-12-05 18:31:15 -05:00
Julian Lam
2c131f172a fixing up some translations - WIP 2013-12-05 18:27:37 -05:00
Baris Soner Usakli
1564e3d530 tons of fixes to mongo and redis, to make returns the same 2013-12-05 18:26:26 -05:00
Julian Lam
3d9a732c4a Merge branch 'master' of github.com:BudickDa/NodeBB into BudickDa-master
Conflicts:
	public/language/en/global.json
2013-12-05 18:05:26 -05:00
Julian Lam
4819bea378 more tweaks to the chat dropdown -- handling null case -- issue #615 2013-12-05 17:41:51 -05:00
Julian Lam
030ce95dea closed #615 - added "active chats" dropdown to header
- some minor tweaks also, to make taskbar work a little better with chats
2013-12-05 17:35:44 -05:00
Julian Lam
2a1671ba9b whoops 2013-12-05 16:40:30 -05:00
Julian Lam
a65c79cb02 minimized the reconnect spinner to icon only, added bootstrap tooltip 2013-12-05 16:08:35 -05:00
Baris Usakli
dcbe4ffd4a more notif.prune cleanup 2013-12-05 15:32:36 -05:00
Baris Usakli
215b919362 added db function 2013-12-05 15:29:27 -05:00
Baris Usakli
58df656c65 removed temp vars 2013-12-05 15:27:14 -05:00
Baris Usakli
a8c91e2452 more 2013-12-05 15:26:30 -05:00
Baris Usakli
806a454b05 fixing notifications.prune 2013-12-05 15:25:58 -05:00
Baris Usakli
705754e823 merged master 2013-12-05 14:57:18 -05:00
Baris Usakli
fe527ff2a9 removed RedisStoreLib from websockets.js it moved into redis.js 2013-12-05 14:48:58 -05:00
Julian Lam
041e77f688 fixing replying (whoops) 2013-12-05 14:48:27 -05:00
Baris Usakli
b927f6ce29 added raw info 2013-12-05 14:30:18 -05:00
Baris Usakli
519d376071 added mongo info function, change admin redis template to database template 2013-12-05 14:24:18 -05:00
Julian Lam
d9ee9bf5e3 revamped handling of unread messages, so that a socket call is made to all socket clients whenever a new unread message is available. Prior behaviour had the unread count updated via ajax call on ajaxify (which was clumsy at best and didn't update automagically) 2013-12-05 13:59:16 -05:00
Baris Usakli
67d5ea83e7 replace . with \uff0e in mongo 2013-12-05 13:33:01 -05:00
Baris Usakli
7875138c08 added parseInt 2013-12-05 13:11:27 -05:00
Julian Lam
43b012b32e defactored getUnreadTopics into separate getUnreadTids method -- for no reason, mind you 2013-12-05 12:20:56 -05:00
Baris Usakli
c096656eff merged master fixed conflicts 2013-12-05 12:17:01 -05:00
Baris Usakli
2dd295118c setRemove converts to string too 2013-12-05 12:04:09 -05:00
Baris Soner Usakli
567997ef3c changed mongo sets to store just strings, fixes worlds problems 2013-12-04 23:51:57 -05:00
Baris Soner Usakli
c698af17ae added error checking to collection index creation 2013-12-04 23:36:52 -05:00
Baris Soner Usakli
39b70a9e09 derp 2013-12-04 22:55:31 -05:00
Baris Soner Usakli
9b557cafd8 better sets in mongo, should change sorted sets too using sort 2013-12-04 22:19:11 -05:00
Julian Lam
fe4aee177d lots of tweaks to chat and taskbar 2013-12-04 21:44:36 -05:00
Baris Soner Usakli
7c4347736c added index on _key 2013-12-04 21:35:38 -05:00
Julian Lam
16e07d475f pushing FA icon for chat taskbar title 2013-12-04 21:05:44 -05:00
Julian Lam
2125bb2223 only minimizing CSS files on non-development 2013-12-04 20:37:13 -05:00
Baris Soner Usakli
72a3ab1d6c derp 2013-12-04 19:06:36 -05:00
Baris Soner Usakli
639247a8b0 fixed notifications 2013-12-04 18:58:20 -05:00
Baris Soner Usakli
f0caac242c fixed incr in topic post 2013-12-04 18:34:58 -05:00
Baris Soner Usakli
e066fbf36a sets are storing numbers in mongo as opposed to redis which stores strings, causes tons of problems 2013-12-04 18:26:26 -05:00
Baris Soner Usakli
b215dbde19 updated install 2013-12-04 17:57:51 -05:00
Baris Soner Usakli
1325e4c501 commented out reds in install 2013-12-04 17:08:49 -05:00
Baris Soner Usakli
2e2938616d more mongo and redis stuff 2013-12-04 16:58:06 -05:00
Baris Soner Usakli
53a7eab3e8 removed couple RDB.multis 2013-12-04 16:31:05 -05:00
Julian Lam
6bd4a34e69 fixed favicon sometimes updating with a string 0, should always be an int 2013-12-04 16:28:18 -05:00
Julian Lam
d27f2eb214 fixed #604 2013-12-04 16:25:42 -05:00
Baris Soner Usakli
b547d3577b removed a multi from categories.js 2013-12-04 15:13:43 -05:00
Baris Soner Usakli
4b5988c269 isSetMember returns true or false 2013-12-04 15:11:17 -05:00
Baris Soner Usakli
cfd3a7d126 added flushdb command to both dbs 2013-12-04 14:51:50 -05:00
Baris Soner Usakli
0471a192ab more mongo stuff 2013-12-04 14:25:14 -05:00
Baris Soner Usakli
5c6a7d4b94 added regex keys to mongo 2013-12-04 12:36:22 -05:00
Baris Soner Usakli
ca01fb9f7d added key methods to mongo 2013-12-04 12:25:53 -05:00
Julian Lam
b176629b44 integrated Tinycon lib and actually fixed notification counts... heh.
closed #610
2013-12-04 12:15:27 -05:00
Baris Soner Usakli
113cb85c46 added lists to mongo 2013-12-04 12:10:53 -05:00
Julian Lam
5b6f5ebf9d added tinycon lib and changed notif icon to be in CSS instead of in
template
2013-12-04 11:40:57 -05:00
Baris Soner Usakli
21bbe68c97 added sortedSetRemove to mongo 2013-12-03 22:30:36 -05:00
Baris Soner Usakli
28c75e09a9 can haz sorted sets? 2013-12-03 22:16:44 -05:00
Julian Lam
69f453c73c Merge pull request #601 from cnvo/patch-1
Replace notifications icons from fa-circle to fa-bell
2013-12-03 18:20:50 -08:00
Julian Lam
dab0435d9b Merge pull request #600 from cnvo/patch-2
Replace notifications icons from fa-circle to fa-bell
2013-12-03 18:20:35 -08:00
Baris Soner Usakli
b5770be71f whitespace 2013-12-03 18:19:27 -05:00
Baris Soner Usakli
bf3822e8a5 incr wil create key if it doesnt exist 2013-12-03 18:11:35 -05:00
Baris Soner Usakli
cb6c42ea44 user stuff 2013-12-03 18:03:50 -05:00
Baris Soner Usakli
3dc3769088 fixed redis.keys 2013-12-03 17:48:18 -05:00
Baris Soner Usakli
3d18c4015a cleanup 2013-12-03 17:43:12 -05:00
Baris Soner Usakli
610d45bb32 completed hashes in mongodb I hope :) 2013-12-03 17:29:10 -05:00
Baris Soner Usakli
66bc4184d8 deleteObjectField, isObjectField in mongo 2013-12-03 17:13:59 -05:00
Baris Soner Usakli
b024d10185 implemented getObjectValues in mongo 2013-12-03 16:50:06 -05:00
Julian Lam
e847c015a5 linting notifications.js 2013-12-03 16:12:59 -05:00
Baris Usakli
10474f8e2a more mongo work 2013-12-03 15:17:42 -05:00
BudickDa
8a99eef4fb Update global.json 2013-12-03 20:40:45 +01:00
Julian Lam
da66efe7a5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-03 14:23:31 -05:00
Julian Lam
1bd94b4e41 closed #605 2013-12-03 14:23:16 -05:00
Baris Usakli
e862a1c4cc added init method to database, progress made 2013-12-03 14:21:08 -05:00
psychobunny
8b55920acf plugins - filter:posts.custom_profile_info pass in pid as well 2013-12-03 14:19:11 -05:00
BudickDa
32df811765 i18n for all templates completed, jsons for german added 2013-12-03 19:53:16 +01:00
Baris Usakli
91d6f83de4 more mongo work 2013-12-03 13:36:44 -05:00
psychobunny
7c8f857aaf plugins - filter:server.create_routes allows you to define API routes as well now 2013-12-03 13:10:46 -05:00
psychobunny
1f970c3bdb incorrect url was being passed for callback - twitter and g+ 2013-12-03 11:28:55 -05:00
Joopmicroop
700cab686b Update following.tpl 2013-12-03 15:49:10 +01:00
Joopmicroop
af06e0335a Update followers.tpl 2013-12-03 15:48:28 +01:00
Joopmicroop
4a8dc82bd2 Update accountedit.tpl 2013-12-03 15:45:15 +01:00
Joopmicroop
8a4e2b1ea0 Update accountsettings.tpl 2013-12-03 15:42:33 +01:00
Baris Soner Usakli
1f52717f1e fixed indent 2013-12-02 22:50:39 -05:00
Baris Soner Usakli
304285e874 some mongo stuff 2013-12-02 22:48:32 -05:00
Baris Soner Usakli
d4eddc6e2c lcased groups 2013-12-02 22:36:26 -05:00
Baris Soner Usakli
6d79521922 moved connect-redis to the redis.db file, expose the sessionStore from redis.js db file, do the same for mongo db with mongo-connect 2013-12-02 22:33:55 -05:00
Baris Soner Usakli
95db5f93cb remvoed console.logs 2013-12-02 22:01:29 -05:00
Baris Soner Usakli
b900bc9cce more fixes 2013-12-02 21:58:37 -05:00
Baris Soner Usakli
fc066c21bf added upgrade for global keys 2013-12-02 21:33:35 -05:00
Baris Soner Usakli
32d5118266 tons more changes 2013-12-02 21:20:55 -05:00
Baris Soner Usakli
3775c8e50a tons more changes 2013-12-02 19:40:11 -05:00
Barış Soner Uşaklı
99fbc0dfd5 Update account.js
removed extra s
2013-12-02 19:23:52 -05:00
Baris Soner Usakli
e32d230974 format 2013-12-02 17:48:21 -05:00
Baris Usakli
c9308efbec more work 2013-12-02 17:10:26 -05:00
Baris Usakli
636551d2e9 plugins.js uses db, added some set methods to redis.js 2013-12-02 16:35:32 -05:00
Baris Usakli
347d6c2768 moved filename function into redis 2013-12-02 16:23:14 -05:00
Baris Usakli
4f654fb489 more work 2013-12-02 16:19:30 -05:00
Baris Usakli
80e7fd93c6 added redis 2013-12-02 15:46:25 -05:00
Baris Usakli
95efb2ae5e started dbal 2013-12-02 15:45:15 -05:00
Baris Usakli
8d3a647d16 fixed hardcoded userslug 2013-12-02 14:53:33 -05:00
Baris Usakli
53afe6cb68 closes #591 2013-12-02 14:40:34 -05:00
Barış Soner Uşaklı
391b8098a3 Merge pull request #588 from akhoury/master
websockets to follow same pattern, added hook action:user.create
2013-12-02 11:25:51 -08:00
Baris Usakli
190948336a closes #590 2013-12-02 13:28:46 -05:00
Julian Lam
fcda27e251 allowing plugins with no hooks to not cause NodeBB to hang on app start 2013-12-02 11:36:46 -05:00
Trvr
a48a07603c Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
2013-12-02 04:40:20 -05:00
Trvr
d930e2a1be Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
2013-12-02 04:40:19 -05:00
Baris Soner Usakli
7e2166903f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-01 21:12:13 -05:00
Baris Soner Usakli
d5c0ca4a9d closes #595 2013-12-01 21:12:05 -05:00
Julian Lam
7695e76494 removed buildFooter filter 2013-12-01 21:04:10 -05:00
Julian Lam
78af47362c Merge pull request #597 from draco2003/patch-4
Cleanup console.log calls
2013-12-01 17:30:07 -08:00
Dan Rowe
18a890ed51 Cleanup console.log calls
Can't see my debugging inbetween all your debugging ;)
2013-12-01 20:28:16 -05:00
Julian Lam
5f731dd1f6 Merge pull request #596 from draco2003/patch-3
Missed one lcasing
2013-12-01 17:17:05 -08:00
Julian Lam
51990142d5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-01 20:13:56 -05:00
Julian Lam
b840169a8c upping markdown minver 2013-12-01 20:13:43 -05:00
Dan Rowe
94fdeb2378 Missed one lcasing
Also anyone else nervous about arbitrary hook execution here?
2013-12-01 20:11:27 -05:00
Julian Lam
68e7ee7f07 signature parsing now calls its own postTools method (with associated plugin hook 2013-12-01 20:07:30 -05:00
Julian Lam
77d5ecc82a added post.buildFooter and post.parseSignature hooks 2013-12-01 19:59:17 -05:00
Baris Soner Usakli
437379413e closes #592 2013-12-01 18:06:01 -05:00
Baris Soner Usakli
ddb7896df1 fixed post count in paginator and post bar when infinite loader kicked in 2013-12-01 17:42:26 -05:00
Baris Soner Usakli
66cdb9a067 just send err 2013-12-01 16:25:57 -05:00
Baris Soner Usakli
f5741fd48b fixed conflict 2013-12-01 16:21:50 -05:00
Baris Soner Usakli
f405dec4e9 #589 2013-12-01 16:21:19 -05:00
Julian Lam
cc242ca667 fixed #589 2013-12-01 16:19:12 -05:00
akhoury
2733198f9e oops 2013-12-01 11:05:10 -05:00
akhoury
52700fbe16 websockets.js to 'use strict'; 2013-12-01 10:56:29 -05:00
akhoury
0f53749e70 websockets.js to follow same pattern to avoid circular dependencies 2013-12-01 10:53:59 -05:00
akhoury
1aa1ddb4ec added plugin hook > action:user.create on user creation 2013-12-01 10:52:50 -05:00
akhoury
71125fd1e2 adding webstorm's .idea folder to .gitignore 2013-12-01 10:43:48 -05:00
Julian Lam
5621fb8622 switching back to version numbers for vanilla, testing prereleases 2013-11-30 21:38:35 -05:00
Julian Lam
b9f1176ec1 moved paginator progress bar into paginator block, better mobile handling, and hiding it on page load 2013-11-30 21:36:35 -05:00
Julian Lam
b3b4d3c37d Merge pull request #585 from akhoury/master
During 11k users migration, was hitting too many open files errors
2013-11-30 11:13:18 -08:00
Baris Soner Usakli
cdbca7d262 more cleanup in routes/user.js 2013-11-30 13:54:52 -05:00
Baris Soner Usakli
140f90f7f3 cleaned up requires 2013-11-30 13:35:42 -05:00
Aziz Khoury
a905c6a084 During 11k users migration, was hitting too many open files errors 2013-11-30 13:13:18 -05:00
Baris Soner Usakli
bfe081f672 added err to PostTools.isMain 2013-11-29 23:14:28 -05:00
Baris Soner Usakli
46a14715e3 fixed logout in admin site, cleaned up topics.post, anon users can post topics now if allowed 2013-11-29 23:08:42 -05:00
Baris Soner Usakli
c1da56ce45 added auto mention if u click post reply 2013-11-29 18:00:52 -05:00
Baris Usakli
ee63fae803 closes #584 2013-11-29 16:10:41 -05:00
Baris Usakli
720711756f show bottom post bar after new post, fixed the insertion of new posts 2013-11-29 14:42:58 -05:00
Baris Usakli
90a12c3253 fixed index to int 2013-11-29 14:28:15 -05:00
Baris Usakli
6a00ab3782 removed btn-large from post topic button 2013-11-29 14:22:02 -05:00
Baris Usakli
9ccfa3f18c fixed js error 2013-11-29 14:19:39 -05:00
Baris Usakli
1660d75205 stricter selector for human readable numbers 2013-11-29 14:18:06 -05:00
Baris Usakli
f6d57a241d fixed human readable view post counts 2013-11-29 14:12:19 -05:00
Julian Lam
bcfb4ca0e4 off by one error 2013-11-29 14:01:09 -05:00
Julian Lam
0159a43a20 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	public/src/forum/topic.js
2013-11-29 13:31:07 -05:00
Julian Lam
86b019ec89 paginator progress bar 2013-11-29 13:30:01 -05:00
psychobunny
98a12cd1e1 clearing first blocks from dynamically inserted templates - made regex less greedy 2013-11-29 13:18:20 -05:00
Baris Usakli
e6452cbd4d removed unusued uploadedImages property 2013-11-29 13:14:38 -05:00
Baris Usakli
cd44ead595 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-29 13:12:59 -05:00
Baris Usakli
652fda1a6f fixed conditional in posts.js 2013-11-29 13:12:50 -05:00
psychobunny
30a7f1a816 removed .main-post from follow class (now using conditionals to show/hide) 2013-11-29 13:09:56 -05:00
Baris Usakli
6ca3d0c4af Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-29 13:09:35 -05:00
Baris Usakli
b2074c6dda fixes to infinite load and paginator 2013-11-29 13:09:26 -05:00
Julian Lam
d7c0e1c62e Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-29 12:35:58 -05:00
Julian Lam
56ef05a0bf putting category options behind a dropdown, and fixing category enable/disable 2013-11-29 12:35:36 -05:00
Baris Usakli
dd36cce329 closes #582 2013-11-29 12:02:06 -05:00
Baris Usakli
2b2799dae9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-29 11:50:16 -05:00
Baris Usakli
293c176053 added first to follow button in topic.tpl 2013-11-29 11:50:07 -05:00
Julian Lam
3cef5fce2b Merge pull request #580 from Joopmicroop/patch-1
Allow same origin framing
2013-11-29 08:42:46 -08:00
Joopmicroop
7d0f160c4c Allow same origin framing
Allow people to frame there own server setup
2013-11-29 11:04:46 +01:00
Baris Soner Usakli
c5f9f896b2 make all admin routes only accesible to admins 2013-11-28 22:29:32 -05:00
Baris Soner Usakli
db98b3db55 removed the fields again, gitsucks 2013-11-28 18:55:10 -05:00
Baris Soner Usakli
dba47e4bef removed console.log 2013-11-28 18:45:36 -05:00
Baris Soner Usakli
2a46ead29f removed container div, removed second if first, it breaks templates 2013-11-28 18:44:02 -05:00
Julian Lam
707179edf3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-28 17:51:02 -05:00
Julian Lam
53164e96ab removed non-functional save button from category whitelist modal 2013-11-28 17:50:40 -05:00
Baris Soner Usakli
9702e28a07 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-28 17:45:17 -05:00
Baris Soner Usakli
fa56eca962 fixed fave stars, removed the watch button from normal posts 2013-11-28 17:45:04 -05:00
Julian Lam
684839f04a Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-28 17:37:41 -05:00
Julian Lam
0188ea9a3b setting cache headers to 0 on development mode 2013-11-28 17:37:17 -05:00
psychobunny
85aa587749 merge conflicts 2013-11-28 17:16:27 -05:00
psychobunny
48e36e3c31 templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3 2013-11-28 17:14:04 -05:00
Baris Usakli
0b6d018f8d oops removed by mistage 2013-11-28 16:20:05 -05:00
Baris Usakli
f2bf65252d removed the fields 2013-11-28 16:15:18 -05:00
Baris Usakli
4335f8c5c6 fixed date in upgrade 2013-11-28 15:57:00 -05:00
Baris Usakli
ae82f57c67 added upgrade script to delete removed keys from posts 2013-11-28 15:55:40 -05:00
Baris Usakli
168052bf45 added back feeds, removed duplicate post var in feed 2013-11-28 15:33:26 -05:00
Baris Usakli
a87ebb64d8 clean up of posts and some template additions 2013-11-28 15:18:19 -05:00
Julian Lam
38da65ee58 tweaks to category permission modal 2013-11-28 14:27:19 -05:00
Julian Lam
e3e1a556cd groups pruning method 2013-11-28 12:55:05 -05:00
Baris Usakli
56b618c915 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-28 11:17:01 -05:00
Baris Usakli
7198110b57 closes #573 2013-11-28 11:16:52 -05:00
psychobunny
b7aea63c53 create auth routes only after plugin system is enabled and auth.init hook is fired 2013-11-28 11:13:08 -05:00
Baris Usakli
78b65c0b12 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-28 10:58:24 -05:00
Baris Usakli
0742590c0c added pid to share links, removed unused vars 2013-11-28 10:58:14 -05:00
psychobunny
c16f04bbcf plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well 2013-11-28 10:42:25 -05:00
psychobunny
51b38c4c55 plugins - added filter:auth.init hook to add additional login strategies; fixed callbackURL 2013-11-28 10:30:43 -05:00
Julian Lam
79eddc9b06 Merge pull request #570 from draco2003/patch-2
Minify socket.io js
2013-11-27 20:07:36 -08:00
Baris Soner Usakli
21f63ac17f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-27 22:02:57 -05:00
Baris Soner Usakli
fdf5227c35 closes #572 2013-11-27 22:02:50 -05:00
Julian Lam
98f03a723e upping mentions minver 2013-11-27 21:30:26 -05:00
Julian Lam
69427fa10e tweaks to make the ACP work better on tablets, some work on hidden groups 2013-11-27 20:20:08 -05:00
Julian Lam
670986f7ef Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-27 20:07:37 -05:00
Julian Lam
8b62041d28 refactored groups and categories, groups no longer explodes when
attempting to add members to a whitelist that doesn't exist, isEmpty
checks (new methods!) and such...
2013-11-27 20:07:04 -05:00
psychobunny
89c5d01efa modularized SSO, paving the way for potential plugins. cleaned up associated templates/js 2013-11-27 16:47:54 -05:00
Julian Lam
0a06f1ac7d Merge remote-tracking branch 'origin/master' into category-whitelisting 2013-11-27 16:23:48 -05:00
Julian Lam
df2e9b4b47 admin panel integration for category whitelisting 2013-11-27 16:23:30 -05:00
Dan Rowe
aed4e2792d Minify socket.io js
potential solution for issues/569
2013-11-27 15:57:29 -05:00
Baris Soner Usakli
c860df7975 more #559 2013-11-27 15:03:36 -05:00
Baris Soner Usakli
2148f6ff95 closes #559 2013-11-27 15:02:09 -05:00
Baris Soner Usakli
2d05a06e37 fixed template var, oops 2013-11-27 14:25:58 -05:00
Baris Soner Usakli
e3da005780 grouped the social buttons 2013-11-27 14:25:01 -05:00
Julian Lam
f0e8633dcc category whitelisting for posting messages, isAdmin now error-first 2013-11-27 12:47:00 -05:00
Baris Usakli
590208f0c7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-27 12:39:15 -05:00
Baris Usakli
7d7ead3f47 fixed js error in recent.js, remove content assignment 2013-11-27 12:39:07 -05:00
Julian Lam
974629ce85 hahah, bad paste, missing a bunch of line endings 2013-11-27 11:48:18 -05:00
Julian Lam
72ef8c839f Merge remote-tracking branch 'origin/master' into category-whitelisting
Conflicts:
	src/groups.js
2013-11-27 11:34:52 -05:00
Julian Lam
5ee5c8179a category whitelist for replying to posts, lots of refactoring, too 2013-11-27 11:27:20 -05:00
psychobunny
46d6d7637e potentially fixes ubbmigrator issue https://github.com/akhoury/nodebb-plugin-ubbmigrator/issues/2 2013-11-27 11:21:16 -05:00
psychobunny
62e2aa67d7 topics - added back social sharing buttons to OP 2013-11-27 10:58:37 -05:00
Julian Lam
182659d0e1 removing extra .js suffix from required files and physically separating
nodebb libs from deps
2013-11-27 08:55:02 -05:00
Julian Lam
4855131652 category read restrictions 2013-11-27 08:49:23 -05:00
Julian Lam
4d2469b4ce tweaks to whitelist (interim commit) 2013-11-27 08:34:25 -05:00
Julian Lam
4e2326fc84 Merge remote-tracking branch 'origin' into category-whitelisting 2013-11-27 08:17:23 -05:00
Baris Soner Usakli
3a8dca6fb9 closes #560 2013-11-26 23:55:55 -05:00
Baris Soner Usakli
31635b92f3 closes #561 2013-11-26 23:19:21 -05:00
Baris Soner Usakli
a0c3de0273 display signature block only if user has signature 2013-11-26 19:22:02 -05:00
Baris Soner Usakli
32b191fa62 removed global.io 2013-11-26 19:09:32 -05:00
Baris Usakli
f616125d02 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-26 16:30:19 -05:00
Baris Usakli
e1f6e064a9 removed io from user.js, figure out why notifications are breaking when websockets.js is required from it 2013-11-26 16:30:10 -05:00
Julian Lam
633be7ff3c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-26 15:50:37 -05:00
Julian Lam
6b3863bfbf updated category manager in admin panel 2013-11-26 15:50:33 -05:00
Baris Usakli
b66ca703b8 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-26 15:28:55 -05:00
Baris Usakli
48a7f9058f closes #558 2013-11-26 15:28:45 -05:00
psychobunny
8f80733563 fixing #552 overflows properly 2013-11-26 15:19:30 -05:00
Baris Usakli
aa1451cfbc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-26 15:15:31 -05:00
Baris Usakli
13ef28118d closes #557 2013-11-26 15:15:23 -05:00
Julian Lam
34459e7cf1 fixing category admin panel integration 2013-11-26 15:14:12 -05:00
Baris Usakli
798e17a954 change loading text to inline 2013-11-26 14:48:55 -05:00
Julian Lam
5ad80218a2 upping cerulean minver 2013-11-26 14:45:12 -05:00
Baris Usakli
e90e54cec1 fixed icons in topic move 2013-11-26 14:37:27 -05:00
Baris Usakli
bca1fde69c updated schema date 2013-11-26 14:33:18 -05:00
Baris Usakli
d70c688b65 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-26 14:26:01 -05:00
Baris Usakli
541993c80a fontawesome 4 migration, closes #473 2013-11-26 14:25:46 -05:00
psychobunny
529c8acf6c app.js: added --install alias for --setup 2013-11-26 14:15:40 -05:00
psychobunny
e98d05b1a5 closes #556, also removes the newline that was previously inserted 2013-11-26 13:18:41 -05:00
Julian Lam
0afc7c9761 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-26 12:25:24 -05:00
Julian Lam
e5c1edd5f5 using ajaxifying class for content and footer instead of jquery fadein/out 2013-11-26 12:25:19 -05:00
Baris Usakli
a5e78aab08 closes #554 2013-11-26 11:59:54 -05:00
Baris Usakli
cec69c2be0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-26 11:43:35 -05:00
Baris Usakli
bc8815cb94 closes #555 2013-11-26 11:43:25 -05:00
Julian Lam
efac6272bb default link tag (apple-touch-icon) added 2013-11-26 11:34:38 -05:00
Julian Lam
bdb30976b5 adding maxAge headers for statically served files (eep!) - issue #552 2013-11-26 11:17:34 -05:00
Baris Soner Usakli
1d4ae8fe4d changed the paginator icons to chevron 2013-11-25 21:38:04 -05:00
Julian Lam
abdb4c34ef tweaks to topic locking 2013-11-25 17:49:17 -05:00
Julian Lam
08d130893c fixing dropdown support in Settings.prepare 2013-11-25 17:48:55 -05:00
Julian Lam
b2fb9aa99f refactored topic locking pinning and deleting (and its inverses) so that the privilege check is done not in the method, but in the socket call 2013-11-25 17:20:44 -05:00
psychobunny
561ee9e4f1 closes #519 2013-11-25 17:00:42 -05:00
Julian Lam
3f70d45f3d Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-25 17:00:06 -05:00
Julian Lam
c07783fa2c ... 2013-11-25 17:00:01 -05:00
psychobunny
d4d0e8cd9b set unreplied flag to new topics sent via websocket 2013-11-25 16:51:52 -05:00
psychobunny
4be5ac2c23 removed mobile overlay for topics - will reimplement as a plugin 2013-11-25 16:47:06 -05:00
psychobunny
070c95d8de fixed regression from main_posts deprecation - bottom post bar restored 2013-11-25 16:38:45 -05:00
psychobunny
8d12ecb758 moved pagination into header 2013-11-25 16:37:28 -05:00
Baris Soner Usakli
81560c4698 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-25 16:29:37 -05:00
Baris Soner Usakli
390937a20b added err to getAllTopics 2013-11-25 16:29:28 -05:00
Julian Lam
2a8a38b742 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-25 16:28:14 -05:00
Julian Lam
5a5c3c8c60 added app.load action hook 2013-11-25 16:28:07 -05:00
psychobunny
905e451455 closes #549 2013-11-25 16:16:18 -05:00
psychobunny
69b8b47b15 updated cerulean dep to 0.0.9 2013-11-25 15:57:18 -05:00
Julian Lam
b16e1a0113 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-25 15:56:22 -05:00
Julian Lam
0b39968a9c fixing back button behaviour and playing nice with History API 2013-11-25 15:56:16 -05:00
psychobunny
d8b3abb611 updating cerulean dep to 0.0.8 2013-11-25 15:48:56 -05:00
psychobunny
7fb0a616a1 refactored topic.tpl and merged main_posts and sub_posts 2013-11-25 15:48:55 -05:00
psychobunny
d987e51a8b removed references to main_posts in forum/topic.js 2013-11-25 15:48:55 -05:00
psychobunny
0f7f6cd0a3 templates.js added IF !value 2013-11-25 15:48:54 -05:00
psychobunny
0e8b33aa79 templates.js added @first and @last conditionals 2013-11-25 15:48:54 -05:00
psychobunny
353b3047cd pulling meta info from OP not main_posts 2013-11-25 15:48:53 -05:00
psychobunny
377de06eeb removed main_posts from topics core, returning OP in posts array now 2013-11-25 15:48:53 -05:00
psychobunny
4013e27a8b removed main_posts from feed.j 2013-11-25 15:48:52 -05:00
psychobunny
181c6eb2e6 removed main_posts from noscript 2013-11-25 15:48:52 -05:00
Julian Lam
7955a5d53a 0.1.1 2013-11-25 15:08:49 -05:00
psychobunny
c261babf17 minify client scripts only after plugin system is activated 2013-11-25 12:35:54 -05:00
psychobunny
b90eef6d19 use icon-search instead of icon-circle-blank on /users/search 2013-11-25 01:21:26 -05:00
psychobunny
5c597ca218 expand regex for templates, allowing the syntax to be less strict re: whitespace 2013-11-25 01:14:31 -05:00
psychobunny
3dbcf8112d fixes navigation - back button 2013-11-25 00:59:21 -05:00
psychobunny
5357ad61db plugins - filter:scripts.get hook lets a plugin add client-side JS to the header and queue up for minification on production 2013-11-25 00:53:27 -05:00
Baris Soner Usakli
ff50917c29 show no replies in recent and unread 2013-11-24 22:48:58 -05:00
Baris Soner Usakli
48835d8c44 used ELSE in template 2013-11-24 22:29:36 -05:00
Baris Soner Usakli
e9c66bb35a removed console.log 2013-11-24 22:12:36 -05:00
Baris Soner Usakli
23eb7824ac closes #513 2013-11-24 22:08:37 -05:00
Baris Soner Usakli
494b9d23ac Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-24 13:58:14 -05:00
Baris Soner Usakli
64ae9ac033 cant delete or restore posts twice, post count goes up or down when posts are deleted or restored in a topic, fixed the post insertion when there is only 1 post in topic 2013-11-24 13:58:06 -05:00
Julian Lam
a72fc69997 added link to RSS for /recent, fixed RSS generation error for /recent 2013-11-24 11:15:40 -05:00
Baris Soner Usakli
a16f93cbd5 loading indicator starts off hidden 2013-11-23 18:05:19 -05:00
Baris Soner Usakli
81e5cf0cf3 fixed posts not appearing immediately 2013-11-23 17:56:03 -05:00
Baris Soner Usakli
01102d5982 added responsive class to images in users recent posts 2013-11-23 17:18:26 -05:00
Baris Soner Usakli
2174aec0e1 closes #542 and other refactors on client side 2013-11-23 17:07:31 -05:00
psychobunny
46bad118de if a thread is unreplied, don't show the OP as the last person to reply 2013-11-23 15:28:00 -05:00
psychobunny
2d7228fa40 added if / else logic to templates 2013-11-23 15:15:33 -05:00
psychobunny
a1839d90fd prevent admin group from being deleted, closes #530 2013-11-23 14:53:06 -05:00
psychobunny
0cc136c3f6 simplifying conditional logic in templates + fixed it so that it takes namespace into account 2013-11-23 14:53:05 -05:00
Julian Lam
cd1e26418d making the loading indicator less obtrusive (and smaller, to boot) 2013-11-22 21:30:34 -05:00
Baris Soner Usakli
dab4f07258 fixed indents 2013-11-22 17:39:53 -05:00
Baris Usakli
501dc56fd3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-22 16:26:33 -05:00
Baris Usakli
253271127d infinite loader will insert posts in correct order 2013-11-22 16:26:19 -05:00
Julian Lam
f2da892b38 removed extra console log 2013-11-22 16:21:26 -05:00
Julian Lam
6dd72f480c Merge pull request #538 from draco2003/add_fav_context
add breadcrumb like context to favorites
2013-11-22 13:15:10 -08:00
Julian Lam
3caf8b4a67 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-22 15:48:14 -05:00
Julian Lam
39f2efbef8 closed #540 2013-11-22 15:48:03 -05:00
psychobunny
288341945d missing login menu in visible-sm range 2013-11-22 15:37:58 -05:00
psychobunny
d02bd72764 closes #535 2013-11-22 15:32:15 -05:00
Baris Usakli
7d3adb9275 removed unused stuff from getLatestTopics and recent.tpl 2013-11-22 15:01:00 -05:00
Baris Usakli
156950ac2f cleaned up app.createNewPosts 2013-11-22 14:51:45 -05:00
Baris Usakli
83f18c1915 closes #526 2013-11-22 14:08:02 -05:00
Baris Usakli
332730575f closes #529 2013-11-22 12:26:21 -05:00
Julian Lam
08ef67e824 closed #536 2013-11-22 11:42:42 -05:00
Dan Rowe
7e71fb218c add breadcrumb like context to favorites 2013-11-22 08:57:54 -05:00
Julian Lam
a7216caa3b closed #518 2013-11-21 22:15:04 -05:00
Julian Lam
87309601ce closed #533 2013-11-21 22:09:40 -05:00
Julian Lam
53db9db50f Merge pull request #527 from draco2003/patch-1
small wording change
2013-11-21 17:33:36 -08:00
Dan Rowe
23628668b7 small wording change 2013-11-21 20:29:23 -05:00
Baris Soner Usakli
6ac685b194 possible fix for js error 2013-11-21 20:11:06 -05:00
Baris Soner Usakli
db8c43ca97 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-21 18:40:30 -05:00
Baris Soner Usakli
bff0c8fdaf increased active users count to 16 2013-11-21 18:40:16 -05:00
Barış Soner Uşaklı
6f2b809385 Update README.md 2013-11-21 18:34:50 -05:00
Baris Soner Usakli
455479bd54 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-21 18:28:51 -05:00
Baris Soner Usakli
03b34a449d turned div into li, moved the a tags into the li elements 2013-11-21 18:28:31 -05:00
Julian Lam
08e51c8942 closed #502 2013-11-21 17:41:27 -05:00
Julian Lam
4aef5bfb72 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-21 17:36:00 -05:00
psychobunny
34c74770ce app.js minor cleanup 2013-11-21 17:02:40 -05:00
psychobunny
da8d198676 added some user friendly warnings to chat 2013-11-21 17:00:20 -05:00
Julian Lam
33868804fd fixed #517 2013-11-21 16:55:31 -05:00
psychobunny
22a3794c51 closes #525 2013-11-21 16:47:32 -05:00
psychobunny
1058d54c52 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-21 16:07:39 -05:00
psychobunny
90ce539683 fixed language file not parsing in footer 2013-11-21 16:07:32 -05:00
Baris Usakli
99c2fbd947 fixed anon count in browsing text if there are no logged in users 2013-11-21 15:56:28 -05:00
Baris Usakli
866d813218 fixed topic posting bug, if there was only 1 topic in a category the next posted topic in that category wasnt showing up until a full page reload 2013-11-21 15:33:41 -05:00
Baris Usakli
f1df8c2479 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-21 15:20:12 -05:00
Baris Usakli
6f1523c279 fixed bottom reply box for small devices 2013-11-21 15:20:03 -05:00
Julian Lam
163cdaf70c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-21 15:05:56 -05:00
Julian Lam
a9ce8393e4 added footer.build and page.load hooks 2013-11-21 15:05:45 -05:00
Baris Usakli
f04e30c4d4 more template changes to topic 2013-11-21 14:55:38 -05:00
Baris Usakli
9d0f8b4543 template changes 2013-11-21 14:33:55 -05:00
Baris Usakli
d631a4b2e5 topic.tpl changes, moved users to the bottom of main post, added reply thread tools buttons under main post, added posts and view count 2013-11-21 13:53:19 -05:00
Julian Lam
2cf55dcf9f added action:page.load hook 2013-11-21 12:28:10 -05:00
Baris Soner Usakli
9fbb139e67 fix post delete state after more posts are loaded 2013-11-20 12:22:59 -05:00
Baris Usakli
11e3b0da7d added spacing between share and edit buttons 2013-11-19 15:03:58 -05:00
Baris Usakli
0b922d3f60 possible fix for #516 2013-11-19 13:04:12 -05:00
Baris Usakli
7e4faa3270 closes #514 2013-11-19 12:38:13 -05:00
Julian Lam
635fba1e45 upping cerlean minver 2013-11-18 20:25:43 -05:00
Baris Usakli
7c950cc350 require cleanup in user.js, removed user.latest not used anymore 2013-11-18 16:22:43 -05:00
Baris Usakli
cc0fe66e3e minor tweak to notif filter :) 2013-11-18 15:56:12 -05:00
Baris Usakli
b2d6ce59cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-18 15:44:46 -05:00
Baris Usakli
586a181e0a closes #507 2013-11-18 15:44:32 -05:00
Julian Lam
33150943df Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-18 15:09:56 -05:00
Julian Lam
28dab60232 resolving notifs issue, I hope 2013-11-18 15:09:34 -05:00
Barış Soner Uşaklı
71ef76b108 Merge pull request #511 from damianb/patch-3
cleanup webserver.js requires
2013-11-18 08:44:23 -08:00
Julian Lam
64008ef5d8 Merge pull request #509 from damianb/patch-2
/bin/bash to /bin/sh
2013-11-18 08:36:37 -08:00
Barış Soner Uşaklı
1859154370 Merge pull request #506 from deniswolf/cleanup_specs
Cleanup specs in test/topic.js
2013-11-18 08:20:51 -08:00
Julian Lam
fa4067e885 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-18 08:19:18 -05:00
Julian Lam
c8c355b319 added komodoproject file extensions to gitignore 2013-11-18 08:19:04 -05:00
Damian Bushong
51355a53d9 cleanup webserver.js requires
the .js in a require is implicit and unnecessary;
sorted the requires out so that builtins are first, then npm deps, then locally provided libs.
minor changes to some strings, just using single-quotes to match the style through the rest of the file.
2013-11-18 02:39:08 -06:00
Damian Bushong
1f3f672d3f /bin/bash to /bin/sh
No bashisms present? Don't be explicit about needing bash, then.
2013-11-18 02:27:48 -06:00
Denis Wolf
7c3fa30c13 tests: topic.js: fixed description to mirror code, refactored asserts since mocha's 'done' can process errors in callback 2013-11-18 00:00:22 +02:00
Denis Wolf
cbbb7a7c8e tests: topic.js: extract mock data init in getters 2013-11-17 23:50:19 +02:00
Denis Wolf
6893bd8b04 tests: topic.js: extract mock data init in .post 2013-11-17 23:41:38 +02:00
Denis Wolf
22eabf6620 tests: topic.js: naming flow fix for .post 2013-11-17 23:35:18 +02:00
Baris Soner Usakli
a827888ee3 closes #503 2013-11-17 12:23:19 -05:00
Baris Usakli
54d94f5988 added topic tests 2013-11-15 16:16:50 -05:00
Baris Usakli
7c1b6d6ad2 lots of refactor for error handling 2013-11-15 14:57:50 -05:00
Baris Usakli
8c4f776122 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-15 13:39:14 -05:00
Baris Usakli
84fa704b25 refactor abit adding error checking to missing parts 2013-11-15 13:39:09 -05:00
Julian Lam
535379d9d7 added password confirmation to automated setup 2013-11-14 18:45:17 -05:00
Julian Lam
d2927e2be2 Merge pull request #500 from jgable/passwordConfirm
Add admin password confirmation on setup
2013-11-14 11:27:23 -08:00
Jacob Gable
bd04b2f921 Add admin password confirmation on setup
Closes #419

- Introduce a password:confirm question
- Isolate password questions to they can be re-asked
- Verify matching password, re-ask if not
2013-11-14 12:52:00 -06:00
Julian Lam
27fce2363d ... and again 2013-11-13 23:09:22 -05:00
Julian Lam
01340c87bd handling missing notifications in update script 2013-11-13 23:08:44 -05:00
Baris Soner Usakli
77c2f551d3 upgrade script fix 2013-11-13 20:03:44 -05:00
Julian Lam
18009ebb39 interim commit 2013-11-13 19:54:46 -05:00
Julian Lam
e6bb66705d 0.1.0 2013-11-13 15:15:00 -05:00
Baris Soner Usakli
88154c3ebf closes #497 2013-11-13 13:51:40 -05:00
Julian Lam
1c80a1bad5 ninjafix 2013-11-13 13:31:36 -05:00
Julian Lam
79c52dfe84 updated schema handling so that nodebb won't run unless you are up to date -- fixed #498 2013-11-13 12:46:55 -05:00
Baris Usakli
411ba3542c closes #493 2013-11-12 12:51:57 -05:00
Baris Usakli
fa9636a62a closes #495 2013-11-12 12:41:16 -05:00
Baris Usakli
69fefc0625 closes #496 2013-11-12 12:03:02 -05:00
Julian Lam
e598ffa993 Merge pull request #494 from RefinedSoftwareLLC/patch-2
Update README.md
2013-11-11 11:36:20 -08:00
RefinedSoftwareLLC
d99577ffb2 Update README.md
Added Wiki link because it is so easy to miss yet it is so important because of it's setup guides.
2013-11-11 12:29:18 -07:00
Baris Usakli
40108f92c9 closes #492 2013-11-11 14:28:08 -05:00
Julian Lam
a42b30fd40 removing commented out route 2013-11-11 14:15:27 -05:00
Julian Lam
37497fc5a0 fixed #393 - refactored basic route handling, moved some other routes to debug routes 2013-11-11 14:06:26 -05:00
Julian Lam
9bea23bbfe linting webserver.js 2013-11-11 13:25:54 -05:00
Julian Lam
4e39c50144 fine, 150ms. 2013-11-11 13:16:24 -05:00
Baris Usakli
7e50bcba0c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-11 12:45:11 -05:00
Baris Usakli
f81c583d86 changed postdelay default 2013-11-11 12:44:42 -05:00
Julian Lam
5647d55147 updated postDelay upgrade script to update if the old value is over 1000, not 10! 2013-11-11 12:41:33 -05:00
Baris Usakli
4ce6ac5af9 closes #491, added check to prevent crash in getAnonUserCount 2013-11-11 12:40:15 -05:00
Baris Usakli
d770963b69 closes #490 2013-11-11 12:18:20 -05:00
Julian Lam
625b96ba73 Merge remote-tracking branch 'origin/master' 2013-11-09 17:20:02 -05:00
Julian Lam
37877ed531 removed cheerio as a dependency 2013-11-09 17:19:53 -05:00
Julian Lam
1f2ef2a7e4 updated cerulean minver 2013-11-07 15:59:07 -05:00
Julian Lam
885eec79c3 ninjafix for bad conditional 2013-11-07 15:54:19 -05:00
Julian Lam
aa1994be67 updated MOTD to not be inside a jumbotron, updated default styling of MOTD 2013-11-07 15:52:35 -05:00
Baris Usakli
4552e6286e dont allow empty userslugs to register 2013-11-07 12:17:23 -05:00
Julian Lam
d7856bcd4f fixing bootswatch themes, which broke in the last update 2013-11-06 21:37:48 -05:00
psychobunny
7ea852fae3 Revert "mobile: collapse menu after clicking on menu item"
This reverts commit c67c37bb20.
2013-11-06 16:21:01 -05:00
psychobunny
c67c37bb20 mobile: collapse menu after clicking on menu item 2013-11-06 15:24:03 -05:00
Baris Usakli
7d1aa02fd1 removed schema.js 2013-11-06 13:56:32 -05:00
Julian Lam
2309ab2002 hopefully closed #485 2013-11-06 12:07:35 -05:00
Julian Lam
b87840d4c9 fixing issue where the default for "use_port" ended up being no. Now yes. 2013-11-06 11:36:00 -05:00
psychobunny
b5c22c7ff7 removed unfollow button + logic from following view 2013-11-05 15:10:38 -05:00
Baris Usakli
3b3e8348e4 closes #430 2013-11-05 14:50:50 -05:00
Baris Usakli
259ad42b31 numbers are strong 2013-11-05 14:40:46 -05:00
Baris Soner Usakli
51cb33bccc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-05 01:00:57 -05:00
Baris Soner Usakli
2a8a62a253 remove console.log 2013-11-05 01:00:55 -05:00
psychobunny
82ae80090e console.log 2013-11-05 00:27:38 -05:00
psychobunny
1d6135150f multiple plugins pointing to admin can conflict - fix 2013-11-04 23:59:41 -05:00
Baris Soner Usakli
41f98d29b7 added row to topic container 2013-11-04 23:24:43 -05:00
Baris Usakli
7b5a6bd3c9 fixed category infinite loading 2013-11-04 17:17:04 -05:00
Baris Usakli
fe15366524 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-04 17:02:27 -05:00
Baris Usakli
1cbbb3873f removed rounded images 2013-11-04 17:02:19 -05:00
Barış Soner Uşaklı
5e1ab7989a Merge pull request #479 from deniswolf/users-cleanup
User.js cleanup: spec, jshint satisfaction
2013-11-04 13:57:26 -08:00
Baris Usakli
0e5724cd2c template changes yet again 2013-11-04 16:52:58 -05:00
Denis Wolf
89e9d56dee user.js: Else in the sky with diamonds - fixing syntactic style. 2013-11-04 23:30:30 +02:00
Baris Usakli
58f9c2c18d removed console.log 2013-11-04 16:13:56 -05:00
Baris Usakli
1ec6726459 template changes to recent and unread 2013-11-04 16:00:34 -05:00
Baris Usakli
6b4520e526 recent unread template changes 2013-11-04 15:17:57 -05:00
Baris Usakli
98f20564de Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-04 15:01:11 -05:00
Baris Usakli
4da819b02b changesto category.tpl 2013-11-04 15:01:01 -05:00
Julian Lam
dc90db74c0 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-11-04 13:22:17 -05:00
Julian Lam
c5bc2dd64f upgrading to bootstrap 3.0.1, wish us luck! 2013-11-04 13:22:05 -05:00
Baris Usakli
bbb045698d closes #481 2013-11-04 12:37:06 -05:00
psychobunny
d9e364cd86 fixes #480 2013-11-04 12:14:36 -05:00
Denis Wolf
b179991be4 user.js: ladies and gentlemen, I'm going to satisfy jshint right before your eyes! 2013-11-04 01:57:58 +02:00
Denis Wolf
05de4870b0 user: add spec 2013-11-04 01:32:31 +02:00
Julian Lam
01f0131f5d upping markdown minver 2013-11-03 17:50:16 -05:00
Julian Lam
d69847c54e NodeBB will now fire hooks if a config setting changes 2013-11-03 17:49:03 -05:00
Julian Lam
cc78f6f155 moved firing of plugin activation to after a plugin reload 2013-11-03 17:29:14 -05:00
Julian Lam
1e2100902c closed #478 2013-11-03 17:25:07 -05:00
Julian Lam
4353a9da25 issue #478 - hot-swapping of plugins 2013-11-03 17:15:18 -05:00
Julian Lam
e480b1bace - removed reference to deprecated local modules folder in plugins.init 2013-11-03 12:39:24 -05:00
Julian Lam
5a96f5f64b removed filterBannedPosts method that seemed unused -- monkey-patching
install script to remember old values (if present, otherwise use defaults)
2013-11-03 11:53:44 -05:00
Baris Usakli
7296b701fa recent reply style change 2013-11-01 16:25:48 -04:00
Baris Usakli
a21d91d870 closes #476 2013-11-01 16:01:48 -04:00
Baris Usakli
6931695e64 when you type correctly 2013-11-01 15:07:41 -04:00
Baris Usakli
e12d02f29c jquery best 2013-11-01 15:04:54 -04:00
Baris Usakli
404865c32e closes #429 2013-11-01 14:55:55 -04:00
Baris Usakli
75879c47c5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-01 14:08:48 -04:00
Baris Usakli
f946918176 fixed anon images in topic view, anon users arent added to active users for a category 2013-11-01 14:08:39 -04:00
Julian Lam
6ca3df2431 upping cerulean minver 2013-11-01 13:59:35 -04:00
Baris Usakli
c8ec095d99 anons cant edit after posting #365 2013-11-01 13:45:24 -04:00
Baris Usakli
0179a55ee4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-11-01 13:04:25 -04:00
Baris Usakli
04ed1df0ef closes #365, allow guest posting. enabled from admin/settings, defaults to disabled 2013-11-01 13:04:15 -04:00
Julian Lam
de66ee1a89 updated error when no test db is defined -- also made an invalid "db" option a fatal error. Before, it was just defaulting to 0! Wiped out my test db hahaha 2013-11-01 12:16:36 -04:00
Julian Lam
e8c4bda984 Merge pull request #469 from deniswolf/redis-refactoring
Use separate db for testing
2013-11-01 08:44:56 -07:00
Julian Lam
7074b75b9d extra console.log 2013-11-01 11:36:35 -04:00
Julian Lam
857756f636 silly closures... 2013-11-01 11:36:05 -04:00
Julian Lam
e4c62200de fixing screenshot previews in admin/themes 2013-11-01 11:27:02 -04:00
Denis Wolf
89ec677d54 redismock: notify developer about test db config 2013-11-01 02:54:29 +02:00
Denis Wolf
8ff656430d tests: check if we are able to use test db wrapper at all 2013-11-01 02:54:28 +02:00
Denis Wolf
db22394976 redis.js - cleanup 2013-11-01 02:31:34 +02:00
Denis Wolf
ef5548a749 tests: categories.js is using testing db now 2013-11-01 02:31:34 +02:00
Denis Wolf
14c3bb7d63 redismock.js - wrapper for using test db instead of production 2013-11-01 02:31:34 +02:00
Baris Soner Usakli
1a415b60be fixed online page to match the changes made to the template 2013-10-31 16:20:21 -04:00
Julian Lam
85fa68bd92 upping minver for mentions plugin, fixing bad url in admin/topics 2013-10-31 15:54:50 -04:00
Julian Lam
e41ca491ff fixed use of divs inside a UL... how weird heh. 2013-10-31 15:02:52 -04:00
Julian Lam
bb5962cda0 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-31 15:02:40 -04:00
Julian Lam
2de878821b addressed #466, dynamicaly loaded topics now have proper delete/lock/pin
states
2013-10-31 15:02:12 -04:00
psychobunny
5bea2999ef cleanup 2013-10-31 14:38:51 -04:00
Baris Soner Usakli
67e9bf74a7 fixes unread page in mobile 2013-10-31 14:12:47 -04:00
Baris Soner Usakli
ed42012058 closes #472, need to wait for transitions to end before ajaxifying or the overlays stays there (drunk) 2013-10-31 13:30:34 -04:00
Baris Soner Usakli
9b7c9e4a81 camel case for user.js methods 2013-10-30 18:31:36 -04:00
psychobunny
85daacdf7a remove reference to deprecated mobileMenu 2013-10-30 16:38:58 -04:00
psychobunny
17ea41fdae category - use jQuery for graceful degradation 2013-10-30 16:23:36 -04:00
psychobunny
ffd2a18837 updated cerulean to 0.0.4 2013-10-30 15:32:20 -04:00
Julian Lam
5d7f38f99f Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-29 18:25:50 -04:00
Julian Lam
e762267e03 fixed screenshots for themes 2013-10-29 18:25:33 -04:00
psychobunny
a71870de28 pass in site description as well for potential themes to take advantage of 2013-10-29 17:27:23 -04:00
Baris Soner Usakli
7eba0b85f4 fixed andrews fail 2013-10-29 15:19:29 -04:00
psychobunny
30a45ee78e prevent a potentially badly written theme.json from blowing up your forum 2013-10-29 15:13:07 -04:00
psychobunny
ca9cd36067 fix for switching back to a theme without a custom template dir 2013-10-29 14:51:58 -04:00
psychobunny
1d5a208896 themes - added ability to route custom templates serverside 2013-10-29 14:40:35 -04:00
Baris Soner Usakli
60e2938b58 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-29 14:16:10 -04:00
Baris Soner Usakli
89540172b2 closes #464 2013-10-29 14:16:03 -04:00
psychobunny
bbb716723f templates - basic implementation of conditionals
<!-- IF variable -->
show me
<!-- ENDIF variable -->
2013-10-29 14:04:07 -04:00
psychobunny
842cd17979 themes - added ability to route custom templates 2013-10-29 12:34:41 -04:00
Barış Soner Uşaklı
e0e32efd26 Merge pull request #465 from deniswolf/utils-cleanup
Utils.js cleanup
2013-10-28 15:44:38 -07:00
Denis Wolf
a127fcd056 utils.js - detect node/browser with IF, not silent TRY/CATCH 2013-10-28 23:55:45 +02:00
Denis Wolf
c614af2cd9 utils.js - removed unused *trim shims - it's better to bring them when and if needed 2013-10-28 23:41:11 +02:00
Denis Wolf
c2abff6e6d utils.js - strict mode, missing semicolon, braces etc 2013-10-28 23:33:37 +02:00
Baris Usakli
4444d2ee6a removed whitespace 2013-10-28 16:16:44 -04:00
Julian Lam
463bc1374c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-28 15:52:43 -04:00
Julian Lam
d9a60fc2ef rejigging format of notif page 2013-10-28 15:52:39 -04:00
Baris Usakli
22a3b227a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-28 15:49:21 -04:00
Baris Usakli
12f3f1a45c show admin link in header if user is admin, closes #459 2013-10-28 15:49:12 -04:00
Julian Lam
84d4c2944c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-28 15:26:10 -04:00
Julian Lam
0a9b918c75 fixed notifications not exiting (whoops) 2013-10-28 15:25:35 -04:00
Julian Lam
8ddf200ce7 Merge branch 'cli-help' of https://github.com/RefinedSoftwareLLC/NodeBB into RefinedSoftwareLLC-cli-help
Conflicts:
	app.js
2013-10-28 15:24:21 -04:00
Julian Lam
207ff98211 Merge pull request #399 from JetMaddox/master
Disable Framing on all sites.

I'm merging this ***conditionally*** - at some point, we wish to introduce integration with CMSes like WordPress. An easy way to achieve this would be placing NodeBB in an iframe.

At that point in time, we'll want to make this a configurable option via admin panel.
2013-10-28 12:18:28 -07:00
Julian Lam
1fb09a9c8c merging @deniswolf's new tests, and double-checking that generateUUID still works 2013-10-28 15:15:59 -04:00
Julian Lam
67f9b22c86 Merge branch 'master' of https://github.com/deniswolf/NodeBB 2013-10-28 15:14:17 -04:00
Julian Lam
8b5cf0c696 Merge branch 'notif_pruning' 2013-10-28 15:10:21 -04:00
Julian Lam
26d9cc56d3 added cronjob for notifications 2013-10-28 15:10:10 -04:00
Julian Lam
930a9c8bca completed notifications pruning method 2013-10-28 14:53:41 -04:00
Baris Usakli
51a9bd9e56 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-28 14:36:40 -04:00
Baris Usakli
ac12bd0b8f closes #462 2013-10-28 14:36:31 -04:00
Julian Lam
d7651d1504 Merge branch 'master' into notif_pruning 2013-10-28 13:46:07 -04:00
Julian Lam
7e1f996079 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-28 13:45:55 -04:00
Julian Lam
1af4a9abb4 upped mentions plugin minver 2013-10-28 13:45:51 -04:00
Julian Lam
ed7c9348b7 interim commit 2013-10-28 13:45:32 -04:00
Baris Usakli
ccf4ed1235 topics and posts counters will update for everyone 2013-10-28 13:34:36 -04:00
Julian Lam
b22ee67612 Merge branch 'master' into notif_pruning 2013-10-28 10:52:30 -04:00
Baris Usakli
b5a953b16c fixes topics going into wrong category 2013-10-28 10:36:39 -04:00
Baris Usakli
7613f02eff closes #457 2013-10-28 10:27:03 -04:00
Baris Soner Usakli
78a3dd68ea hide the no topics warning when a new topic is posted on /unread 2013-10-28 00:27:18 -04:00
Baris Soner Usakli
afc0e25b26 closes #463 2013-10-28 00:08:44 -04:00
Baris Soner Usakli
82e14eef35 closes #458 2013-10-27 23:29:53 -04:00
Denis Wolf
81e9c9807f utils.js - missing semicolon, strict equality 2013-10-28 02:10:44 +02:00
Denis Wolf
02e2b53a1d TESTS: Utils.js: tests for validations, uuid generation 2013-10-28 02:09:57 +02:00
Denis Wolf
babe9b6f54 valid jshint config with globals for tests only 2013-10-28 02:09:09 +02:00
Baris Soner Usakli
52f198481b closes #456, if the file path doesnt exists logger was crashing 2013-10-26 20:19:42 -04:00
Baris Soner Usakli
252187f1fe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-26 19:00:42 -04:00
Baris Soner Usakli
99812c33e7 closes #454 2013-10-26 19:00:34 -04:00
Julian Lam
97c5f6009d closes #455 2013-10-26 18:26:30 -04:00
RefinedSoftwareLLC
5e15f8683e Update app.js
Only check if file exists when no other supported --arguments are given.
Display that 0.0.0.0 is Any Address.
Moved upgrade section to after install section.
added CLI --help!
2013-10-26 10:56:05 -06:00
Baris Soner Usakli
fba1f7ae05 removed console.log 2013-10-25 18:09:07 -04:00
Baris Soner Usakli
865e5ae3a3 closes #448 2013-10-25 18:08:23 -04:00
Baris Soner Usakli
1af98835b1 added share buttons to main post 2013-10-25 18:00:08 -04:00
Baris Soner Usakli
6eadf67add another privilege fix 2013-10-25 16:56:18 -04:00
Baris Usakli
f3f280d008 another fix to priv 2013-10-25 16:02:18 -04:00
Julian Lam
aecbe6d316 interim commit, still nothing done 2013-10-25 16:01:31 -04:00
Baris Usakli
63419d7ca9 fix for reputation checks for manage content and manage threads 2013-10-25 15:35:48 -04:00
Julian Lam
3480a1d60e Merge branch 'master' into notif_pruning 2013-10-25 14:51:38 -04:00
Barış Soner Uşaklı
190712e250 Merge pull request #420 from twinlabs/relax-username-validation
relax username validation (#413)
2013-10-25 11:25:56 -07:00
Baris Usakli
a662330b1b fixed users page lists 2013-10-25 12:08:50 -04:00
Baris Usakli
04ee1d137d fixed unread and recent new post/topic notifications 2013-10-25 11:05:06 -04:00
Baris Usakli
27f421587e closes #444 2013-10-25 09:57:02 -04:00
Baris Soner Usakli
f9f0bd8685 closes #445 2013-10-24 23:32:25 -04:00
Julian Lam
53b12f50a7 updating git url for vanilla theme 2013-10-24 08:35:32 -04:00
Julian Lam
63d49463da removed deprecated /plugins folder, updated vanilla package info to always
load the latest latest version - closes #438
2013-10-24 08:10:58 -04:00
Baris Usakli
549017d035 cleaned up getCategories 2013-10-23 16:27:33 -04:00
Baris Usakli
45feef5884 closes #421 2013-10-23 15:45:00 -04:00
Baris Usakli
24592cc696 fixed the anon-box in users/online to show inline 2013-10-23 15:24:43 -04:00
Baris Usakli
c640c550fd removed old browsing code from websockets.js 2013-10-23 15:12:19 -04:00
Baris Usakli
0565b7b8c8 moved css out 2013-10-23 15:00:06 -04:00
Baris Usakli
1691c74727 testing breadcrumb images 2013-10-23 14:39:46 -04:00
Julian Lam
f6be3eacfc interim commit 2013-10-23 12:37:29 -04:00
Baris Usakli
790df903ac added view count to topics 2013-10-23 12:26:24 -04:00
Baris Usakli
25e6f72921 closes #434 2013-10-23 12:16:48 -04:00
Baris Soner Usakli
ab1015b11e #433 2013-10-22 21:47:09 -04:00
Julian Lam
55e990f71d fixes #433 - looks like someone removed the code that floated pinned
topics to the top...
2013-10-22 21:20:56 -04:00
Julian Lam
40a8150519 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-22 21:15:56 -04:00
Baris Soner Usakli
87744302ba fixed button tags in topic.tpl 2013-10-22 19:45:06 -04:00
Baris Soner Usakli
17083dc5e6 closes #417 2013-10-22 19:41:34 -04:00
Julian Lam
b29616fbd8 adding link to notifications page in notifications dropdown 2013-10-22 18:10:51 -04:00
Baris Usakli
468688615f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-22 15:54:10 -04:00
Baris Usakli
f4faee4283 moved image uploading to a require js module, added image upload to site logo 2013-10-22 15:54:02 -04:00
Julian Lam
62c85274a3 mark all notifs as read functionality. CSS tweaks... 2013-10-22 15:06:07 -04:00
Julian Lam
db2917193e Merge branch 'master' into notifications_page 2013-10-22 14:35:38 -04:00
Julian Lam
705571de8c notifications page + ajaxify route + css styling 2013-10-22 14:35:20 -04:00
psychobunny
2ee29683a7 random whitespace 2013-10-22 14:22:53 -04:00
psychobunny
51395dda91 updated all RDB.hget in posts to use getPostField. new post filters for retrieving and saving posts. made editPost saving synchronous. 2013-10-22 14:22:21 -04:00
Baris Usakli
9babef0095 closes #422, will restart over if reconnection fails after x number of attempts 2013-10-22 13:42:23 -04:00
Baris Usakli
e9545c9a7f closes #426 2013-10-22 13:07:41 -04:00
Baris Usakli
619214e462 added relative path to logo 2013-10-22 12:54:20 -04:00
Baris Usakli
31b600686a logo links to homepage 2013-10-22 12:51:06 -04:00
Baris Usakli
bccc4e8019 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-22 12:39:24 -04:00
Baris Usakli
7039a4d762 closes #425 2013-10-22 12:39:14 -04:00
Julian Lam
7b7f0115e5 closed #432 - added link rel="up" and rel="alternate" to category and
topic pages
2013-10-22 12:23:07 -04:00
Baris Soner Usakli
24e79b3f4e #426 2013-10-21 18:51:33 -04:00
Julian Lam
5c70b2b307 issue #427 - proper handling of theme reverting 2013-10-21 12:10:23 -04:00
Julian Lam
65a8de7845 special theme.set socket call + static dir support, closes #427, tweaked languages 404 to work with subdirs 2013-10-21 12:07:37 -04:00
Julian Lam
44d2297546 monkeypatching the 404 route to handle missing languages and client side scripts. Removing "soft 404" in favour of hard 404 due to complaints from google webmaster tools 2013-10-21 11:09:46 -04:00
psychobunny
a41280707e updated the vanilla & cerulean theme's package versions 2013-10-20 13:59:10 -04:00
Jet
a8f2fd66ae Adding brackets.
Too much Coffeescript. Had some filters on. :)
2013-10-20 13:27:25 +02:00
Baris Soner Usakli
7e8ddbadfb closes #423, closes #424 2013-10-19 23:30:10 -04:00
Julian Lam
80aeb3677d added new packages to install script, defaulting to cerulean 2013-10-19 17:50:40 -04:00
Julian Lam
f92bbdaefa Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-19 17:48:00 -04:00
Julian Lam
fc73f16425 closes #418 2013-10-19 17:45:12 -04:00
Julian Lam
c1f47f536d install script tweaks so vanilla is default 2013-10-19 17:41:26 -04:00
Julian Lam
9166c82dc2 tweaking admin panel integration 2013-10-19 17:25:17 -04:00
Julian Lam
3decc8b9b1 removing nodebb.less file 2013-10-19 17:14:54 -04:00
Julian Lam
bac5da30e7 removing themes folders from core 2013-10-19 17:10:29 -04:00
Julian Lam
baf379c6d7 theme intergration into nodebb based on config hash value 2013-10-19 16:24:33 -04:00
Baris Soner Usakli
e9b6cdb37a add responsive class to imgs 2013-10-19 15:58:54 -04:00
Baris Soner Usakli
9d36d2c749 fixed placeholder text in chat modal 2013-10-19 15:31:17 -04:00
Noah Chase
5945ab1a0a relax username validation (#413)
this commit allows for matching accented characters, dots, '@' symbol,
and other important things.
2013-10-19 15:27:20 -04:00
psychobunny
40319a66ff reverting 754aef8a84 2013-10-19 11:48:46 -04:00
psychobunny
754aef8a84 fixes #392 - needs testing on try to see if google updates title correctly
order of events: 1. title changes, 2. content fades in, 3. history
pushState
2013-10-19 11:31:01 -04:00
Baris Soner Usakli
0613b530e8 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-18 16:02:43 -04:00
Baris Soner Usakli
5e9819b96f #415, moved search form into logged in menu 2013-10-18 16:02:33 -04:00
Julian Lam
b46e334a40 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-18 15:58:39 -04:00
Julian Lam
af49845ae6 upping mentions minver 2013-10-18 15:58:28 -04:00
Baris Soner Usakli
4cb8241334 added mising template variables to fix image change modal 2013-10-18 15:48:15 -04:00
Julian Lam
530e6cb20e upping mentions plugin minver 2013-10-18 14:03:15 -04:00
Julian Lam
e0adc03588 upping markdown ver again 2013-10-18 13:19:13 -04:00
Julian Lam
e48f6e6d9b Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-18 13:10:43 -04:00
Julian Lam
04ff4df5d7 updated markdown plugin min ver 2013-10-18 13:10:34 -04:00
Baris Usakli
d789e96d79 fixed 2 missing requires in api.js 2013-10-17 14:49:31 -04:00
Baris Usakli
45761fd48b fixed missing require in messaging 2013-10-17 12:05:53 -04:00
Julian Lam
cb6a47a5d9 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-16 14:08:57 -04:00
Julian Lam
67dbdfd80d fixed test cases to not throw redis error due to Reds 2013-10-16 14:08:31 -04:00
Baris Usakli
dee99c1752 update category topic count if topic is deleted/restored 2013-10-16 13:42:07 -04:00
Baris Usakli
a0c7e187f5 footer stats will display human readable stuff 2013-10-16 13:25:17 -04:00
Julian Lam
938503bd56 Merge branch 'category-test-uses-base-config' of https://github.com/twinlabs/forum.node into nchase-merge 2013-10-16 13:10:36 -04:00
Baris Usakli
33bda6fd16 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-16 13:04:37 -04:00
Baris Usakli
929336cb57 closes #408 2013-10-16 13:04:28 -04:00
Julian Lam
883aca038b disabled categories are now faded in the "Move Thread" modal. closes #409
Why is it called "move topic"? Renamed.
2013-10-16 12:57:12 -04:00
Julian Lam
77e03dc18d readded missing styles for the "Move Thread" modal 2013-10-16 12:34:04 -04:00
Baris Usakli
230ed1ab11 moved cid so that other functions can use it in category.js 2013-10-16 12:03:44 -04:00
Baris Usakli
b31fa856d0 added meta require to topics.js 2013-10-15 15:39:45 -04:00
Baris Usakli
98b97b9898 added callback to hmset in category.create 2013-10-15 15:20:12 -04:00
Baris Usakli
41cf7c6814 added commas after some requires, added missing plugins require to categories 2013-10-15 15:01:12 -04:00
Baris Usakli
da3a2f436c added categories require to feed.js 2013-10-15 14:44:42 -04:00
Julian Lam
569a7178d7 fixed install script error 2013-10-15 14:31:27 -04:00
Julian Lam
7e7497c3bd Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-15 13:12:51 -04:00
Julian Lam
905c78d5a3 reverting changes to the badge 2013-10-15 13:12:43 -04:00
Baris Usakli
37b1cb009a added chevron to fave template 2013-10-15 12:01:27 -04:00
Julian Lam
56586e1fda tweaking more badges fro /home, itemprops for homem reduced padding right of badge in category view 2013-10-15 11:17:23 -04:00
Julian Lam
2040fcdba4 moved badge outside of topic title, added schema.org itemprop stuff for category listing 2013-10-15 11:11:21 -04:00
Julian Lam
d24b57ae86 upping markdown package to 0.1.5 2013-10-14 23:19:09 -04:00
Julian Lam
db72102de7 upping markdown version 2013-10-14 22:02:10 -04:00
Julian Lam
e8801a75f3 fixing weird passing in of a single param as an array for post.save hook 2013-10-14 21:47:45 -04:00
Julian Lam
918826ff48 fixed action calls, and added a new hook for plugin activation and deactivation 2013-10-14 21:11:17 -04:00
Julian Lam
fa2fe5c941 allowing plugin system to detect object method path by dot notation 2013-10-14 17:24:57 -04:00
Julian Lam
8ef2761f53 tweaking plugins again -- simplifying 2013-10-14 17:07:54 -04:00
Julian Lam
9375369b88 fixed issues caused by inadvertant globalisation (and its subsequent fix) 2013-10-14 16:41:34 -04:00
Julian Lam
ce77c82b0c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-14 16:28:35 -04:00
Julian Lam
1e39ae2f1e minor tweak to plugins (used object format instead of potentially
confusing array)
2013-10-14 16:28:08 -04:00
Julian Lam
c143894547 Merge pull request #405 from twinlabs/stop-topic-global-leak
fix typo that was causing Topic module's variables to leak into global namespace
2013-10-14 11:45:53 -07:00
psychobunny
37450ff00c optimized ajaxify to only recurse through script tags; updated so it looks deeper for embedded scripts (ie. within plugin subtemplates) 2013-10-14 14:26:20 -04:00
psychobunny
ca9c468edd plugins - filter:category.build_sidebars allows plugins to generate custom sidebar content 2013-10-14 14:25:36 -04:00
psychobunny
d6570d1496 prevent admin crashes on improperly configured plugins 2013-10-14 12:00:31 -04:00
psychobunny
bf677522a9 added additional_profile_info footer in posts view; plugins - filter:posts.custom_profile_info hook lets you add info to post block footer
also fixed app.alert - if title is not set then do not show title.
2013-10-13 19:16:48 -04:00
Noah Chase
fd89f71fc0 fix typo that was causing topic variables to leak into global namespace 2013-10-13 18:39:42 -04:00
Noah Chase
83477ece18 category tests should be able to use whatever the app defines as config options 2013-10-13 15:18:33 -04:00
psychobunny
32990794ce fixed admin bug (on f5 was not populating fields); plugins - filter:admin.create_routes allows you to create path to custom admin page 2013-10-13 14:30:39 -04:00
psychobunny
4b5bae4f9b fixed plugin path in admin header 2013-10-13 13:52:33 -04:00
psychobunny
2b07917020 plugins - filter:admin.header.build allows you to add plugins to navigation in ACP 2013-10-13 13:34:15 -04:00
psychobunny
338acb8fc2 added a way to disable ajaxify on links manually if needed. 2013-10-12 17:43:29 -04:00
psychobunny
2a4b228e19 plugins - filter:server.create_routes allows you to add custom routes to NodeBB 2013-10-12 17:19:18 -04:00
Julian Lam
c6c3ab94b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-12 17:00:48 -04:00
Julian Lam
8671516b95 added more itemprop stuff... replies are now comments. 2013-10-12 17:00:30 -04:00
Baris Soner Usakli
5710ab47ae Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-12 14:45:23 -04:00
Baris Soner Usakli
e3b0eb29f1 added favourites link to template 2013-10-12 14:45:15 -04:00
Julian Lam
795594b6a6 added some microdata for better google scrapage. closes issue #401 2013-10-12 14:23:58 -04:00
Julian Lam
e91da53d9e using reduce to run filter hooks instead of eachSeries, and fixed up
incorrect usage of .apply() in tests folder
2013-10-12 13:50:08 -04:00
Julian Lam
f807df84d8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-12 13:31:07 -04:00
Julian Lam
7f32d5741d removing restriction that caused hook system to go weird when arrays were
passed in as args
2013-10-12 13:30:43 -04:00
psychobunny
30c7113bd8 removed console.log 2013-10-12 13:08:49 -04:00
psychobunny
a63732027f plugins - filter:header.build allows plugins to add custom navigation to header 2013-10-12 13:05:47 -04:00
Julian Lam
13d8f51f6a added test file for categories (incomplete)
re: issue #391
2013-10-12 11:06:53 -04:00
Julian Lam
5d48ed5fb4 using map instead of eachSeries to load categories for /home. Error
handling.
2013-10-12 10:37:44 -04:00
Baris Soner Usakli
4b89b3e2ed fixed time for month 2013-10-11 23:32:47 -04:00
Julian Lam
1ee24517e3 enhanced the "discard post" confirmation message to only trigger if
something in the post body actually changed
2013-10-11 20:55:31 -04:00
Julian Lam
64e35c734e decreased the severity of the border radii on the post window, and removed
them completely from the bottom of the window, as it conflicts with the
taskbar
2013-10-11 20:50:30 -04:00
Baris Soner Usakli
08130e8088 fixed conditional in follower/following count 2013-10-11 17:18:17 -04:00
Baris Usakli
0c5937805b clear uploads in progress if discard is clicked, temp fix until composer is revamped 2013-10-11 15:16:00 -04:00
Baris Usakli
d315829eaf closes #394 2013-10-11 15:06:56 -04:00
Baris Usakli
6dad1c3bbb Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-11 14:58:04 -04:00
Baris Usakli
3577c11c89 fixed infinite loading on /recent 2013-10-11 14:57:55 -04:00
psychobunny
8326c223ab fixed f5 bug with /recent/:term which previously gave a 404 2013-10-11 14:57:17 -04:00
Baris Usakli
73de5f78fe language file 2013-10-11 14:50:09 -04:00
Baris Usakli
4e59b85073 recent page, for hour, day, week, month 2013-10-11 14:48:14 -04:00
Baris Usakli
9af26db57a follower count fix 2013-10-11 14:29:34 -04:00
Baris Usakli
8e4ca8e474 closes #397 2013-10-11 13:06:21 -04:00
Baris Usakli
79de3976bf removed non existant paths from templates/config.json, added starts with to regexes 2013-10-11 12:02:43 -04:00
Baris Usakli
4b80f13373 removed reduntant paths fron templates/config.json 2013-10-11 11:59:17 -04:00
Baris Usakli
6210c6dbf4 removed extra ) in search.js 2013-10-11 11:54:15 -04:00
Jet
97592eede6 Fixed case for header 2013-10-11 11:19:24 +02:00
Jet
73dafa6aff Disable framing
Set the X-Frame-Options to DENY for added security.
2013-10-11 11:08:52 +02:00
Baris Usakli
6c3e121b6c remove a line, not needed 2013-10-09 17:38:00 -04:00
Baris Usakli
95ee7fb49f added flag to empty container 2013-10-09 17:30:49 -04:00
Baris Usakli
b3f73eace1 fix for online page 2013-10-09 17:16:07 -04:00
Baris Soner Usakli
07a497362a removed console.log 2013-10-07 17:49:25 -04:00
Baris Soner Usakli
afa078d00c closes #288 2013-10-07 17:48:11 -04:00
psychobunny
3fd7d9a604 moved jquery.form.js into appropriate location 2013-10-07 16:56:20 -04:00
psychobunny
80a0d2d8d8 ^ this person is awesome, what a commit! 2013-10-07 16:01:03 -04:00
psychobunny
27f4fdd179 fixes #377 2013-10-07 13:00:57 -04:00
psychobunny
d1a94a91c2 added app.uid 2013-10-07 12:57:40 -04:00
psychobunny
69a31dcdd9 fixes #388 2013-10-07 12:49:13 -04:00
psychobunny
a2a6bf87f7 fixes #387 2013-10-07 12:38:57 -04:00
Julian Lam
bd1e95b655 cleaned up admin template mapping 2013-10-06 18:28:17 -04:00
Julian Lam
278f9bfc03 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-06 18:04:25 -04:00
Julian Lam
a3a8950afd bumping markdown plugin version to 0.1.3 2013-10-06 18:04:03 -04:00
Julian Lam
f95913e623 Merge pull request #386 from adarqui/issue-login-redirect-40x
Issue login redirect 40x
2013-10-06 11:12:19 -07:00
Julian Lam
8e4b51fba4 requiring latest version of mentions plugin 2013-10-06 14:10:54 -04:00
Julian Lam
84915a1843 added css files support for plugins, added ready output for NodeBB, put
some minification related outputs to debug-mode only
2013-10-06 13:55:30 -04:00
Andrew Darqui
4b0e915698 just changed the 403/404 checking logic to use regex. 2013-10-06 04:32:03 -04:00
Andrew Darqui
b2e81b5d17 Fixes a small issue with the redirect after logging in. If app.previousUrl is undefined (from accessing the page directly), login would fail to redirect you because of an error with indexOf on the undefined app.previousUrl. 2013-10-06 04:24:38 -04:00
Andrew Darqui
ef47f3fd15 if nodebb returns 403/404, don't overwrite previousUrl. If you don't do this, when logging in after a 403/404, it will redirect you to the 403/404 page. 2013-10-06 04:17:06 -04:00
Julian Lam
f88f72abd2 Merge branch 'adarqui' 2013-10-05 22:47:59 -04:00
Julian Lam
715c14b78d fixed error where client side script loader on admin page was throwing 404
errors on require.js require
2013-10-05 22:46:30 -04:00
Julian Lam
4af7da3451 Merge branch 'express-logger-0.0.7-fixes' of http://github.com/adarqui/NodeBB into adarqui 2013-10-05 22:36:41 -04:00
Julian Lam
63ff572076 WIP commit for CSS static directories 2013-10-05 22:33:29 -04:00
Andrew Darqui
129af904f6 fixed an issue with Logger.io_close, needed to check for undefined on the socket.oEmit and socket. functions 2013-10-05 22:06:44 -04:00
Andrew Darqui
8cc71d2b47 fixed logger.tpl to use the new requirejs code 2013-10-05 21:44:54 -04:00
Julian Lam
0b299b2fe7 Merge pull request #381 from adarqui/express-logger-0.0.7
Express & Socket.io logger
2013-10-05 14:39:14 -07:00
Julian Lam
b1cef5f73d Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-05 13:48:41 -04:00
Julian Lam
42067ce53c closes #382 - install script can be run via command line 2013-10-05 13:48:23 -04:00
Baris Usakli
2bdf12fb67 derp, need to revamp online page 2013-10-04 16:21:30 -04:00
Baris Usakli
c00b138bf2 some fixes to online page 2013-10-04 16:03:03 -04:00
Baris Usakli
1155eaf1f1 online page changes 2013-10-04 15:30:52 -04:00
Baris Usakli
52f2e193d6 if api fails with 404 ajaxify to 404, added type check to updateProfile 2013-10-04 13:39:44 -04:00
Baris Usakli
f5619a9b29 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-10-04 13:01:33 -04:00
Baris Usakli
057608bac0 added usernames to following followers, closes #369 2013-10-04 13:01:28 -04:00
Julian Lam
57465eb277 misrouting now only shows warning when in debug mode 2013-10-04 10:37:32 -04:00
Julian Lam
01e04d60a9 fixing redis db in upgrade path 2013-10-04 10:34:08 -04:00
Julian Lam
be8d9be832 flushed out upgrade path for notifications 2013-10-04 10:27:32 -04:00
Julian Lam
07d07020f0 requiring latest nodebb plugin versions 2013-10-04 10:06:17 -04:00
Andrew Darqui
7c1f7e7a23 just some text formatting fixes 2013-10-04 01:54:23 -04:00
Andrew Darqui
a3f6fee41f refactored the logger completely. 2013-10-04 01:46:50 -04:00
Julian Lam
0414ec7f83 removing testbed code from repo (why was it even checked in?!!) 2013-10-03 23:21:29 -04:00
Julian Lam
12af2a7ff6 install script calling proper redis db 2013-10-03 23:10:17 -04:00
Julian Lam
4d6881fa65 reset update for 0.0.7, and added new schema update for notifications 2013-10-03 22:36:00 -04:00
Julian Lam
019e8e0d14 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-10-03 21:20:00 -04:00
Julian Lam
763bd775c4 closed #380 2013-10-03 21:18:59 -04:00
Julian Lam
585e07bc79 closed #368 - notifications now no longer need scores 2013-10-03 20:35:16 -04:00
Julian Lam
b911d8d075 Merge pull request #379 from ipetepete/master
Added config option to set a db for NodeBB, defaults to redis db0
2013-10-03 16:48:44 -07:00
Julian Lam
d583122c64 Merge pull request #378 from iamcardinal/master
FIxes Search and touches on postbox, closes #370
2013-10-03 16:38:05 -07:00
Peter Peterson
3968877b1e Merge branch 'master' of github.com:ipetepete/NodeBB 2013-10-03 13:02:57 -07:00
Peter Peterson
46f03de9f6 Added ability to set redis db to use, defaults to db0 2013-10-03 13:00:30 -07:00
Julian Lam
0e18ec022c not running init() if there is no init method in each template script 2013-10-03 15:51:48 -04:00
Julian Lam
64117ab613 removing deprecated bootstrap css file from admin header 2013-10-03 15:07:30 -04:00
Julian Lam
038e04dee6 revamped client side scripts so that they are loaded using Require.js instead. 2013-10-03 15:04:25 -04:00
Julian Lam
b49c7b8609 added user-scalable=no to header meta tag (in lieu of fastclick lib)
closes #376 - reopen if necessary.
2013-10-03 11:47:40 -04:00
Julian Lam
948949c571 closed #375 - now asking socket.io to connect to "current page" instead of hardcoded url, removed api_url and "socket" section from public config 2013-10-03 11:34:15 -04:00
Julian Lam
f173a79a0d Merge pull request #371 from iamcardinal/master
Adds meta:keywords tags fixes tabbing, closes #330
2013-10-02 16:10:43 -07:00
Quinton Marchi
994791add6 Touches on postbox
Adds border-radius. Compatible with: Firefox, Webkit-based, and IE9+.
2013-10-02 17:48:27 -04:00
Quinton Marchi
d177e71b46 Fixes double search, closes #370
Haven't tested it but I can't see any problems.
2013-10-02 14:31:41 -04:00
Quinton Marchi
fcab1501f8 Merge remote-tracking branch 'origin/testing-2013-10-01' 2013-10-02 14:23:25 -04:00
Quinton Marchi
eb022220f4 Final Edit for keywords 2013-10-02 14:22:56 -04:00
Andrew Darqui
f48687528e fixed up logger.tpl a little. Added a basic 'collision detection' for the loggerPath and loggeIOPath filenames. 2013-10-02 01:28:37 -04:00
Andrew Darqui
9007f9de9e added socket.io logging which can be dynamically enabled/disabled via the /admin/logger panel 2013-10-02 01:15:45 -04:00
Andrew Darqui
55d84d0f9b basic logger functionality added - accessible via http://nodebb/admin/logger 2013-10-02 00:25:46 -04:00
Minami
90b4d688f8 Testing adding of Meta Tags 2013-10-01 22:14:16 -05:00
Andrew Darqui
aacd42f4bc ignore vim .swp files from git 2013-10-01 22:38:33 -04:00
Andrew Darqui
51d7dda5a7 added basic logger using config.json 2013-10-01 22:38:13 -04:00
Baris Soner Usakli
1c32acf7b6 removed WITHSCORES from getLatestTopics, how was this working at all? 2013-10-01 14:17:24 -04:00
psychobunny
22c73f3c12 closes #345 2013-10-01 12:08:05 -04:00
Julian Lam
9613ea9018 reverted change where post title was sanitized on saving (which didn't
seem to work), now sanitizing post title on output
2013-10-01 11:54:00 -04:00
Julian Lam
3d4802ac68 Merge remote-tracking branch 'origin' 2013-10-01 11:18:06 -04:00
Julian Lam
59c9bdb3a5 updated contributor list 2013-10-01 11:17:57 -04:00
Julian Lam
d7953eb779 updated screenshots for v0.0.7 2013-09-30 17:22:39 -04:00
Julian Lam
48a7c48f7b 0.0.7 2013-09-30 17:05:28 -04:00
Julian Lam
7a919fbac4 dropping down to 0.0.6 for re-release 2013-09-30 17:05:22 -04:00
Julian Lam
181220621e fixed issue with server crashing on post 2013-09-30 17:01:39 -04:00
Julian Lam
249c45dfe2 0.0.7 2013-09-30 16:30:11 -04:00
Julian Lam
b19d84f1a7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-30 16:28:50 -04:00
Julian Lam
865edb70c2 added meta description to topics, closes #362 2013-09-30 16:28:37 -04:00
Baris Usakli
e78369f0fa use User.isAdmin instead 2013-09-30 16:24:00 -04:00
Baris Usakli
d40a6a5c3f added adminitstrator value to userData for admin users page 2013-09-30 16:19:20 -04:00
Baris Usakli
cb7768d095 cant ban yourself 2013-09-30 16:04:54 -04:00
Baris Usakli
4290516d29 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-30 16:03:06 -04:00
Baris Usakli
6a7a2301ee removed admin and delete buttons from template 2013-09-30 16:03:00 -04:00
Julian Lam
9a79c58e33 closed #361 - groups admin modal had an extra button that did nothing 2013-09-30 16:02:38 -04:00
Julian Lam
4c39c1ec30 fixed issue with install script erroring out if redis host is not defined 2013-09-30 15:52:10 -04:00
psychobunny
571cb8b44f readded back admin css for users 2013-09-30 15:31:29 -04:00
Baris Usakli
4207792ffd added app alert if template data cant be loaded 2013-09-30 15:12:14 -04:00
Quinton Marchi
f5c4f98834 Merge pull request #1 from designcreateplay/master
Merge changes into repo for edit
2013-09-30 11:42:16 -07:00
Baris Usakli
9f67282a79 admin site will display reconnecting notification when server is offline closes #346 2013-09-30 13:04:03 -04:00
Julian Lam
ee71c1cf0d Merge branch 'iamcardinal-merge' 2013-09-30 11:23:41 -04:00
Julian Lam
06f2284bcd added output to show bound address on instance start 2013-09-30 11:23:11 -04:00
Julian Lam
8cbe79655a emptying Meta.config on init (Just to be safe) 2013-09-30 11:18:02 -04:00
Julian Lam
a4c1d733b7 fixed issue where setOnEmpty would fail in install.js as Meta.config was
not defined (as it had not been initted yet)
2013-09-30 11:17:12 -04:00
Julian Lam
839649d42f Merge branch 'master' of https://github.com/iamcardinal/NodeBB-enhancement into iamcardinal-merge 2013-09-30 11:12:38 -04:00
Quinton Marchi
504e2aac4a Adds: regex for ports, mini for public/src/forum
+ Regular expression for port during install
+ Minification for public/src/forum JS files
+ Minification for public/src/forum/admin JS files
2013-09-30 02:42:34 -04:00
Minami
eafb41602c Edited to simplify install
Removed the two steps and made it default to 0.0.0.0, edited the
webserver.js to reflect the changes.
2013-09-29 21:03:29 -05:00
Baris Soner Usakli
2dcc4172c4 closes #357 2013-09-29 21:29:43 -04:00
Baris Soner Usakli
f96a711298 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-29 21:03:19 -04:00
Baris Soner Usakli
ad28b9b339 fixed crash in meta 2013-09-29 21:03:16 -04:00
Julian Lam
8dd8536f6b closes #317 - hitting discard on a post with content will now throw a
bootbox confirmation modal
2013-09-29 20:38:45 -04:00
Julian Lam
7bf5b2ec57 changed fireHook to be error-first, closes #319 2013-09-29 20:33:35 -04:00
Julian Lam
aa731aa894 Merge branch 'middleware_refactor' 2013-09-29 20:28:50 -04:00
Julian Lam
c58cb257dc closes #349 - loading middlewares using async instead of crazy
middleware-stack modifying shenanigans
2013-09-29 20:27:52 -04:00
Baris Soner Usakli
06f59cf853 closes #310 2013-09-29 15:08:00 -04:00
Baris Soner Usakli
83b4b5434f fixed username button title 2013-09-29 14:27:31 -04:00
Baris Soner Usakli
9de5214a2f closes #353 2013-09-29 14:18:43 -04:00
Julian Lam
f08067bab2 fixes #356 - issue where accessing a NodeBB using a different machine name
from one that it was set up with causing template data to not load, as it
was being accessed via absolute url, instead of relative url
2013-09-29 13:47:27 -04:00
Julian Lam
1160f39cb0 revamped reconnection notification, closes #354 2013-09-28 22:05:10 -04:00
Julian Lam
d633ecd160 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-28 17:45:27 -04:00
Julian Lam
4cea313060 updated getPostsByPids method to resolve premature return issue, and
refactored it to use async.map instead of eachSeries
2013-09-28 17:44:18 -04:00
Baris Soner Usakli
9b7f8076eb removed console.log 2013-09-28 16:18:55 -04:00
Quinton Marchi
571259f241 Adds hostname support, fixes #343
Works from previous testing but I haven't tried this personal revision
of the code. Take it with a grain of salt.
2013-09-28 03:55:06 -04:00
psychobunny
607ee8bbc1 added outgoing.less, fixed modern.less theme, fixed #316 2013-09-27 13:11:01 -04:00
psychobunny
36d2f74887 fixed unread category view 2013-09-27 12:59:36 -04:00
Julian Lam
cdaf409a99 monkey-patching getPostsByPids so that it returns ISOString instead of relativeTime 2013-09-27 11:53:25 -04:00
Julian Lam
fba487d8a2 removing extra comma in package.json 2013-09-27 11:48:01 -04:00
Julian Lam
3ab7306199 linting, minor bugfix, moving hiredis to optional deps 2013-09-27 11:47:16 -04:00
Julian Lam
2e4e94d5f8 Merge branch 'redis-optimizations' of https://github.com/adarqui/NodeBB into adarqui-redis-optimizations 2013-09-27 11:44:40 -04:00
Baris Usakli
3348ed3524 fixed email key 2013-09-26 13:56:36 -04:00
Baris Usakli
942a21b4be fixed email meta changes 2013-09-26 13:31:38 -04:00
Baris Usakli
9c14618d55 dont redirect back to reset password after login 2013-09-26 12:50:24 -04:00
Baris Usakli
7d50551392 remove throw in email send 2013-09-26 12:29:35 -04:00
Baris Usakli
f2c1a92513 closes #215 2013-09-25 13:08:11 -04:00
Baris Usakli
fe6595cd2a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-25 12:30:17 -04:00
Baris Usakli
c2aac916aa fixed topics not appearing after a post in category view 2013-09-25 12:30:07 -04:00
psychobunny
e161b5387b fixed untranslated language on dynamic new posts and infinite loading 2013-09-25 12:16:06 -04:00
Baris Usakli
585e5cd88f closes #341 2013-09-25 12:11:32 -04:00
psychobunny
1637ffc5dc re-adding teaser 2013-09-25 11:40:05 -04:00
psychobunny
a28797ee03 fix for recent view teasers 2013-09-25 11:26:28 -04:00
Julian Lam
49e28f9d1e fixing bug where outgoing links didn't actually let you leave... oops! 2013-09-25 11:25:48 -04:00
Baris Usakli
4a7cd664fd fixed a bug in template parsing 2013-09-24 16:46:45 -04:00
Baris Usakli
253e11d55b cleaned up websockets.js 2013-09-24 16:02:14 -04:00
Baris Usakli
eb1c1c78d4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-24 15:59:51 -04:00
Baris Usakli
0b0d64b52e logout/login changes, updateHeader changes 2013-09-24 15:59:08 -04:00
Julian Lam
1ae51ef5ea redis export function (commented out for now) 2013-09-24 15:36:17 -04:00
psychobunny
de1e3230f5 fixed topics and admin views, broken after merge 2013-09-24 15:23:16 -04:00
psychobunny
1fbc038e64 fixed conflicts, added new language key for users/online 2013-09-24 15:15:39 -04:00
psychobunny
cd63dd429b finalizing todo's before merging 2013-09-24 14:59:13 -04:00
Baris Usakli
fbfdf561fc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-24 14:57:01 -04:00
Baris Usakli
83d5a84edd login redirects back 2013-09-24 14:56:51 -04:00
psychobunny
5abf02c6d1 default language, en 2013-09-24 14:55:46 -04:00
psychobunny
b8037845d6 registration.tpl; translator variable system 2013-09-24 14:50:38 -04:00
Julian Lam
c80e2552b2 express-namespaceing routes 2013-09-24 14:18:41 -04:00
psychobunny
1a1fea535b header language 2013-09-24 14:17:36 -04:00
psychobunny
5c7da4b686 fixed serverside templating; footer, logout internationalization; updated more global lang keys 2013-09-24 14:14:26 -04:00
Julian Lam
b6ee89a6d8 fixed typo in plugins page 2013-09-24 14:12:26 -04:00
psychobunny
2d8e6bd980 category language 2013-09-24 13:31:44 -04:00
Julian Lam
a173d61464 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 13:31:10 -04:00
Baris Usakli
8f04a136c8 fixed whitespace 2013-09-24 13:31:02 -04:00
Julian Lam
b7675e1ec7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 13:30:59 -04:00
Julian Lam
964fbfe2bb fixes to get nodebb to at least load on IE 2013-09-24 13:30:54 -04:00
Baris Usakli
8fb8956c0d closes #331 2013-09-24 13:30:09 -04:00
psychobunny
c11920ac08 internationalization: 404 and 403 2013-09-24 13:22:10 -04:00
Baris Usakli
9a4eb26246 closes #332 2013-09-24 13:06:14 -04:00
Julian Lam
0d9958afe7 HOTFIX for scripts 2013-09-24 13:01:18 -04:00
Julian Lam
d6dd74b50a removed extra debug log 2013-09-24 12:34:54 -04:00
Julian Lam
d5437ca8fa Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-24 12:34:17 -04:00
Julian Lam
14720057c2 serving unminified libraries in development mode, minified otherwise 2013-09-24 12:33:51 -04:00
Baris Usakli
170ed8cc01 fixed conflict 2013-09-24 12:31:28 -04:00
Baris Usakli
25576eb35a closes #329 2013-09-24 12:29:51 -04:00
Julian Lam
66cb1fb6ad removed console.log from socket connection success handler 2013-09-24 11:02:06 -04:00
Julian Lam
bcc65fd879 closed #328 2013-09-24 08:38:19 -04:00
Julian Lam
99440585e6 Merge branch 'master' into optimize-22-09-2013
Conflicts:
	package.json
2013-09-23 20:04:09 -04:00
Baris Usakli
290d69d14a remember where the topic was left off 2013-09-23 17:41:54 -04:00
Baris Usakli
4fce06677f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-23 16:49:11 -04:00
Baris Usakli
f53cd8b5b6 category view fix 2013-09-23 16:49:01 -04:00
Julian Lam
da59f47624 adding missing files 2013-09-23 15:46:40 -04:00
Julian Lam
521586f08f Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-23 15:45:23 -04:00
Julian Lam
f39a7ada7c skipping minification if the minFile is already up-to-date - issue #322 2013-09-23 15:45:03 -04:00
Baris Usakli
bae9f46d8b small fixes to search 2013-09-23 15:31:52 -04:00
Julian Lam
d7ea24e218 issue #322 - minifying css file and added jquery to minified compilation 2013-09-23 15:27:46 -04:00
Julian Lam
e621d7e601 closed #322 - autominifying client-side assets on load 2013-09-23 15:21:34 -04:00
Baris Usakli
aa6eff4c54 one more itme 2013-09-23 14:58:06 -04:00
Baris Usakli
f36583e676 possible fix for users/online duplication 2013-09-23 14:55:34 -04:00
Baris Usakli
0a0a91d4b2 remove listener 2013-09-23 14:51:59 -04:00
Baris Usakli
6c70f9e308 only collapse header if its expanded 2013-09-23 14:51:16 -04:00
Baris Usakli
b25c3d8b67 closes #324 2013-09-23 14:40:31 -04:00
Baris Usakli
bade99d069 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-23 13:43:25 -04:00
Baris Usakli
776b51fef7 closes #323 2013-09-23 13:43:15 -04:00
Julian Lam
da2d014f00 added IRC link to wiki 2013-09-23 12:55:21 -04:00
Julian Lam
7fdf83089d linting 2013-09-23 12:50:27 -04:00
Julian Lam
043aafd7b7 closed #315 2013-09-22 20:40:10 -04:00
Julian Lam
3254979568 re: #321, removed cheerio dep from package.json 2013-09-22 15:28:22 -04:00
Julian Lam
6fd202fe36 closed #321, removed cheerio use altogether, and made changes to the
client side to ajaxify the user to /outgoing when an external link is
clicked
2013-09-22 15:27:10 -04:00
Julian Lam
5f00f1e18e renamed "toHTML" method to "parse" 2013-09-22 13:54:21 -04:00
Julian Lam
c940ce3329 camelCased get_latest_undeleted_pid method 2013-09-22 13:33:05 -04:00
Julian Lam
2366e2b209 refactored get_latest_undeleted_pid to not blindly call getPostsByTid in
order to determine post deletion. (issue #320)
2013-09-22 13:28:10 -04:00
Julian Lam
2b7fd3c9d1 interim commit 2013-09-22 12:55:03 -04:00
Andrew Darqui
d3e37d1716 slight variable name changes & remove unused var from getPostsByPids, removed underscore dependency 2013-09-22 00:36:56 -04:00
Andrew Darqui
d2b858c997 slight variable name changes & remove unused var from getPostsByPids, removed underscore dependency 2013-09-22 00:36:40 -04:00
Baris Soner Usakli
de34c7580f closes #314 2013-09-22 00:29:31 -04:00
Baris Soner Usakli
bcb492751c closes #313, also fixed progressbar 2013-09-22 00:01:31 -04:00
adarqui
e26cc79819 redis multi pipeline used for getPostsByPids 2013-09-21 22:47:27 -04:00
adarqui
98cb2d4c17 a little logic to allow nodebb to use a unix domain socket rather than tcp/ip. unix dom sock has less overhead/latency. 2013-09-21 15:42:54 -04:00
adarqui
2fc569715c hiredis & underscore packages 2013-09-21 15:26:52 -04:00
Julian Lam
3eb594df43 fixing timestamps in category view (topics listing) for noscript 2013-09-20 20:48:14 -04:00
Julian Lam
8243019a60 closed #312 2013-09-20 20:43:02 -04:00
psychobunny
5a10f7fcfe init variables in translator 2013-09-20 17:31:53 -04:00
psychobunny
5e89caf358 internationalization: topic.json 2013-09-20 17:16:01 -04:00
psychobunny
35b40ef650 internationalization: unread.tpl 2013-09-20 17:03:30 -04:00
psychobunny
56b7d6cb7c internationalization: users 2013-09-20 17:00:33 -04:00
psychobunny
8b8a890ac9 removed unnecessary warning message to anonymous users attempting to unfavourite posts 2013-09-20 16:57:25 -04:00
psychobunny
5645bcee2d topic.json en lang; tested serverside internationalization in favourites; fixed some keys in login 2013-09-20 16:43:50 -04:00
psychobunny
a631707db4 app.js + todo 2013-09-20 16:02:25 -04:00
psychobunny
451ffafb9e finished initial client side & server side language parsing methods; integrated preloading into ajaxify and server app.js 2013-09-20 16:01:52 -04:00
psychobunny
b5274a0d91 init 2013-09-20 14:35:32 -04:00
Baris Soner Usakli
db4dc03abc added timeago to unread page 2013-09-19 20:49:52 -04:00
Baris Soner Usakli
6be5bcc4c8 closes #308 2013-09-19 20:43:56 -04:00
Baris Usakli
21efda4a84 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-19 16:40:11 -04:00
Baris Usakli
082375f129 link fade outs 2013-09-19 16:40:02 -04:00
Julian Lam
1204859263 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-19 16:38:20 -04:00
Julian Lam
c8b5d1561e minor CSS fixes to post timeago text in topic view 2013-09-19 16:38:04 -04:00
Baris Usakli
6912e77d25 removed data-pid from buttons 2013-09-19 16:25:51 -04:00
Baris Usakli
d84d096e7e added post links 2013-09-19 16:24:30 -04:00
Baris Usakli
29c17fd32e fixed user infinite loading 2013-09-19 15:50:28 -04:00
Baris Usakli
d721320af5 added jquery.timeago.js 2013-09-19 15:10:03 -04:00
Baris Usakli
efef9c864c closes #306 2013-09-19 15:02:35 -04:00
Baris Usakli
27cb837b08 closes #303 2013-09-19 12:29:25 -04:00
psychobunny
047fcbe63f style revert for cerulean 2013-09-18 17:06:32 -04:00
psychobunny
dbe0b1551b creating a separate theme for my metro ui shenanigans, follow up revert on cerulean incoming 2013-09-18 17:02:26 -04:00
psychobunny
8f7b047b7a fixed padding in category-box 2013-09-18 16:58:12 -04:00
psychobunny
a38ace0df9 moved metro slide animation out of vanilla into cerulean, and rejigged the home page a bit 2013-09-18 16:56:34 -04:00
psychobunny
0b0b06e8b9 fixed users.tpl from fail merge earlier 2013-09-18 16:31:02 -04:00
psychobunny
f83b61903a screwing around with animations in cerulean; started modernui look and feel 2013-09-18 16:25:32 -04:00
Julian Lam
881fa41bb7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-18 16:25:23 -04:00
Baris Usakli
f9442db96f closes #284 2013-09-18 16:23:08 -04:00
Julian Lam
64521494ce removed outdated socket.io client libs (socket.io package adds these routes anyway) 2013-09-18 16:22:35 -04:00
Julian Lam
e75e3399ab added link to upgrade instructions 2013-09-18 16:06:51 -04:00
Baris Usakli
e5ef498164 merged users.tpl 2013-09-18 16:05:01 -04:00
Baris Usakli
24e4be77d8 closes #304 2013-09-18 16:01:54 -04:00
psychobunny
0d55f2ef32 cerulean: switched to lucida grande / tahoma 2013-09-18 14:47:38 -04:00
psychobunny
8ec3371139 cerulean theme: new users view 2013-09-18 12:45:31 -04:00
Julian Lam
ccca4d2914 fixed issue where meta was called before nconf loaded 2013-09-18 12:15:29 -04:00
psychobunny
28704a6164 hinting 2013-09-18 10:50:02 -04:00
psychobunny
cf4ba9d1d3 format/jshint favourites.js 2013-09-18 10:44:54 -04:00
Julian Lam
c69e30c146 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-18 07:23:50 -04:00
psychobunny
fd32d75d3b jshinted categories.js 2013-09-17 15:54:08 -04:00
psychobunny
afa228fd91 jshint: temporarily setting unused flag to false, low priority right now compared to the rest of our issues 2013-09-17 15:49:07 -04:00
psychobunny
a01a7ae5fc fixed following.tpl and followers.tpl layout (broken from BS3 merge) 2013-09-17 15:46:22 -04:00
psychobunny
64b071f277 nconf and redis wrapper no longer global objects. jshinted app.js. updated sockets.io to latest 2013-09-17 15:38:57 -04:00
Julian Lam
af246ad0d7 Merge remote-tracking branch 'origin' 2013-09-17 15:14:15 -04:00
Julian Lam
56a87329ec removing extra line 2013-09-17 15:14:11 -04:00
Baris Usakli
eddddc694d closes #302 2013-09-17 14:37:01 -04:00
Baris Usakli
ce61138351 fixed conflicts 2013-09-17 13:42:07 -04:00
Baris Usakli
564662ee00 closes #294 2013-09-17 13:37:03 -04:00
psychobunny
678db837fd refactored post-block 2013-09-17 13:29:45 -04:00
psychobunny
c789f4230d formatted app.js, updated jshintrc to include node 2013-09-17 13:15:36 -04:00
psychobunny
1b9e451a6f formatting - server side admin 2013-09-17 13:10:58 -04:00
psychobunny
1780b343b4 formatting - routes 2013-09-17 13:10:14 -04:00
psychobunny
aea3181d27 formatting - server side core 2013-09-17 13:09:37 -04:00
psychobunny
c44461e33f formatting - template js admin side 2013-09-17 13:07:30 -04:00
psychobunny
221b9bc149 formatting - template associated js 2013-09-17 13:05:54 -04:00
psychobunny
dc41c6bc0d formatting - core client side 2013-09-17 13:04:40 -04:00
psychobunny
828d937dec .jsbeautify 2013-09-17 13:03:53 -04:00
psychobunny
cf889cfe25 .jshintrc, massive dehinting adventure to follow 2013-09-17 12:59:04 -04:00
psychobunny
6bab2523d5 fixes #276 popup alert appearing under admin content 2013-09-17 12:55:20 -04:00
psychobunny
d714b5c592 editorconfig end_of_line 2013-09-17 12:54:03 -04:00
psychobunny
08316496cd fixes #289 recent page not responsive 2013-09-16 13:53:11 -04:00
psychobunny
d5fd985f0d applied previous commit to default theme instead 2013-09-16 13:50:14 -04:00
psychobunny
eab7839195 fixes #298 footer flash onload 2013-09-16 13:48:32 -04:00
Julian Lam
18717dd6f5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-15 20:52:05 -04:00
Julian Lam
d249f411f8 closed #300 - issue where web socket connections were not working properly
with passworded redis instances
2013-09-15 20:51:36 -04:00
psychobunny
b85e2545d6 fixes #299 2013-09-15 16:32:30 -04:00
Julian Lam
79280b195e changed get_uid_by_userslug to be error-first 2013-09-15 10:15:23 -04:00
Julian Lam
4a18728e19 closed #297 2013-09-15 10:11:29 -04:00
Julian Lam
b7498416fa fixing redisstore sessions with passworded redis stores 2013-09-15 09:23:48 -04:00
Julian Lam
49b201db0f added heroku support for dynamic port reading via process.env 2013-09-15 09:09:44 -04:00
Julian Lam
be4d6761b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-15 07:58:07 -04:00
Julian Lam
c01ba1a3cb closed #296 2013-09-15 07:58:02 -04:00
Baris Soner Usakli
af59ff3209 closes #286, closes #287 2013-09-14 22:28:50 -04:00
Baris Soner Usakli
b0a37c6ac5 closes #293 2013-09-14 22:04:03 -04:00
Julian Lam
8b3fd9d1e9 fixed bug where deleted threads caused thread tools to disappear (js
error)
2013-09-14 11:44:06 -04:00
Julian Lam
95b16690e0 altering api route to use next() instead of echoing 404... 2013-09-14 11:01:28 -04:00
Julian Lam
f6b865a052 closed #292 2013-09-14 10:58:50 -04:00
Julian Lam
d1c756306a updates to allow dynamic addition of static directories provided by plugins 2013-09-13 11:10:17 -04:00
Julian Lam
ad5af8e123 updated screenshots for 0.0.6 2013-09-12 17:15:14 -04:00
psychobunny
ba89285c74 editorconfig; whitespace from favourites 2013-09-12 14:19:46 -04:00
psychobunny
43c0c2ec2a fix for favouriting 2013-09-12 14:16:13 -04:00
psychobunny
a277104ad5 dehinted favourites.js 2013-09-12 14:13:00 -04:00
psychobunny
84afffc761 categories.js jshinted 2013-09-12 14:07:29 -04:00
Julian Lam
5e5680fd13 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-12 13:55:45 -04:00
Julian Lam
727da38fb6 fixing issue where upgrade path only applies db fixes to default redis host and port 2013-09-12 13:55:38 -04:00
Baris Soner Usakli
79096cfdce online count fix for anon users 2013-09-12 13:10:14 -04:00
Baris Soner Usakli
a848f82b8f fix for upgrade script 2013-09-12 12:44:18 -04:00
Julian Lam
71bdd4608b removed defunct installation routes 2013-09-12 12:38:46 -04:00
Julian Lam
f04a948152 Merge pull request #282 from vincentbriglia/master
User search in non-admin removes search header/input
2013-09-12 09:17:33 -07:00
Vincent Briglia
15be3e52ae Merge remote-tracking branch 'upstream/master' 2013-09-12 16:05:43 +00:00
Vincent Briglia
b1003e954e user search shouldn't replace the whole top-level userbox 2013-09-12 16:04:04 +00:00
Julian Lam
f2b9a7ff0c Merge pull request #279 from vincentbriglia/master
isEmailAvailable returns inverted value
2013-09-12 06:39:53 -07:00
Vincent Briglia
19ad9ab224 inverted value required, double exclamation mark just casts as boolean 2013-09-12 13:37:03 +00:00
Vincent Briglia
8eae8a4fb5 !undefined = true
!!undefined = false
!!!undefined = true

!false = true
!!false = false
!!!false = true

!true = false
!!true = true
!!!true = false

when using isEmailAvailable (positive) in correlation with exists (positive) make sure that the outcome is a positive return (and not an inverted)
2013-09-12 13:07:00 +00:00
Baris Usakli
85fbe38e71 fixed to icon selection in admin/categories 2013-09-11 16:44:40 -04:00
Baris Usakli
e896fd1fd6 show created category right away 2013-09-11 16:20:00 -04:00
Baris Usakli
916150de01 closes #228 2013-09-11 16:04:34 -04:00
Julian Lam
732204f11b Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-11 15:41:48 -04:00
Julian Lam
1df50ff855 updated topic viewing so that markAsRead marks any relevant notifications read (issue #219) 2013-09-11 15:41:20 -04:00
psychobunny
11042858b8 Merge pull request #277 from designcreateplay/theme/cerulean
theme/cerulean
2013-09-11 12:31:00 -07:00
Baris Usakli
89ca2319f5 removed console.log 2013-09-11 15:28:20 -04:00
psychobunny
2f4fd310bd moved everything into the header class 2013-09-11 15:27:46 -04:00
Baris Usakli
6d7919ad85 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-11 15:24:15 -04:00
Baris Usakli
59467c906d misc fixes 2013-09-11 15:24:01 -04:00
psychobunny
def871ac89 fixed overlapping text in topic text-title 2013-09-11 15:21:23 -04:00
psychobunny
6fe5a93a73 header updates 2013-09-11 15:08:08 -04:00
psychobunny
7796c9269c cleaned up unread.tpl 2013-09-11 14:57:59 -04:00
psychobunny
ec150d4a4c removed unnecessary markup from users 2013-09-11 14:53:31 -04:00
psychobunny
49abff1609 moved footer style into cerulean 2013-09-11 14:49:31 -04:00
psychobunny
be59c16aad updated footer to follow standards 2013-09-11 14:47:58 -04:00
Julian Lam
f1144f3a7e Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-11 14:41:30 -04:00
Julian Lam
9ebff816dc fixing error where sometimes the admin panel js was not loaded 2013-09-11 14:41:08 -04:00
psychobunny
4c3eacd745 fixed footer markup 2013-09-11 14:37:43 -04:00
Baris Usakli
325e402d0f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-11 13:53:51 -04:00
Baris Usakli
251587cb86 return err form updateProfile 2013-09-11 13:53:42 -04:00
Julian Lam
9fb1f8acf8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-11 13:49:46 -04:00
Julian Lam
cffbc76da1 closed #275, refactored configs to use new method "list", which returns error first 2013-09-11 13:49:17 -04:00
Baris Usakli
be51025048 the online count on the footer uses the websockets now, it should also instantly update when people come online or go offline, #273 2013-09-11 13:24:16 -04:00
Baris Usakli
ae6f9fc87c changed notifications to use relative path 2013-09-11 13:04:04 -04:00
Baris Usakli
e61a7bff65 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-11 13:03:12 -04:00
Baris Usakli
bb14881b63 change getUserData to return err 2013-09-11 13:02:55 -04:00
Julian Lam
a7f1bfa7c9 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-11 12:55:34 -04:00
Julian Lam
7b3384a6be fixing some bad logic in app starting 2013-09-11 12:55:29 -04:00
Baris Usakli
efa8717fc5 getMultipleUserFields returns err now 2013-09-11 12:49:54 -04:00
psychobunny
9e42cee87c modules/taskbar.less, more cleanup of style 2013-09-11 12:34:56 -04:00
psychobunny
9fe30b905b modules.less, moved postWindow out. clean up unused css in style 2013-09-11 12:24:10 -04:00
Julian Lam
2fc9afa4f4 updated default category descriptions 2013-09-11 11:22:22 -04:00
psychobunny
732c8b1f7f header, footer,.. started cleaning up style (the big 'un) 2013-09-10 17:12:07 -04:00
psychobunny
19be3bc55c serious clean up of topic.less 2013-09-10 16:36:47 -04:00
Julian Lam
8a7e2577aa Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-10 16:26:38 -04:00
Julian Lam
e32494879c closed #270 2013-09-10 16:26:26 -04:00
psychobunny
ac4803961a topic cleanup and begin cerulean port 2013-09-10 15:50:21 -04:00
psychobunny
de8d6d3c8c category, removing deprecated thread-rating 2013-09-10 15:13:59 -04:00
psychobunny
392b80fe14 home.less 2013-09-10 15:10:51 -04:00
psychobunny
9fa75a8b45 init - cerulean theme 2013-09-10 15:02:03 -04:00
psychobunny
b19097ab8f moved .less files into the vanilla theme folder 2013-09-10 14:23:46 -04:00
psychobunny
31624b32e9 footer no longer overlaps composer; fixes 272 2013-09-10 13:16:10 -04:00
Julian Lam
b8b6558f53 deleting and restoring posts and topics now update the corresponding RSS feeds
fixed #257
2013-09-10 12:34:48 -04:00
Julian Lam
a53e75aeaa closed #271 2013-09-10 11:25:19 -04:00
Baris Usakli
7798004568 fixed active_users not deleting over 10 2013-09-09 16:27:16 -04:00
Baris Usakli
63873575a5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-09 15:09:15 -04:00
Baris Usakli
9845df4d1b another fix to path in image upload 2013-09-09 15:09:05 -04:00
psychobunny
462d5f5d05 spacing between pin/lock icons in cat view 2013-09-09 14:34:39 -04:00
psychobunny
1d860923d0 booleanifying the isAdmin return... now we're admins again! :) 2013-09-09 14:31:22 -04:00
Baris Usakli
c9a3fac654 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-09 14:29:50 -04:00
Baris Usakli
a1c9685b49 fixed image upload, delete temp file if there is error 2013-09-09 14:29:40 -04:00
psychobunny
c16c4aac44 console.log 2013-09-09 14:17:11 -04:00
psychobunny
e80ff9c551 moved RSS icon away from the sharing buttons (category view); added back RSS icon to topic view. closes #259 2013-09-09 14:08:30 -04:00
psychobunny
3176ccc6e3 fixed footer flickering 2013-09-09 14:00:11 -04:00
Baris Usakli
b24196be36 closes #269 2013-09-09 13:37:50 -04:00
Baris Soner Usakli
52365a9755 upgrade user checks for undefined data 2013-09-07 19:12:49 -04:00
Julian Lam
41bea9f50c adding upgradeAdmin method to upgrade script -- pending fix to upgradeUsers 2013-09-07 19:01:17 -04:00
Julian Lam
3416c7bb3c Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-07 15:49:35 -04:00
Julian Lam
ce126b11fb fixes to administrator methods 2013-09-07 15:49:23 -04:00
Baris Soner Usakli
99db8fc3fe fixed admin/users page events and buttons 2013-09-07 15:48:38 -04:00
Julian Lam
780cec2596 missing alert-warning class in plugins admin page 2013-09-07 11:55:35 -04:00
Julian Lam
d3b4cb71c0 resolved race condition in plugin auto-enabling (not much of a race... I'd
always lose!!)
2013-09-07 11:53:55 -04:00
Julian Lam
1758c3e3f2 fix for admin templates 2013-09-07 11:51:37 -04:00
Julian Lam
995fa7d6fd interim commit -- enabling default plugins on setup 2013-09-07 11:45:04 -04:00
Julian Lam
87abe426d8 fixing 'use_port' to save into config as boolean 2013-09-07 11:29:26 -04:00
Julian Lam
bec0b46a2c refactoring installation scripts to use node prompt module, lots of other fixes
fixed #263, fixed #264, fixed #265
2013-09-07 10:40:20 -04:00
Baris Soner Usakli
a88ddc2a4d fixed image upload 2013-09-05 14:12:39 -04:00
Baris Soner Usakli
1f60578a63 closes #261 2013-09-05 12:18:51 -04:00
psychobunny
2f70489e22 outgoing links still BS2, fixed. 2013-09-05 23:55:57 +08:00
psychobunny
3b75734672 footer.less, added stats cards (ala soundsz) and replaced old footer 2013-09-05 23:28:15 +08:00
Julian Lam
ff4b35d6f1 minor bug with feed posttime if it was never edited 2013-09-04 14:16:11 -04:00
Julian Lam
e5b26fdad0 removing node-rss dep 2013-09-04 14:08:24 -04:00
Julian Lam
bcbcf40eae Merge branch 'feed_refactor' 2013-09-04 13:54:44 -04:00
Julian Lam
661fdfb43e bugfixing and allowing feeds to be generated on request (as opposed to just updated on posting 2013-09-04 13:52:28 -04:00
Julian Lam
31f08c49e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-04 13:36:33 -04:00
Julian Lam
2999d61ac9 minor fix... turning plugin libraries array into object 2013-09-04 13:36:25 -04:00
Baris Usakli
ca72a4b0fc fixed comma to semicolon 2013-09-04 12:13:36 -04:00
Julian Lam
164977972e totally derped commit 2013-09-03 23:42:26 -04:00
Julian Lam
b6fbfcc814 interim commit for new feed refactor 2013-09-03 23:18:25 -04:00
Julian Lam
418700ce3f changing info to warn when config file not found 2013-09-03 22:21:56 -04:00
Julian Lam
1d52557562 removing hook ordering message from non-development runs 2013-09-03 22:03:04 -04:00
psychobunny
45e24c54ce pagination scroll block fix + cleanup 2013-09-04 06:01:23 +08:00
psychobunny
abd909d23b pagination - scroll to top / bottom arrows 2013-09-04 04:50:51 +08:00
Julian Lam
f39932ece7 group join leave, and updating 2013-09-03 16:05:01 -04:00
Julian Lam
03fb649274 Merge branch 'master' into user_groups 2013-09-03 14:09:18 -04:00
Julian Lam
54e9e95076 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-03 13:20:49 -04:00
Julian Lam
201fb4d73e fixed #256 - where saving and retrieval of RSS feeds wasn't working on some instances due to a relative path being passed to read/writeFile 2013-09-03 13:20:19 -04:00
Baris Usakli
e0cc35ba66 creating topics shows up in user profile too issue #220 2013-09-03 13:19:51 -04:00
Baris Usakli
d3818e888e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-03 13:11:44 -04:00
Baris Usakli
a2af4a3e91 closes #220 2013-09-03 13:11:34 -04:00
Julian Lam
02a02fa64c updated getTopicWithPosts to use a start and end option, and fixed issue with RSS feed saving (issue #256) 2013-09-03 13:11:21 -04:00
Julian Lam
9fae0d2505 removing dupe main post from posts array in topic noscript 2013-09-03 12:36:48 -04:00
Julian Lam
e23198bbcc Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-03 12:21:53 -04:00
Julian Lam
0a8c43901d more fixes to noscript 2013-09-03 12:21:48 -04:00
Baris Usakli
e9054301d1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-03 12:18:38 -04:00
Baris Usakli
caaede7e84 added loading spinner to topic.tpl 2013-09-03 12:18:26 -04:00
Julian Lam
3ed9e1dd51 closed #253, closed #252 2013-09-03 12:17:55 -04:00
Julian Lam
207eccc505 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-03 11:48:39 -04:00
Julian Lam
45d5524df7 fixing minor errors in css in composer 2013-09-03 11:48:34 -04:00
Baris Usakli
1f08e407d1 closes #248 2013-09-03 11:45:15 -04:00
Baris Usakli
2c215afe33 closes #249 2013-09-03 11:29:56 -04:00
Julian Lam
d1d2b03dfd Merge branch 'master' into user_groups 2013-09-03 11:06:22 -04:00
Julian Lam
c1a41c6605 added hook priority to plugin hook registration 2013-09-02 21:53:15 -04:00
Julian Lam
d1a17b39ea allowing npm update of socket.io to newer version 2013-09-02 17:14:56 -04:00
Julian Lam
bf365bedfd pushing fix to issue where htmlfile transport for socket.io was causing
NodeBB to not work at all
2013-09-02 17:00:33 -04:00
Julian Lam
6a1ab47a08 hardcoding the exclusion of 'htmlfile' from web sockets, since it seems to
cause NodeBB to fail
2013-09-02 16:53:15 -04:00
Julian Lam
5fdaa6b0ee Merge branch 'master' into user_groups 2013-09-01 23:19:29 -04:00
Julian Lam
a6b0c2638a user list on group edit modal 2013-09-01 23:19:16 -04:00
Julian Lam
a671d08f0b updated readme - nginx not required 2013-09-01 19:17:40 -04:00
Julian Lam
5e869a5e5c Merge branch 'master' into user_groups 2013-09-01 16:14:24 -04:00
Julian Lam
0e6109ff2b a better conditional, just to please baris 2013-09-01 16:01:15 -04:00
Julian Lam
0bff6ee504 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-01 15:27:51 -04:00
Julian Lam
7cbe429be9 fixing issue with plugins trying to load 0 plugins and crashing 2013-09-01 15:27:45 -04:00
Baris Soner Usakli
09b578522f added prefic to less middleware 2013-09-01 15:21:28 -04:00
psychobunny
40897d0be6 themed reset.tpl and reset_code.tpl to BS3, closes #239 2013-08-31 03:46:48 +08:00
Baris Usakli
f49bc088fc Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-30 15:08:12 -04:00
Baris Usakli
7795a9ead2 fixed a crash 2013-08-30 15:07:58 -04:00
psychobunny
2c238f49e0 added search button, hiding the form by default. also fixes issue #241
notes: mobile needs a dedicated notification screen, imo, rather than
using the same popup. and /search needs a form on the page itself.
2013-08-31 02:59:50 +08:00
Baris Usakli
599789634a closes #227 2013-08-30 14:47:31 -04:00
Baris Usakli
77359f7b83 added space between user name and colon 2013-08-30 14:27:54 -04:00
Baris Usakli
7cff55a160 closes #209 2013-08-30 14:25:59 -04:00
Julian Lam
8d26eb4e07 minor stuff and such 2013-08-30 13:32:44 -04:00
Baris Usakli
ad5e3ebce3 closes #236 2013-08-30 12:36:06 -04:00
Baris Usakli
2deb0e1708 closes #238 2013-08-30 12:04:35 -04:00
Baris Usakli
b2f383f095 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-30 11:47:37 -04:00
Baris Usakli
22ababd87a closes #240 2013-08-30 11:47:26 -04:00
Julian Lam
167c1fa348 fixing topic CSS so the h3 styles only apply to the topic title 2013-08-30 11:43:46 -04:00
Baris Usakli
3b1bf67436 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-30 11:40:32 -04:00
Baris Usakli
d2eb73df96 can add and remove images from posts 2013-08-30 11:40:20 -04:00
Julian Lam
4d075efcd3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-30 11:19:06 -04:00
Julian Lam
8a53c56a46 updated install script to only populate "socket" object in client config with "address", which takes "use_port" into account.
This closes #234
2013-08-30 11:18:15 -04:00
Julian Lam
73d4152d1d updated readme to add nginx version requirement 2013-08-30 11:07:44 -04:00
Julian Lam
c0a90bd677 interim commit 2013-08-30 07:43:47 -04:00
Baris Soner Usakli
106157a951 removed commented out line 2013-08-29 21:19:35 -04:00
Baris Soner Usakli
ab9cf6d036 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-29 21:18:34 -04:00
Baris Soner Usakli
54ba6efc93 can edit and add an image to a post, still cant remove previously added images #issue #233 2013-08-29 21:18:23 -04:00
Julian Lam
85ac4aac94 group creation and deletion 2013-08-29 14:55:30 -04:00
Baris Usakli
691b6611d0 user search uses reds now 2013-08-29 13:40:04 -04:00
Baris Usakli
1b33b4425b removed active from pill, #issue 231 2013-08-29 11:49:53 -04:00
Baris Usakli
41defbcf9c added delays to home page animations 2013-08-29 11:41:27 -04:00
Baris Soner Usakli
928594fc7c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-28 22:08:54 -04:00
Baris Soner Usakli
cc1f668308 changed chat online offline messages 2013-08-28 22:08:46 -04:00
Julian Lam
f2b8813fb9 brain dumped groups lib 2013-08-28 22:06:55 -04:00
Julian Lam
5ed7c31278 removing console logs 2013-08-28 21:35:00 -04:00
Julian Lam
13b456bffd fixing up bs3 integration for themes page 2013-08-28 21:33:17 -04:00
Julian Lam
938dee481b Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-28 21:30:22 -04:00
Baris Soner Usakli
a69140faa9 show error message on failed login 2013-08-28 17:22:48 -04:00
psychobunny
6a5ebdb1ef fixed edit/delete/favourite buttons not working on subposts / topics 2013-08-29 05:06:22 +08:00
Julian Lam
ece4d083a5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-28 16:33:09 -04:00
Julian Lam
96688a8ffe changing method to retrieve themes to use /node_modules 2013-08-28 16:32:59 -04:00
Baris Soner Usakli
e9b0aa537f center speech arrow 2013-08-28 16:32:45 -04:00
psychobunny
4052c3e817 Merge pull request #226 from designcreateplay/bootstrap3
Bootstrap3
2013-08-28 13:20:23 -07:00
psychobunny
4a6e838b18 updated new settings markup to bs3 2013-08-29 04:15:45 +08:00
psychobunny
3773f6b44f merge conflicts + updated search.tpl to BS3 2013-08-29 04:12:36 +08:00
psychobunny
a19e836d63 fixed taskbar, tabs were stacking vertically instead of horizontally 2013-08-29 04:03:36 +08:00
psychobunny
aa5e5f9cc0 fixed bootbox3 issue in categories 2013-08-29 04:00:43 +08:00
psychobunny
6647e75c77 updated bootbox to BS3 2013-08-29 03:45:15 +08:00
psychobunny
f85a514ee3 fixed a bug in ACP where you could accidentally delete or ban a user even if you clicked on cancel. 2013-08-29 03:43:14 +08:00
psychobunny
619dd84d81 help block text in picture uploader 2013-08-29 03:26:00 +08:00
psychobunny
f9fdfab19e accountedit.tpl -> modal updates for picture selector and uploader 2013-08-29 03:23:45 +08:00
psychobunny
ca46d0f8e1 fixed disconnect modal; fixed modal overlay BS3 issue 2013-08-29 03:14:43 +08:00
psychobunny
bb8f75b4be merged.. conflicted up the ass. registration looks gud again 2013-08-29 03:01:58 +08:00
Baris Soner Usakli
0db599a478 closes #205 2013-08-28 14:46:18 -04:00
Baris Soner Usakli
902e60fab2 added password settings to admin 2013-08-28 13:53:20 -04:00
Baris Soner Usakli
87f48e2cc9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-28 13:48:05 -04:00
Baris Soner Usakli
cc55073107 issue #224 2013-08-28 13:47:52 -04:00
Julian Lam
96c43b4607 fixed #221 - issue where replies would not automatically refresh a post after editing 2013-08-28 12:29:15 -04:00
Julian Lam
f1b4367168 closed #180, closed #223 2013-08-28 11:00:34 -04:00
Julian Lam
4416f8530d matching connect-redis session with cookie ttl 2013-08-28 10:18:17 -04:00
Baris Soner Usakli
4e48ab2363 changed max age to milliseconds 2013-08-27 23:40:38 -04:00
psychobunny
b5a26696f8 fixed the chat modal 2013-08-28 04:36:14 +08:00
psychobunny
4307229ae0 added profile link and chat button fn to both user dropdowns 2013-08-28 04:09:53 +08:00
psychobunny
b681f01be9 fixed profile link in topic user dropdown menu 2013-08-28 03:56:34 +08:00
Baris Usakli
c262027728 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 15:55:48 -04:00
Baris Usakli
6a08fedf18 closes #210 2013-08-27 15:55:44 -04:00
psychobunny
e471b4edf5 category + recent replies layout rejigged 2013-08-28 03:43:05 +08:00
psychobunny
dd86812822 some BS2 buttons managed to escape my grasp.. until now. 2013-08-28 03:11:08 +08:00
psychobunny
ac311ab75d fixed derpy profile image size in /search 2013-08-28 03:08:05 +08:00
psychobunny
c9387313e2 ACP header and all admin pages BS3'd 2013-08-28 03:04:57 +08:00
Julian Lam
97641dbcda fixing teasers, that I broke in the last commit 2013-08-27 15:00:35 -04:00
Julian Lam
54fdbcd947 fixing broken category 2013-08-27 14:57:21 -04:00
psychobunny
7636e09284 admin hero-unit to jumbotron and updated welcome message to be slightly less embarassing 2013-08-28 02:35:07 +08:00
psychobunny
7666ed3010 fixed two bugs in admin, meta.buildTitle errors out because no notification icon is present; pagination element missing
& final less cleanup for today
2013-08-28 02:32:38 +08:00
psychobunny
e82a9ec37a more less cleanup 2013-08-28 02:25:17 +08:00
psychobunny
770d9e5b7c removed mobile menu markup + css, more cleanup 2013-08-28 02:19:59 +08:00
Julian Lam
5f0e0c993e adding localhost as default for email server 2013-08-27 14:16:56 -04:00
psychobunny
7be69b0b54 more cleanup, account.less, removed mobile sidebar functionality completely 2013-08-28 02:11:13 +08:00
psychobunny
251beb7f9b updated less to use .pointer mixin 2013-08-28 02:05:50 +08:00
Baris Usakli
1c27cbd90a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 14:04:25 -04:00
Baris Usakli
4b4b26651a derp 2013-08-27 14:04:22 -04:00
Julian Lam
1a6ba8c230 fixed derpiness I introduced last commit 2013-08-27 14:04:09 -04:00
psychobunny
06904506d4 header.less, got rid of some unused css classes related to the original post window 2013-08-28 02:02:35 +08:00
psychobunny
62a28825f8 more css cleanup 2013-08-28 02:00:10 +08:00
psychobunny
c6c693acd2 some cleanup of topics.less 2013-08-28 01:58:56 +08:00
Julian Lam
8d04454457 closed #218 2013-08-27 13:52:30 -04:00
Baris Usakli
aeb831eeff closes #217 2013-08-27 13:47:19 -04:00
psychobunny
67db78ad66 styled topic's user dropdown 2013-08-28 01:44:41 +08:00
psychobunny
06809ab5fc got rid of a lot of junk markup and unused css classes; standardized the pulling of pid/uid across post.js code 2013-08-28 01:41:32 +08:00
Baris Usakli
08ba911738 closes #216 2013-08-27 13:38:09 -04:00
Baris Usakli
59f4b6788a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 13:32:54 -04:00
Baris Usakli
a317a4d689 closes #206 2013-08-27 13:32:43 -04:00
psychobunny
6e164e61aa removed some unnecessary CSS 2013-08-28 01:30:43 +08:00
psychobunny
2098bf84a1 finished pagination for topic view 2013-08-28 01:23:19 +08:00
Julian Lam
860a83ba90 closed #212 2013-08-27 13:04:18 -04:00
Julian Lam
abce5fd120 refactored postTools.toHTML to fire post.parse hook, and removed auto-markdowning
closed #214
2013-08-27 12:50:15 -04:00
Julian Lam
0243e9c5be issue #214, preparing for addition of post.parse hook by renaming markdownToHTML to just "toHTML", and making it asynchronous. 2013-08-27 12:14:27 -04:00
Baris Usakli
8a4a0154f6 closes #211, closes #213 2013-08-27 12:10:23 -04:00
psychobunny
469a5221ed added postcount to topics return; started scrollspy behaviour for "postid / postcount" in topics. 2013-08-27 06:36:49 +08:00
psychobunny
f251b9c6c5 Merge branch 'master' into bootstrap3 2013-08-27 06:03:05 +08:00
Baris Usakli
c4228be86c bold active section in account page 2013-08-26 17:50:31 -04:00
psychobunny
94e565aa00 account pages done; 403; 404 2013-08-27 05:42:09 +08:00
psychobunny
cc6e028b1d fixed alert-notify (and blanks) to alert-warning 2013-08-27 05:16:49 +08:00
Julian Lam
d4d4c3cc92 0.0.6 2013-08-26 17:13:14 -04:00
psychobunny
33a69abece mark all as read button was unstyled 2013-08-27 05:11:39 +08:00
Julian Lam
3a12ba177a possibly fixing issue #202 again 2013-08-26 17:10:41 -04:00
psychobunny
6a4947533f fixed BS3 issue, navbar now centered; fixed topic view sub-post moderator tools layout 2013-08-27 05:07:52 +08:00
Julian Lam
28e1538fdb issue #203 2013-08-26 16:54:15 -04:00
psychobunny
879a31f51e had to remove hidden-xs from the footer - BS3's !important takes precedence over the fading animation and looks ugly (flex) 2013-08-27 04:51:29 +08:00
Julian Lam
eed66c099b fixing double notif error on new notif 2013-08-26 16:42:29 -04:00
psychobunny
49fc87e295 removed unnecessary css definitions (previous fixes for BS2), and fixed category width on mobile screens 2013-08-27 04:42:04 +08:00
Julian Lam
ece2edf579 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-26 16:37:37 -04:00
Julian Lam
1961f01cab possibly fixing issue #203 2013-08-26 16:37:22 -04:00
psychobunny
fe89f1f096 added a .hidden-mobile class for inline block elements. also removed button text on jumbotron for mobile devices 2013-08-27 04:37:16 +08:00
psychobunny
346681ba27 removed mobile menu until it can be pluginified. refactored topics UX a hell of a lot, looks much better on both desktop+mobile now. 2013-08-27 04:30:00 +08:00
Baris Usakli
4a214b6ef0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 16:04:37 -04:00
Baris Usakli
dda429ab5d unread count shows total 2013-08-26 16:04:31 -04:00
Julian Lam
15feaafd68 attempting fix for #179, @barisusakli can you pull and test if this is still present? 2013-08-26 15:20:06 -04:00
Julian Lam
14e7907e06 closed #201 2013-08-26 14:56:00 -04:00
Baris Usakli
b4b483b35a removed console.log 2013-08-26 13:21:14 -04:00
Baris Usakli
79c9bdba7f removed console.log 2013-08-26 13:20:10 -04:00
Baris Usakli
a6837a7869 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 13:18:29 -04:00
Baris Usakli
0a485a7ff6 closes #109 2013-08-26 13:18:20 -04:00
Julian Lam
bca1602474 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-26 12:24:16 -04:00
Julian Lam
96ee0a2017 closed #184 2013-08-26 12:22:55 -04:00
Baris Usakli
25550e18d0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 11:59:02 -04:00
Baris Usakli
154d0160bc closes #200 2013-08-26 11:58:52 -04:00
Julian Lam
aefa56221b closed #202 2013-08-26 11:56:28 -04:00
Baris Soner Usakli
dd40cbc139 check if topicData is valid 2013-08-24 18:51:24 -04:00
Baris Soner Usakli
23db2e5c9e better fix for #198 2013-08-24 18:47:10 -04:00
Baris Soner Usakli
eff1b174c0 closes #198 2013-08-24 18:43:06 -04:00
Baris Soner Usakli
545069b069 closes #199 2013-08-24 18:19:01 -04:00
psychobunny
13e13cd5a8 some changes to topic view + BS3 upgrade 2013-08-24 04:34:13 +08:00
Julian Lam
f767535ce5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-23 16:25:22 -04:00
Julian Lam
aeebd069e2 fixing nconf issue where redis js was requiring redis configs before they were defined 2013-08-23 16:25:16 -04:00
psychobunny
0f8aad52b2 updated all alert-error to alert-danger (wtf did BS3 need to change that?) 2013-08-24 03:36:44 +08:00
psychobunny
b6a5cbf956 trim whitespace mode on 2013-08-24 03:30:34 +08:00
Julian Lam
d2aa2a9a29 derpiness 2013-08-23 15:22:26 -04:00
psychobunny
a482d4db5f fixed /recent, /unread 2013-08-24 03:10:15 +08:00
Julian Lam
d7eb30ccbd fuck git pt 2 2013-08-23 14:57:33 -04:00
Julian Lam
9bc12f28b4 fuck git 2013-08-23 14:55:25 -04:00
Julian Lam
4d11fba20a auto-focusing input on login screen 2013-08-23 14:30:58 -04:00
psychobunny
df15dceaef merging master to pull baris' latest fixes 2013-08-24 01:59:35 +08:00
Baris Usakli
cb6f587f24 closes #197 2013-08-23 13:45:57 -04:00
psychobunny
9f2e192993 jumbotron updates. I'll come back to fixing the button layout on mobile later 2013-08-24 01:27:12 +08:00
Baris Usakli
c647793512 meta config changes, refactors 2013-08-23 13:14:36 -04:00
psychobunny
d62f36c6a0 now /users looks as it should. made some tweaks to user search to improve UX as well 2013-08-24 01:11:50 +08:00
psychobunny
2427724868 navbar changes + logout screen + replaced hardcoded sitename on logout screen with breadcrumbs
note: perhaps breadcrumbs should be dynamically created in future
instead of copypasted everywhere.
2013-08-24 00:50:16 +08:00
psychobunny
9b35d8f8e1 migrating the rest of row-fluids to row 2013-08-24 00:44:27 +08:00
psychobunny
a859f4524c container-fluid to container 2013-08-24 00:43:38 +08:00
psychobunny
8be896aebb label-important to label-danger 2013-08-24 00:43:03 +08:00
psychobunny
a008cf971d register and login -> BS3 2013-08-24 00:38:40 +08:00
Julian Lam
caa057ff4d Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-22 14:42:13 -04:00
Julian Lam
43152bdaf9 closed #194 - refactoring of post creation so that, normalizing post
objects

also fixes julianlam/nodebb-plugin-mentions#1
2013-08-22 14:40:28 -04:00
Baris Soner Usakli
4cdb7ff32b closes #192 2013-08-22 13:47:07 -04:00
Julian Lam
7cbb01a78a making RDB available to plugins without require 2013-08-22 11:42:49 -04:00
Julian Lam
555eddff83 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-22 10:48:28 -04:00
Julian Lam
a3cab53b73 added username mentions plugin to default, and tweaked admin panel to show
plugins installed via npm
2013-08-22 10:47:24 -04:00
Baris Soner Usakli
454d5827fd overflow hidden on users recent posts 2013-08-22 10:18:17 -04:00
Baris Soner Usakli
186c426691 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-22 10:14:15 -04:00
Baris Soner Usakli
5e1e1ecf6f moved refreshTitle into load_template callback 2013-08-22 10:14:07 -04:00
Julian Lam
2d3d0f688a a couple minor 'tweaks' to the plugin system so that it works with npm installed plugins 2013-08-22 09:50:29 -04:00
Julian Lam
7975844e4d renamed two hooks and added filter:post.get hook 2013-08-21 22:40:47 -04:00
Baris Soner Usakli
f2b138510e removed console.log 2013-08-21 19:58:45 -04:00
Baris Soner Usakli
1c95ef4060 fix for infinite scroll crashing, issue #187 2013-08-21 19:57:11 -04:00
Baris Soner Usakli
b43e12a42a closes #187, closes #190 2013-08-21 19:21:49 -04:00
psychobunny
316077fffb category view starting to look like it should 2013-08-22 05:04:58 +08:00
psychobunny
4373037071 fixed composer window having 0 width; recent replies looks gud again 2013-08-22 04:05:48 +08:00
psychobunny
24e81c873c small user img-thumbnails changed to img-rounded 2013-08-22 03:55:31 +08:00
psychobunny
9e4a3905a0 moved most span12 and span9 over to BS3; img-polaroid to img-thumbnail 2013-08-22 03:39:43 +08:00
psychobunny
b54b4a6580 breadcrumbs don't need a container element anymore 2013-08-22 03:28:27 +08:00
psychobunny
f33a9c3941 updated hidden/visible device flags to BS3 2013-08-22 03:25:17 +08:00
psychobunny
d792798963 breadcrumbs 2013-08-22 03:22:33 +08:00
psychobunny
e5af4f6299 BS3 source files, damn you windows github 2013-08-22 03:18:03 +08:00
psychobunny
ef5bd9dc61 moved home categories into its own less file 2013-08-22 03:17:52 +08:00
psychobunny
8834feac65 BS3 sourcefiles + modified category row to new format. now mobile has two columns of categories, looks much neater. 2013-08-22 03:13:49 +08:00
psychobunny
2f70dd732d BS3 basic integration; btn-large to btn-lg (inc FA); navbar fixed 2013-08-22 02:57:18 +08:00
Baris Soner Usakli
3f793ae902 changed document.body.offsetHeight to .height() 2013-08-21 14:33:05 -04:00
Baris Soner Usakli
ac56f3a30a change document.body.scrollTop to .scrollTop() 2013-08-21 13:17:16 -04:00
psychobunny
e2ffac74bc added css classes to hide/show elements based on logged in status; hid unread category to anonymous users
added some general classes .nodebb-loggedin and .nodebb-loggedout for
toggling display based on user status
2013-08-22 00:40:37 +08:00
psychobunny
1c08ca54c5 added subtle glowing css animation to unread notification icon 2013-08-22 00:22:05 +08:00
psychobunny
f1547a7b1f added badge to header for unread topics count 2013-08-22 00:08:11 +08:00
psychobunny
746fa93c80 added API call for total unread topics; moved unread notification parsing to client side
also fixed a bug where the new notification icon glow would disappear on
page refresh even if there were existing notifications.
2013-08-21 23:34:35 +08:00
psychobunny
5ab1758d28 simple toaster popup on new notification 2013-08-21 23:08:51 +08:00
Julian Lam
2e4e1df3d9 closed #186 - infinite scroller not working in firefox 2013-08-20 22:36:46 -04:00
psychobunny
eded61d66e typo 2013-08-21 03:40:23 +08:00
psychobunny
d9360da9a5 default motd: removed version number and button text on mobile layouts 2013-08-21 03:37:48 +08:00
Baris Usakli
2b7a1b7515 changed the recursion to load posts to a while loop 2013-08-20 12:31:08 -04:00
Baris Usakli
1e66116e1d closes #181 2013-08-20 12:11:17 -04:00
Baris Soner Usakli
a95582b382 closes #183, closes #182 2013-08-20 00:50:59 -04:00
Baris Soner Usakli
7860cfdec3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-20 00:26:58 -04:00
Baris Soner Usakli
30bbea9c74 closes #175 2013-08-20 00:26:50 -04:00
Baris Usakli
481105d6be reverted that back, it would take other users to the topic too 2013-08-19 14:54:11 -04:00
Baris Usakli
f939a632a6 take to topic after creation 2013-08-19 14:43:37 -04:00
Baris Usakli
c05f56d28c fix for category view when its empty 2013-08-19 14:28:51 -04:00
Baris Usakli
b844251587 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-19 14:03:31 -04:00
Baris Usakli
b9bd907a6b speech bubbles 2013-08-19 14:03:20 -04:00
psychobunny
17d86a2a35 force vertical scrollbar to prevent centering jumps during navigation 2013-08-20 01:50:19 +08:00
Baris Usakli
c70c67394a closes #171 2013-08-19 13:31:04 -04:00
Baris Usakli
92d3559146 closes #176 2013-08-19 11:56:40 -04:00
Baris Usakli
0e9a3c3a9f hide load more button if not topics are left 2013-08-19 11:02:31 -04:00
Baris Usakli
41263f0332 closes #178 2013-08-19 10:58:02 -04:00
Julian Lam
3747427538 updated readme to remove indiegogo info, and to add 0.0.5 screenshots 2013-08-19 10:13:18 -04:00
Baris Soner Usakli
b65554ca15 removed console.log 2013-08-16 17:04:41 -04:00
Baris Soner Usakli
00cb15d3c8 check if there is follow element 2013-08-16 17:04:08 -04:00
Baris Soner Usakli
6690f49c4e added profile views to users, little cleanup to use app.addCommasToNumbers 2013-08-16 13:03:56 -04:00
Baris Soner Usakli
ff805a704d closes #175 2013-08-15 17:03:43 -04:00
Baris Soner Usakli
f83be710a0 closes #172, #173, #174 2013-08-15 16:50:00 -04:00
Julian Lam
3933549659 committing fixes to composer window 2013-08-15 14:04:12 -04:00
Julian Lam
4993b74c23 Merge remote-tracking branch 'origin' 2013-08-15 11:40:53 -04:00
Julian Lam
76e7a98c88 style fixes to image-drop list in composer window 2013-08-15 11:40:41 -04:00
Baris Soner Usakli
999e98e43d add label to banned users, dont hide their posts 2013-08-14 17:42:36 -04:00
Baris Usakli
74af205426 banned users cant login, show error messages on failed logins 2013-08-14 15:49:56 -04:00
Baris Usakli
9ad82f4907 dont filter banned when searching if user is admin 2013-08-14 14:26:09 -04:00
Baris Usakli
2e6b37e018 wrapped search form in li 2013-08-14 13:56:06 -04:00
Baris Usakli
67070e335e removed console.log 2013-08-14 13:44:18 -04:00
Baris Usakli
22536e694c fixes wrong topics getting loaded into wrong categories 2013-08-14 13:43:42 -04:00
Baris Usakli
929282a2f7 ban users, closes #125, banning a user hides all posts topics of a user and their profile page becomes inaccessible 2013-08-14 13:32:07 -04:00
Baris Soner Usakli
b0092b68c6 closes #166 2013-08-13 17:29:16 -04:00
Baris Usakli
91446378bd require winston 2013-08-13 16:02:21 -04:00
Baris Usakli
dceec0ce46 more winston, issue #62 2013-08-13 16:00:24 -04:00
Baris Usakli
1856e394f3 more winston 2013-08-13 15:25:40 -04:00
Baris Usakli
8dc7a0dbbf changed favouriting to wait for socket call to end before changing star class 2013-08-13 15:05:35 -04:00
Baris Usakli
6e17ff7981 added winston, added wrapper for winston.error until they fix it, issue #62 2013-08-13 14:45:28 -04:00
777 changed files with 48939 additions and 31959 deletions

4
.editorconfig Normal file
View File

@@ -0,0 +1,4 @@
root = true
[*.js, *.css, *.tpl]
indent_style = tab

26
.gitignore vendored
View File

@@ -1,15 +1,27 @@
#################
## npm
#################
npm-debug.log
node_modules/
sftp-config.json
config.json
public/src/nodebb.min.js
public/config.json
public/css/*.css
public/themes/*
*.sublime-project
*.sublime-workspace
plugins/*
.project
.project
.idea
*.swp
Vagrantfile
.vagrant
provision.sh
*.komodoproject
.DS_Store
feeds/recent.rss
# winston?
error.log
events.log
pidfile
# templates
/public/templates

17
.jsbeautifyrc Normal file
View File

@@ -0,0 +1,17 @@
{
"indent_size": 4,
"indent_char": " ",
"indent_level": 0,
"indent_with_tabs": true,
"preserve_newlines": true,
"max_preserve_newlines": 10,
"jslint_happy": true,
"brace_style": "collapse",
"keep_array_indentation": false,
"keep_function_indentation": false,
"space_before_conditional": true,
"break_chained_methods": false,
"eval_code": false,
"unescape_strings": false,
"wrap_line_length": 0
}

86
.jshintrc Normal file
View File

@@ -0,0 +1,86 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details
"maxerr" : 50, // {int} Maximum error before stopping
// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 4, // {int} Number of spaces to use for indentation
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : false, // true: Require all defined variables be used TODO: Set this to true, update codebase.
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"trailing" : false, // true: Prohibit trailing whitespaces
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements"
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function
// Environments
"browser" : true, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jquery" : true, // jQuery
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"rhino" : false, // Rhino
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface
// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules
// Custom Globals
"globals" : {} // additional predefined global variables
}

12
.travis.yml Normal file
View File

@@ -0,0 +1,12 @@
services:
- redis-server
before_install:
- npm i --production
- node app --setup="{\"base_url\":\"http://127.0.0.1\",\"port\":4567,\"use_port\":false,\"secret\":\"abcdef\",\"bind_address\":\"0.0.0.0\",\"database\":\"redis\",\"redis:host\":\"127.0.0.1\",\"redis:port\":6379,\"redis:password\":\"\",\"redis:database\":0,\"admin:username\":\"admin\",\"admin:email\":\"test@example.org\",\"admin:password\":\"abcdef\",\"admin:password:confirm\":\"abcdef\"}" --ci="{\"host\":\"127.0.0.1\",\"port\":6379,\"database\":0}"
language: node_js
node_js:
- "0.11"
- "0.10"
branches:
only:
- master

440
.tx/config Normal file
View File

@@ -0,0 +1,440 @@
[main]
host = https://www.transifex.com
[nodebb.category]
file_filter = public/language/<lang>/category.json
source_file = public/language/en_GB/category.json
source_lang = en_GB
trans.ar = public/language/ar/category.json
trans.cs = public/language/cs/category.json
trans.de = public/language/de/category.json
trans.en@pirate = public/language/en@pirate/category.json
trans.es = public/language/es/category.json
trans.et = public/language/et/category.json
trans.fa_IR = public/language/fa_IR/category.json
trans.fi = public/language/fi/category.json
trans.fr = public/language/fr/category.json
trans.he = public/language/he/category.json
trans.hu = public/language/hu/category.json
trans.it = public/language/it/category.json
trans.nb = public/language/nb/category.json
trans.nl = public/language/nl/category.json
trans.pl = public/language/pl/category.json
trans.pt_BR = public/language/pt_BR/category.json
trans.ru = public/language/ru/category.json
trans.sc = public/language/sc/category.json
trans.sk = public/language/sk/category.json
trans.sv = public/language/sv/category.json
trans.th = public/language/th/category.json
trans.tr = public/language/tr/category.json
trans.zh_CN = public/language/zh_CN/category.json
trans.zh_TW = public/language/zh_TW/category.json
type = KEYVALUEJSON
[nodebb.login]
file_filter = public/language/<lang>/login.json
source_file = public/language/en_GB/login.json
source_lang = en_GB
trans.ar = public/language/ar/login.json
trans.cs = public/language/cs/login.json
trans.de = public/language/de/login.json
trans.en@pirate = public/language/en@pirate/login.json
trans.es = public/language/es/login.json
trans.et = public/language/et/login.json
trans.fa_IR = public/language/fa_IR/login.json
trans.fi = public/language/fi/login.json
trans.fr = public/language/fr/login.json
trans.he = public/language/he/login.json
trans.hu = public/language/hu/login.json
trans.it = public/language/it/login.json
trans.nb = public/language/nb/login.json
trans.nl = public/language/nl/login.json
trans.pl = public/language/pl/login.json
trans.pt_BR = public/language/pt_BR/login.json
trans.ru = public/language/ru/login.json
trans.sc = public/language/sc/login.json
trans.sk = public/language/sk/login.json
trans.sv = public/language/sv/login.json
trans.th = public/language/th/login.json
trans.tr = public/language/tr/login.json
trans.zh_CN = public/language/zh_CN/login.json
trans.zh_TW = public/language/zh_TW/login.json
type = KEYVALUEJSON
[nodebb.recent]
source_file = public/language/en_GB/recent.json
source_lang = en_GB
trans.ar = public/language/ar/recent.json
trans.cs = public/language/cs/recent.json
trans.de = public/language/de/recent.json
trans.en@pirate = public/language/en@pirate/recent.json
trans.es = public/language/es/recent.json
trans.et = public/language/et/recent.json
trans.fa_IR = public/language/fa_IR/recent.json
trans.fi = public/language/fi/recent.json
trans.fr = public/language/fr/recent.json
trans.he = public/language/he/recent.json
trans.hu = public/language/hu/recent.json
trans.it = public/language/it/recent.json
trans.nb = public/language/nb/recent.json
trans.nl = public/language/nl/recent.json
trans.pl = public/language/pl/recent.json
trans.pt_BR = public/language/pt_BR/recent.json
trans.ru = public/language/ru/recent.json
trans.sc = public/language/sc/recent.json
trans.sk = public/language/sk/recent.json
trans.sv = public/language/sv/recent.json
trans.th = public/language/th/recent.json
trans.tr = public/language/tr/recent.json
trans.zh_CN = public/language/zh_CN/recent.json
trans.zh_TW = public/language/zh_TW/recent.json
type = KEYVALUEJSON
[nodebb.unread]
source_file = public/language/en_GB/unread.json
source_lang = en_GB
trans.ar = public/language/ar/unread.json
trans.cs = public/language/cs/unread.json
trans.de = public/language/de/unread.json
trans.en@pirate = public/language/en@pirate/unread.json
trans.es = public/language/es/unread.json
trans.et = public/language/et/unread.json
trans.fa_IR = public/language/fa_IR/unread.json
trans.fi = public/language/fi/unread.json
trans.fr = public/language/fr/unread.json
trans.he = public/language/he/unread.json
trans.hu = public/language/hu/unread.json
trans.it = public/language/it/unread.json
trans.nb = public/language/nb/unread.json
trans.nl = public/language/nl/unread.json
trans.pl = public/language/pl/unread.json
trans.pt_BR = public/language/pt_BR/unread.json
trans.ru = public/language/ru/unread.json
trans.sc = public/language/sc/unread.json
trans.sk = public/language/sk/unread.json
trans.sv = public/language/sv/unread.json
trans.th = public/language/th/unread.json
trans.tr = public/language/tr/unread.json
trans.zh_CN = public/language/zh_CN/unread.json
trans.zh_TW = public/language/zh_TW/unread.json
type = KEYVALUEJSON
[nodebb.footer]
source_file = public/language/en_GB/footer.json
source_lang = en_GB
trans.ar = public/language/ar/footer.json
trans.cs = public/language/cs/footer.json
trans.de = public/language/de/footer.json
trans.en@pirate = public/language/en@pirate/footer.json
trans.es = public/language/es/footer.json
trans.et = public/language/et/footer.json
trans.fa_IR = public/language/fa_IR/footer.json
trans.fi = public/language/fi/footer.json
trans.fr = public/language/fr/footer.json
trans.he = public/language/he/footer.json
trans.hu = public/language/hu/footer.json
trans.it = public/language/it/footer.json
trans.nb = public/language/nb/footer.json
trans.nl = public/language/nl/footer.json
trans.pl = public/language/pl/footer.json
trans.pt_BR = public/language/pt_BR/footer.json
trans.ru = public/language/ru/footer.json
trans.sc = public/language/sc/footer.json
trans.sk = public/language/sk/footer.json
trans.sv = public/language/sv/footer.json
trans.th = public/language/th/footer.json
trans.tr = public/language/tr/footer.json
trans.zh_CN = public/language/zh_CN/footer.json
trans.zh_TW = public/language/zh_TW/footer.json
type = KEYVALUEJSON
[nodebb.modules]
source_file = public/language/en_GB/modules.json
source_lang = en_GB
trans.ar = public/language/ar/modules.json
trans.cs = public/language/cs/modules.json
trans.de = public/language/de/modules.json
trans.en@pirate = public/language/en@pirate/modules.json
trans.es = public/language/es/modules.json
trans.et = public/language/et/modules.json
trans.fa_IR = public/language/fa_IR/modules.json
trans.fi = public/language/fi/modules.json
trans.fr = public/language/fr/modules.json
trans.he = public/language/he/modules.json
trans.hu = public/language/hu/modules.json
trans.it = public/language/it/modules.json
trans.nb = public/language/nb/modules.json
trans.nl = public/language/nl/modules.json
trans.pl = public/language/pl/modules.json
trans.pt_BR = public/language/pt_BR/modules.json
trans.ru = public/language/ru/modules.json
trans.sc = public/language/sc/modules.json
trans.sk = public/language/sk/modules.json
trans.sv = public/language/sv/modules.json
trans.th = public/language/th/modules.json
trans.tr = public/language/tr/modules.json
trans.zh_CN = public/language/zh_CN/modules.json
trans.zh_TW = public/language/zh_TW/modules.json
type = KEYVALUEJSON
[nodebb.register]
source_file = public/language/en_GB/register.json
source_lang = en_GB
trans.ar = public/language/ar/register.json
trans.cs = public/language/cs/register.json
trans.de = public/language/de/register.json
trans.en@pirate = public/language/en@pirate/register.json
trans.es = public/language/es/register.json
trans.et = public/language/et/register.json
trans.fa_IR = public/language/fa_IR/register.json
trans.fi = public/language/fi/register.json
trans.fr = public/language/fr/register.json
trans.he = public/language/he/register.json
trans.hu = public/language/hu/register.json
trans.it = public/language/it/register.json
trans.nb = public/language/nb/register.json
trans.nl = public/language/nl/register.json
trans.pl = public/language/pl/register.json
trans.pt_BR = public/language/pt_BR/register.json
trans.ru = public/language/ru/register.json
trans.sc = public/language/sc/register.json
trans.sk = public/language/sk/register.json
trans.sv = public/language/sv/register.json
trans.th = public/language/th/register.json
trans.tr = public/language/tr/register.json
trans.zh_CN = public/language/zh_CN/register.json
trans.zh_TW = public/language/zh_TW/register.json
type = KEYVALUEJSON
[nodebb.user]
source_file = public/language/en_GB/user.json
source_lang = en_GB
trans.ar = public/language/ar/user.json
trans.cs = public/language/cs/user.json
trans.de = public/language/de/user.json
trans.en@pirate = public/language/en@pirate/user.json
trans.es = public/language/es/user.json
trans.et = public/language/et/user.json
trans.fa_IR = public/language/fa_IR/user.json
trans.fi = public/language/fi/user.json
trans.fr = public/language/fr/user.json
trans.he = public/language/he/user.json
trans.hu = public/language/hu/user.json
trans.it = public/language/it/user.json
trans.nb = public/language/nb/user.json
trans.nl = public/language/nl/user.json
trans.pl = public/language/pl/user.json
trans.pt_BR = public/language/pt_BR/user.json
trans.ru = public/language/ru/user.json
trans.sc = public/language/sc/user.json
trans.sk = public/language/sk/user.json
trans.sv = public/language/sv/user.json
trans.th = public/language/th/user.json
trans.tr = public/language/tr/user.json
trans.zh_CN = public/language/zh_CN/user.json
trans.zh_TW = public/language/zh_TW/user.json
type = KEYVALUEJSON
[nodebb.global]
source_file = public/language/en_GB/global.json
source_lang = en_GB
trans.ar = public/language/ar/global.json
trans.cs = public/language/cs/global.json
trans.de = public/language/de/global.json
trans.en@pirate = public/language/en@pirate/global.json
trans.es = public/language/es/global.json
trans.et = public/language/et/global.json
trans.fa_IR = public/language/fa_IR/global.json
trans.fi = public/language/fi/global.json
trans.fr = public/language/fr/global.json
trans.he = public/language/he/global.json
trans.hu = public/language/hu/global.json
trans.it = public/language/it/global.json
trans.nb = public/language/nb/global.json
trans.nl = public/language/nl/global.json
trans.pl = public/language/pl/global.json
trans.pt_BR = public/language/pt_BR/global.json
trans.ru = public/language/ru/global.json
trans.sc = public/language/sc/global.json
trans.sk = public/language/sk/global.json
trans.sv = public/language/sv/global.json
trans.th = public/language/th/global.json
trans.tr = public/language/tr/global.json
trans.zh_CN = public/language/zh_CN/global.json
trans.zh_TW = public/language/zh_TW/global.json
type = KEYVALUEJSON
[nodebb.notifications]
source_file = public/language/en_GB/notifications.json
source_lang = en_GB
trans.ar = public/language/ar/notifications.json
trans.cs = public/language/cs/notifications.json
trans.de = public/language/de/notifications.json
trans.en@pirate = public/language/en@pirate/notifications.json
trans.es = public/language/es/notifications.json
trans.et = public/language/et/notifications.json
trans.fa_IR = public/language/fa_IR/notifications.json
trans.fi = public/language/fi/notifications.json
trans.fr = public/language/fr/notifications.json
trans.he = public/language/he/notifications.json
trans.hu = public/language/hu/notifications.json
trans.it = public/language/it/notifications.json
trans.nb = public/language/nb/notifications.json
trans.nl = public/language/nl/notifications.json
trans.pl = public/language/pl/notifications.json
trans.pt_BR = public/language/pt_BR/notifications.json
trans.ru = public/language/ru/notifications.json
trans.sc = public/language/sc/notifications.json
trans.sk = public/language/sk/notifications.json
trans.sv = public/language/sv/notifications.json
trans.th = public/language/th/notifications.json
trans.tr = public/language/tr/notifications.json
trans.zh_CN = public/language/zh_CN/notifications.json
trans.zh_TW = public/language/zh_TW/notifications.json
type = KEYVALUEJSON
[nodebb.reset_password]
source_file = public/language/en_GB/reset_password.json
source_lang = en_GB
trans.ar = public/language/ar/reset_password.json
trans.cs = public/language/cs/reset_password.json
trans.de = public/language/de/reset_password.json
trans.en@pirate = public/language/en@pirate/reset_password.json
trans.es = public/language/es/reset_password.json
trans.et = public/language/et/reset_password.json
trans.fa_IR = public/language/fa_IR/reset_password.json
trans.fi = public/language/fi/reset_password.json
trans.fr = public/language/fr/reset_password.json
trans.he = public/language/he/reset_password.json
trans.hu = public/language/hu/reset_password.json
trans.it = public/language/it/reset_password.json
trans.nb = public/language/nb/reset_password.json
trans.nl = public/language/nl/reset_password.json
trans.pl = public/language/pl/reset_password.json
trans.pt_BR = public/language/pt_BR/reset_password.json
trans.ru = public/language/ru/reset_password.json
trans.sc = public/language/sc/reset_password.json
trans.sk = public/language/sk/reset_password.json
trans.sv = public/language/sv/reset_password.json
trans.th = public/language/th/reset_password.json
trans.tr = public/language/tr/reset_password.json
trans.zh_CN = public/language/zh_CN/reset_password.json
trans.zh_TW = public/language/zh_TW/reset_password.json
type = KEYVALUEJSON
[nodebb.users]
source_file = public/language/en_GB/users.json
source_lang = en_GB
trans.ar = public/language/ar/users.json
trans.cs = public/language/cs/users.json
trans.de = public/language/de/users.json
trans.en@pirate = public/language/en@pirate/users.json
trans.es = public/language/es/users.json
trans.et = public/language/et/users.json
trans.fa_IR = public/language/fa_IR/users.json
trans.fi = public/language/fi/users.json
trans.fr = public/language/fr/users.json
trans.he = public/language/he/users.json
trans.hu = public/language/hu/users.json
trans.it = public/language/it/users.json
trans.nb = public/language/nb/users.json
trans.nl = public/language/nl/users.json
trans.pl = public/language/pl/users.json
trans.pt_BR = public/language/pt_BR/users.json
trans.ru = public/language/ru/users.json
trans.sc = public/language/sc/users.json
trans.sk = public/language/sk/users.json
trans.sv = public/language/sv/users.json
trans.th = public/language/th/users.json
trans.tr = public/language/tr/users.json
trans.zh_CN = public/language/zh_CN/users.json
trans.zh_TW = public/language/zh_TW/users.json
type = KEYVALUEJSON
[nodebb.language]
source_file = public/language/en_GB/language.json
source_lang = en_GB
trans.ar = public/language/ar/language.json
trans.cs = public/language/cs/language.json
trans.de = public/language/de/language.json
trans.en@pirate = public/language/en@pirate/language.json
trans.es = public/language/es/language.json
trans.et = public/language/et/language.json
trans.fa_IR = public/language/fa_IR/language.json
trans.fi = public/language/fi/language.json
trans.fr = public/language/fr/language.json
trans.he = public/language/he/language.json
trans.hu = public/language/hu/language.json
trans.it = public/language/it/language.json
trans.nb = public/language/nb/language.json
trans.nl = public/language/nl/language.json
trans.pl = public/language/pl/language.json
trans.pt_BR = public/language/pt_BR/language.json
trans.ru = public/language/ru/language.json
trans.sc = public/language/sc/language.json
trans.sk = public/language/sk/language.json
trans.sv = public/language/sv/language.json
trans.th = public/language/th/language.json
trans.tr = public/language/tr/language.json
trans.zh_CN = public/language/zh_CN/language.json
trans.zh_TW = public/language/zh_TW/language.json
type = KEYVALUEJSON
[nodebb.pages]
source_file = public/language/en_GB/pages.json
source_lang = en_GB
trans.ar = public/language/ar/pages.json
trans.cs = public/language/cs/pages.json
trans.de = public/language/de/pages.json
trans.en@pirate = public/language/en@pirate/pages.json
trans.es = public/language/es/pages.json
trans.et = public/language/et/pages.json
trans.fa_IR = public/language/fa_IR/pages.json
trans.fi = public/language/fi/pages.json
trans.fr = public/language/fr/pages.json
trans.he = public/language/he/pages.json
trans.hu = public/language/hu/pages.json
trans.it = public/language/it/pages.json
trans.nb = public/language/nb/pages.json
trans.nl = public/language/nl/pages.json
trans.pl = public/language/pl/pages.json
trans.pt_BR = public/language/pt_BR/pages.json
trans.ru = public/language/ru/pages.json
trans.sc = public/language/sc/pages.json
trans.sk = public/language/sk/pages.json
trans.sv = public/language/sv/pages.json
trans.th = public/language/th/pages.json
trans.tr = public/language/tr/pages.json
trans.zh_CN = public/language/zh_CN/pages.json
trans.zh_TW = public/language/zh_TW/pages.json
type = KEYVALUEJSON
[nodebb.topic]
source_file = public/language/en_GB/topic.json
source_lang = en_GB
trans.ar = public/language/ar/topic.json
trans.cs = public/language/cs/topic.json
trans.de = public/language/de/topic.json
trans.en@pirate = public/language/en@pirate/topic.json
trans.es = public/language/es/topic.json
trans.et = public/language/et/topic.json
trans.fa_IR = public/language/fa_IR/topic.json
trans.fi = public/language/fi/topic.json
trans.fr = public/language/fr/topic.json
trans.he = public/language/he/topic.json
trans.hu = public/language/hu/topic.json
trans.it = public/language/it/topic.json
trans.nb = public/language/nb/topic.json
trans.nl = public/language/nl/topic.json
trans.pl = public/language/pl/topic.json
trans.pt_BR = public/language/pt_BR/topic.json
trans.ru = public/language/ru/topic.json
trans.sc = public/language/sc/topic.json
trans.sk = public/language/sk/topic.json
trans.sv = public/language/sv/topic.json
trans.th = public/language/th/topic.json
trans.tr = public/language/tr/topic.json
trans.zh_CN = public/language/zh_CN/topic.json
trans.zh_TW = public/language/zh_TW/topic.json
type = KEYVALUEJSON

4
ATTRIBUTION.md Normal file
View File

@@ -0,0 +1,4 @@
## Sound Assets
* "Waterdrop" by [Porphyr](freesound.org/people/Porphyr) / [CC BY 3.0](creativecommons.org/licenses/by/3.0)
* "SweetAlertSound2.wav" by [KIZILSUNGUR](http://www.freesound.org/people/KIZILSUNGUR/) / [Public Domain / CC 0](http://creativecommons.org/publicdomain/zero/1.0/)

15
NOTES.md Normal file
View File

@@ -0,0 +1,15 @@
## 0.4x Refactor Notes
Please remove this file after 0.4x (or perhaps organize it so that we can see the history of breaking changes)
### Immediate Deprecation Notices
* `action:ajaxifying` is no longer triggered on body but on window instead, in line with other similar hooks.
* `filter:server.create_routes` and `filter:admin.create_routes` will have limited support (ajaxify works, but first-load will not). Please have a look at [this plugin](https://github.com/psychobunny/nodebb-plugin-kitchen-sink/blob/master/library.js#L16-L22) for an example on how to create routes in plugins from now on.
### Upcoming Deprecation Warnings
* `filter:footer.build` will be deprecated for 0.4x in favour of the widget system (WIP)
* templates.setGlobal (server-side only) deprecated in favour of using res.locals
* `plugins/fireHook` route will be deprecated for 0.4x
* synchronous hooks will be deprecated for 0.4x - we're reducing complexity by removing the `callbacked: true` property in `plugin.json` - just use callbacks.

View File

@@ -1,57 +1,58 @@
Please support NodeBB development! Check out our IndieGoGo campaign and like, share, and follow us :)
[NodeBB Homepage](http://www.nodebb.org/ "NodeBB") # [IndieGoGo campaign](https://www.indiegogo.com/projects/nodebb-the-discussion-platform-of-the-future/ "IndieGoGo") # [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter") # [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
# <img alt="NodeBB" src="http://i.imgur.com/3yj1n6N.png" />
[![Build Status](https://travis-ci.org/designcreateplay/NodeBB.svg?branch=master)](https://travis-ci.org/designcreateplay/NodeBB)
[![Dependency Status](https://david-dm.org/designcreateplay/nodebb.png)](https://david-dm.org/designcreateplay/nodebb)
[![Code Climate](https://codeclimate.com/github/designcreateplay/NodeBB.png)](https://codeclimate.com/github/designcreateplay/NodeBB)
# NodeBB
**NodeBB** is a robust Node.js driven forum built on a redis database. It is powered by web sockets, and is compatible down to IE8.
**NodeBB Forum Software** is powered by Node.js and built on a Redis database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
![NodeBB Main Category Listing](http://i.imgur.com/N8SLkcDh.png)
* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
* [Demo & Meta Discussion](http://community.nodebb.org)
* [NodeBB Blog](http://blog.nodebb.org)
* [Wiki Guides](https://github.com/designcreateplay/NodeBB/wiki) - includes setup for other platforms
* [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode
* [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
* [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
* [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
## Screenshots
[<img src="http://i.imgur.com/FLOUuIqb.png" />](http://i.imgur.com/FLOUuIq.png)&nbsp;[<img src="http://i.imgur.com/Ud1LrfIb.png" />](http://i.imgur.com/Ud1LrfI.png)&nbsp;[<img src="http://i.imgur.com/ZC8W39ab.png" />](http://i.imgur.com/ZC8W39a.png)&nbsp;[<img src="http://i.imgur.com/o90kVPib.png" />](http://i.imgur.com/o90kVPi.png)&nbsp;[<img src="http://i.imgur.com/AaRRrU2b.png" />](http://i.imgur.com/AaRRrU2.png)&nbsp;[<img src="http://i.imgur.com/LmHtPhob.png" />](http://i.imgur.com/LmHtPho.png)&nbsp;[<img src="http://i.imgur.com/paiJPJkb.jpg" />](http://i.imgur.com/paiJPJk.jpg)&nbsp;[<img src="http://i.imgur.com/ZfavPHDb.png" />](http://i.imgur.com/ZfavPHD.png)&nbsp;[<img src="http://i.imgur.com/8vc1Ytc.png" />](http://i.imgur.com/8vc1Ytc.png)
Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester United Forum](http://manutdforums.com/).
![NodeBB Topic Page](http://i.imgur.com/RBkFzdkh.png)
## How can I follow along/contribute?
* Our [Indiegogo campaign](https://www.indiegogo.com/projects/nodebb-the-discussion-platform-of-the-future/) is accepting contributions until August 17th, 2013
* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/designcreateplay/NodeBB/wiki/Version-History-%26-Roadmap)
* If you are a developer, feel free to check out the source and submit pull requests.
* If you are a designer, NodeBB needs themes! NodeBB will accept any LESS or CSS file and use it in place of the default Twitter Bootstrap theme. Consider extending Bootstrap themes by extending the base bootstrap LESS file.
* If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
* If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
* Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://community.nodebb.org) to keep up to date with the latest NodeBB development.
## Requirements
NodeBB requires a version of Node.js at least 0.8 or greater, and a Redis version 2.6 or greater.
NodeBB requires the following software to be installed:
* A version of Node.js at least 0.10 or greater
* Redis, version 2.6 or greater **or** MongoDB, version 2.4 or greater
* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
## Installation
First, we install our base software stack:
[Please refer to platform-specific installation documentation](https://github.com/designcreateplay/NodeBB/wiki#wiki-installing-nodebb)
# apt-get install git nodejs redis-server npm build-essential imagemagick
## Securing NodeBB
**If your package manager only installed a version of Node.js that is less than 0.8 (e.g. Ubuntu 12.10, 13.04):**
It is important to ensure that your NodeBB and database servers are secured. Bear these points in mind:
# add-apt-repository ppa:chris-lea/node.js
# apt-get update && apt-get dist-upgrade
1. While some distributions set up Redis with a more restrictive configuration, Redis by default listens to all interfaces, which is especially dangerous when a server is open to the public. Some suggestions:
* Set `bind_address` to `127.0.0.1` so as to restrict access to the local machine only
* Use `requirepass` to secure Redis behind a password (preferably a long one)
* Familiarise yourself with [Redis Security](http://redis.io/topics/security)
2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
* e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)
Next, clone this repository:
## Upgrading NodeBB
$ cd /path/to/nodebb/install/location
$ git clone git://github.com/designcreateplay/NodeBB.git nodebb
Obtain all of the dependencies required by NodeBB:
$ cd nodebb
$ npm install
Initiate the setup script by running the app with the `--setup` flag:
$ node app --setup
The default settings are for a local server running on the default port, with a redis store on the same machine/port.
Lastly, we run the forum.
$ node app
NodeBB can also be started with helper programs, such as `supervisor` and `forever`. [Take a look at the options here](https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB).
*(Optional)* Some server configurations may install the node binary as `nodejs` instead of `node`. You can re-map it (so as to not break compatibility with `node-supervisor`) by running the following command:
# update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
Detailed upgrade instructions are listed in [Upgrading NodeBB](https://github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB)

381
app.js
View File

@@ -16,127 +16,294 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
"use strict";
var nconf = require('nconf');
nconf.argv().env();
var fs = require('fs'),
nconf = require('nconf'),
os = require('os'),
semver = require('semver'),
winston = require('winston'),
path = require('path'),
pkg = require('./package.json'),
url = require('url');
utils = require('./public/src/utils.js');
// Runtime environment
global.env = process.env.NODE_ENV || 'production',
// Configuration setup
nconf.argv().file({ file: __dirname + '/config.json'});
global.env = process.env.NODE_ENV || 'production';
winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, {
colorize: true
});
winston.add(winston.transports.File, {
filename: 'logs/error.log',
level: 'error'
});
// TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
winston.err = function (err) {
winston.error(err.stack);
};
if(os.platform() === 'linux') {
require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
if(err || !stdout) {
winston.warn('Couldn\'t find convert. Did you install imagemagick?');
}
});
}
// Log GNU copyright info along with server info
console.log('Info: NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
console.log('Info: This program comes with ABSOLUTELY NO WARRANTY.');
console.log('Info: This is free software, and you are welcome to redistribute it under certain conditions.');
console.log('Info: ===');
winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
winston.info('');
if(nconf.get('upgrade')) {
require('./src/upgrade').upgrade();
} else if (!nconf.get('setup') && nconf.get('base_url')) {
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/');
nconf.set('upload_url', nconf.get('url') + 'uploads/');
global.nconf = nconf;
// Alternate configuration file support
var configFile = __dirname + '/config.json',
configExists;
if (nconf.get('config')) {
configFile = path.resolve(__dirname, nconf.get('config'));
}
configExists = fs.existsSync(configFile);
console.log('Info: Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.');
console.log('Info: Base Configuration OK.');
// TODO: Replace this with nconf-redis
var meta = require('./src/meta.js');
global.config = {};
meta.config.get(function(config) {
for(c in config) {
if (config.hasOwnProperty(c)) {
global.config[c] = config[c];
}
}
var categories = require('./src/categories.js'),
RDB = require('./src/redis.js'),
templates = require('./public/src/templates.js'),
webserver = require('./src/webserver.js'),
websockets = require('./src/websockets.js'),
plugins = require('./src/plugins'),
admin = {
'categories': require('./src/admin/categories.js')
};
DEVELOPMENT = true;
global.configuration = {};
global.templates = {};
(function(config) {
config['ROOT_DIRECTORY'] = __dirname;
templates.init([
'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
'emails/header', 'emails/footer', 'install/header', 'install/footer', 'install/redis',
'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
]);
templates.ready(webserver.init);
//setup scripts to be moved outside of the app in future.
function setup_categories() {
console.log('Info: Checking categories...');
categories.getAllCategories(function(data) {
if (data.categories.length === 0) {
console.log('Info: Setting up default categories...');
fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, default_categories) {
default_categories = JSON.parse(default_categories);
for (var category in default_categories) {
admin.categories.create(default_categories[category]);
}
});
console.log('Info: Hardcoding uid 1 as an admin');
var user = require('./src/user.js');
user.makeAdministrator(1);
} else {
console.log('Info: Categories OK. Found ' + data.categories.length + ' categories.');
}
});
}
setup_categories();
}(global.configuration));
});
if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
start();
} else if (nconf.get('setup') || nconf.get('install') || !configExists) {
setup();
} else if (nconf.get('upgrade')) {
upgrade();
} else if (nconf.get('reset')) {
reset();
} else {
// New install, ask setup questions
if (nconf.get('setup')) console.log('Info: NodeBB Setup Triggered via Command Line');
else console.log('Info: Configuration not found, starting NodeBB setup');
displayHelp();
}
var install = require('./src/install');
function loadConfig() {
nconf.file({
file: configFile
});
process.stdout.write(
"\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " +
"few questions about your environment before we can proceed.\n\n" +
"Press enter to accept the default setting (shown in brackets).\n\n\n"
);
nconf.defaults({
base_dir: __dirname,
themes_path: path.join(__dirname, 'node_modules'),
upload_url: path.join(path.sep, 'uploads', path.sep),
views_dir: path.join(__dirname, 'public/templates')
});
install.setup(function(err) {
// Ensure themes_path is a full filepath
nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
}
function start() {
loadConfig();
winston.info('Time: ' + new Date());
winston.info('Initializing NodeBB v' + pkg.version);
winston.info('* using configuration stored in: ' + configFile);
var host = nconf.get(nconf.get('database') + ':host');
winston.info('* using ' + nconf.get('database') +' store at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : ''));
winston.info('* using themes stored in: ' + nconf.get('themes_path'));
if (process.env.NODE_ENV === 'development') {
winston.info('Base Configuration OK.');
}
var meta = require('./src/meta');
require('./src/database').init(function(err) {
meta.configs.init(function () {
var templates = require('./public/src/templates'),
translator = require('./public/src/translator'),
webserver = require('./src/webserver'),
sockets = require('./src/socket.io'),
plugins = require('./src/plugins'),
upgrade = require('./src/upgrade');
templates.setGlobal('relative_path', nconf.get('relative_path'));
upgrade.check(function(schema_ok) {
if (schema_ok || nconf.get('check-schema') === false) {
sockets.init(webserver.server);
plugins.init();
translator.loadServer();
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));
plugins.ready(function() {
webserver.init();
});
process.on('SIGTERM', shutdown);
process.on('SIGINT', shutdown);
process.on('SIGHUP', restart);
} else {
winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
winston.warn(' node app --upgrade');
winston.warn('To ignore this error (not recommended):');
winston.warn(' node app --no-check-schema');
process.exit();
}
});
});
});
}
function setup() {
loadConfig();
if (nconf.get('setup')) {
winston.info('NodeBB Setup Triggered via Command Line');
} else {
winston.warn('Configuration not found, starting NodeBB setup');
}
var install = require('./src/install');
winston.info('Welcome to NodeBB!');
winston.info('This looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');
winston.info('Press enter to accept the default setting (shown in brackets).');
install.setup(function (err) {
if (err) {
console.log('Error: There was a problem completing NodeBB setup: ', err.message);
winston.error('There was a problem completing NodeBB setup: ', err.message);
} else {
if (!nconf.get('setup')) {
process.stdout.write(
"Please start NodeBB again and register a new user. This user will automatically become an administrator.\n\n"
);
}
winston.info('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.');
}
process.exit();
});
}
}
function upgrade() {
loadConfig();
var meta = require('./src/meta');
require('./src/database').init(function(err) {
meta.configs.init(function () {
require('./src/upgrade').upgrade();
});
});
}
function reset() {
loadConfig();
require('./src/database').init(function(err) {
if (err) {
winston.error(err.message);
process.exit();
}
if (nconf.get('themes')) {
resetThemes();
} else if (nconf.get('plugins')) {
resetPlugins();
} else if (nconf.get('widgets')) {
resetWidgets();
} else if (nconf.get('settings')) {
resetSettings();
} else if (nconf.get('all')) {
require('async').series([resetWidgets, resetThemes, resetPlugins, resetSettings], function(err) {
if (!err) {
winston.info('[reset] Reset complete.');
} else {
winston.error('[reset] Errors were encountered while resetting your forum settings: ' + err.message);
}
process.exit();
});
} else {
console.log('no match');
}
});
}
function resetSettings(callback) {
var meta = require('./src/meta');
meta.configs.set('allowLocalLogin', 1, function(err) {
winston.info('[reset] Settings reset to default');
if (typeof callback === 'function') {
callback(err);
} else {
process.exit();
}
});
}
function resetThemes(callback) {
var meta = require('./src/meta');
meta.themes.set({
type: 'local',
id: 'nodebb-theme-vanilla'
}, function(err) {
winston.info('[reset] Theme reset to Vanilla');
if (typeof callback === 'function') {
callback(err);
} else {
process.exit();
}
});
}
function resetPlugins(callback) {
var db = require('./src/database');
db.delete('plugins:active', function(err) {
winston.info('[reset] All Plugins De-activated');
if (typeof callback === 'function') {
callback(err);
} else {
process.exit();
}
});
}
function resetWidgets(callback) {
require('./src/widgets').reset(function(err) {
winston.info('[reset] All Widgets moved to Draft Zone');
if (typeof callback === 'function') {
callback(err);
} else {
process.exit();
}
});
}
function shutdown(code) {
winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
require('./src/database').close();
winston.info('[app] Database connection closed.');
winston.info('[app] Shutdown complete.');
process.exit();
}
function restart() {
if (process.send) {
winston.info('[app] Restarting...');
process.send({
action: 'restart'
});
} else {
winston.error('[app] Could not restart server. Shutting down.');
shutdown();
}
}
function displayHelp() {
winston.info('Usage: node app [options] [arguments]');
winston.info(' [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
winston.info('');
winston.info('Options:');
winston.info(' --help displays this usage information');
winston.info(' --setup configure your environment and setup NodeBB');
winston.info(' --upgrade upgrade NodeBB, first read: github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB');
winston.info(' --reset soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
winston.info(' --start manually start NodeBB (default when no options are given)');
}

View File

@@ -1 +0,0 @@
*.rss

View File

@@ -1 +0,0 @@
*.rss

View File

@@ -1,74 +1,98 @@
[
{
"name": "Announcements",
"description": "A place to talk about whateeeever you want",
"blockclass": "category-blue",
"icon" : "icon-bullhorn"
"description": "Announcements regarding our community",
"bgColor": "#0059B2",
"color": "#fff",
"icon" : "fa-bullhorn",
"order": 1
},
{
"name": "General Discussion",
"description": "A place to talk about whateeeever you want",
"blockclass": "category-blue",
"icon" : "icon-comment"
"bgColor": "#0059B2",
"color": "#fff",
"icon" : "fa-comment",
"order": 2
},
{
"name": "NodeBB Development",
"description": "Bugs? Dont worry, we dont read this thread, so post them here.",
"blockclass": "category-blue",
"icon" : "icon-github"
"description": "NodeBB development news and announcements",
"bgColor": "#0059B2",
"color": "#fff",
"icon" : "fa-github",
"order": 3
},
{
"name": "Blogs",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-blue",
"icon" : "icon-pencil"
"description": "Blog posts from individual members",
"bgColor": "#0059B2",
"color": "#fff",
"icon" : "fa-pencil",
"order": 4
},
{
"name": "Feature Requests",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-purple",
"icon" : "icon-lightbulb"
"description": "Got a feature request you'd like to see? Give us a shout here.",
"bgColor": "#ab1290",
"color": "#fff",
"icon" : "fa-lightbulb-o",
"order": 5
},
{
"name": "Bug Reports",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-purple",
"icon" : "icon-cogs"
"description": "Having trouble with NodeBB? Let us know...",
"bgColor": "#ab1290",
"color": "#fff",
"icon" : "fa-cogs",
"order": 6
},
{
"name": "NodeBB Addons",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-purple",
"icon" : "icon-plus-sign"
"name": "NodeBB Plugins",
"description": "Enhance your NodeBB with plugins!",
"bgColor": "#ab1290",
"color": "#fff",
"icon" : "fa-plus-square",
"order": 7
},
{
"name": "NodeBB Link Exchange",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-purple",
"icon" : "icon-exchange"
"description": "Link exchange",
"bgColor": "#ab1290",
"color": "#fff",
"icon" : "fa-exchange",
"order": 8
},
{
"name": "News",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-darkblue",
"icon" : "icon-globe"
"description": "News from around the world",
"bgColor": "#004C66",
"color": "#fff",
"icon" : "fa-globe",
"order": 9
},
{
"name": "Movies",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-darkblue",
"icon" : "icon-film"
"description": "Discuss the latest movies here",
"bgColor": "#004C66",
"color": "#fff",
"icon" : "fa-film",
"order": 10
},
{
"name": "Games",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-darkblue",
"icon" : "icon-screenshot"
"description": "Discuss the latest games here",
"bgColor": "#004C66",
"color": "#fff",
"icon" : "fa-crosshairs",
"order": 11
},
{
"name": "Random",
"description": "In future an example of how a hidden category should look like.",
"blockclass": "category-darkblue",
"icon" : "icon-beer"
"description": "Anything and (almost) everything welcome!",
"bgColor": "#004C66",
"color": "#fff",
"icon" : "fa-beer",
"order": 12
}
]

86
loader.js Normal file
View File

@@ -0,0 +1,86 @@
"use strict";
var nconf = require('nconf'),
fs = require('fs'),
pidFilePath = __dirname + '/pidfile',
start = function() {
var fork = require('child_process').fork,
nbb_start = function() {
nbb = fork('./app', process.argv.slice(2), {
env: {
'NODE_ENV': process.env.NODE_ENV
}
});
nbb.on('message', function(message) {
if (message && typeof message === 'object' && message.action) {
if (message.action === 'restart') {
nbb_restart();
}
}
});
nbb.on('exit', function(code, signal) {
if (code) {
nbb_start();
} else {
nbb_stop();
}
});
},
nbb_stop = function() {
nbb.kill();
if (fs.existsSync(pidFilePath)) {
var pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
if (process.pid === pid) {
fs.unlinkSync(pidFilePath);
}
}
},
nbb_restart = function() {
nbb.on('exit', function() {
nbb_start();
});
nbb.kill();
};
process.on('SIGINT', nbb_stop);
process.on('SIGTERM', nbb_stop);
process.on('SIGHUP', nbb_restart);
nbb_start();
},
nbb;
nconf.argv();
// Start the daemon!
if (nconf.get('d')) {
// Check for a still-active NodeBB process
if (fs.existsSync(pidFilePath)) {
try {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
process.kill(pid, 0);
console.log('\n Error: Another NodeBB is already running!');
process.exit();
} catch (e) {
fs.unlinkSync(pidFilePath);
}
}
// Initialise logging streams
var outputStream = fs.createWriteStream(__dirname + '/logs/output.log');
outputStream.on('open', function(fd) {
// Daemonize
require('daemon')({
stdout: fd
});
// Write its pid to a pidfile
fs.writeFile(__dirname + '/pidfile', process.pid);
start();
});
} else {
start();
}

1
logs/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
*.log

58
minifier.js Normal file
View File

@@ -0,0 +1,58 @@
var uglifyjs = require('uglify-js'),
less = require('less'),
async = require('async'),
fs = require('fs'),
Minifier = {
js: {},
css: {}
};
/* Javascript */
Minifier.js.minify = function (scripts, callback) {
try {
var minified = uglifyjs.minify(scripts);
callback(minified.code);
} catch(err) {
process.send({
action: 'error',
error: err
});
}
};
Minifier.js.concatenate = function(scripts, callback) {
async.map(scripts, function(path, next) {
fs.readFile(path, { encoding: 'utf-8' }, next);
}, function(err, contents) {
if (err) {
process.send({
action: 'error',
error: err
});
} else {
callback(contents.reduce(function(output, src) {
return output.length ? output + ';\n' + src : src;
}, ''));
}
});
};
process.on('message', function(payload) {
var executeCallback = function(data) {
process.send({
action: payload.action,
data: data
});
};
switch(payload.action) {
case 'js.minify':
Minifier.js.minify(payload.scripts, executeCallback);
break;
case 'js.concatenate':
Minifier.js.concatenate(payload.scripts, executeCallback);
break;
}
})

95
mocks/databasemock.js Normal file
View File

@@ -0,0 +1,95 @@
/**
* Database Mock - wrapper for database.js, makes system use separate test db, instead of production
* ATTENTION: testing db is flushed before every use!
*/
(function(module) {
'use strict';
var utils = require('./../public/src/utils.js'),
path = require('path'),
nconf = require('nconf'),
winston = require('winston'),
errorText;
nconf.file({ file: path.join(__dirname, '../config.json') });
nconf.defaults({
base_dir: path.join(__dirname,'..'),
themes_path: path.join(__dirname, '../node_modules'),
upload_url: path.join(path.sep, '../uploads', path.sep),
views_dir: path.join(__dirname, '../public/templates')
});
var dbType = nconf.get('database'),
testDbConfig = nconf.get('test_database'),
productionDbConfig = nconf.get(dbType);
if(!testDbConfig){
errorText = 'test_database is not defined';
winston.info(
"\n===========================================================\n"+
"Please, add parameters for test database in config.json\n"+
"For example (redis):\n"+
'"test_database": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "6379",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
" or (mongo):\n" +
'"test_database": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "27017",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
"==========================================================="
);
winston.error(errorText);
throw new Error(errorText);
}
if( testDbConfig.database === productionDbConfig.database &&
testDbConfig.host === productionDbConfig.host &&
testDbConfig.port === productionDbConfig.port
){
errorText = 'test_database has the same config as production db';
winston.error(errorText);
throw new Error(errorText);
}
nconf.set(dbType, testDbConfig);
var db = require('../src/database'),
meta = require('../src/meta');
before(function(done) {
db.init(function(err) {
//Clean up
db.flushdb(function(err) {
if(err) {
winston.error(err);
throw new Error(err);
}
winston.info('test_database flushed');
meta.configs.init(function () {
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));
var webserver = require('../src/webserver'),
sockets = require('../src/socket.io');
sockets.init(webserver.server);
done();
});
});
});
});
module.exports = db;
}(module));

116
nodebb
View File

@@ -1,6 +1,112 @@
#!/bin/bash
clear
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1
# $0 script path
# $1 action
# $2 subaction
function pidExists() {
if [ -e "pidfile" ];
then
kill -s 0 $(cat pidfile);
if [ !$? ];
then return 1;
else return 0;
fi
else
return 0;
fi
}
case "$1" in
start)
echo "Starting NodeBB";
echo " \"./nodebb stop\" to stop the NodeBB server";
echo " \"./nodebb log\" to view server output";
if [ -f "./logs/output.log" ]; # Preserve the last output log
then
mv ./logs/output.log ./logs/output.1.log;
fi;
# Start the loader daemon
node loader -d "$@"
;;
stop)
echo "Stopping NodeBB. Goodbye!";
kill $(cat pidfile);
;;
reload|restart)
echo "Restarting NodeBB.";
kill -1 $(cat pidfile);
;;
status)
pidExists;
if [ 0 -eq $? ];
then
echo "NodeBB is not running";
echo " \"./nodebb start\" to launch the NodeBB server";
else
echo "NodeBB Running (pid $(cat pidfile))";
echo " \"./nodebb stop\" to stop the NodeBB server";
echo " \"./nodebb log\" to view server output";
echo " \"./nodebb restart\" to restart NodeBB";
fi
;;
log)
clear;
tail -F ./logs/output.log;
;;
upgrade)
npm install
ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
node loader --upgrade
touch package.json
echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
;;
setup)
node loader --setup "$@"
;;
reset)
node loader --reset --$2
;;
dev)
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development node loader "$@"
;;
watch)
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development supervisor -q --ignore public/templates --extensions 'node|js|tpl' -- app "$@"
;;
*)
echo "Welcome to NodeBB"
echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
echo ''
column -s ' ' -t <<< '
start Start the NodeBB server
stop Stops the NodeBB server
reload Restarts NodeBB
restart Restarts NodeBB
log Opens the logging interface (useful for debugging)
setup Runs the NodeBB setup script
reset Disables all plugins, restores the default theme.
upgrade Run NodeBB upgrade scripts, ensure packages are up-to-date
dev Start NodeBB in interactive development mode
watch Start NodeBB in development mode and watch for changes
'
exit 1
esac

843
npm-shrinkwrap.json generated Normal file
View File

@@ -0,0 +1,843 @@
{
"name": "nodebb",
"version": "0.4.1",
"dependencies": {
"async": {
"version": "0.2.10",
"from": "async@~0.2.8"
},
"bcryptjs": {
"version": "0.7.12",
"from": "bcryptjs@~0.7.10"
},
"connect-mongo": {
"version": "0.4.0",
"from": "connect-mongo@0.4.0",
"resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"
},
"connect-redis": {
"version": "1.4.5",
"from": "connect-redis@1.4.5",
"dependencies": {
"redis": {
"version": "0.7.3",
"from": "redis@0.7.x",
"resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"
},
"debug": {
"version": "0.8.0",
"from": "debug@*"
}
}
},
"cron": {
"version": "1.0.4",
"from": "cron@~1.0.4"
},
"daemon": {
"version": "1.1.0",
"from": "daemon@~1.1.0"
},
"express": {
"version": "3.2.0",
"from": "express@3.2.0",
"resolved": "https://registry.npmjs.org/express/-/express-3.2.0.tgz",
"dependencies": {
"connect": {
"version": "2.7.6",
"from": "connect@2.7.6",
"dependencies": {
"qs": {
"version": "0.5.1",
"from": "qs@0.5.1"
},
"formidable": {
"version": "1.0.11",
"from": "formidable@1.0.11"
},
"buffer-crc32": {
"version": "0.1.1",
"from": "buffer-crc32@0.1.1"
},
"bytes": {
"version": "0.2.0",
"from": "bytes@0.2.0"
},
"pause": {
"version": "0.0.1",
"from": "pause@0.0.1"
}
}
},
"commander": {
"version": "0.6.1",
"from": "commander@0.6.1"
},
"range-parser": {
"version": "0.0.4",
"from": "range-parser@0.0.4"
},
"cookie": {
"version": "0.0.5",
"from": "cookie@0.0.5"
},
"buffer-crc32": {
"version": "0.2.1",
"from": "buffer-crc32@~0.2.1"
},
"fresh": {
"version": "0.1.0",
"from": "fresh@0.1.0"
},
"methods": {
"version": "0.0.1",
"from": "methods@0.0.1"
},
"send": {
"version": "0.1.0",
"from": "send@0.1.0",
"dependencies": {
"mime": {
"version": "1.2.6",
"from": "mime@1.2.6",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"
}
}
},
"cookie-signature": {
"version": "1.0.1",
"from": "cookie-signature@1.0.1"
},
"debug": {
"version": "0.8.0",
"from": "debug@*"
}
}
},
"express-namespace": {
"version": "0.1.1",
"from": "express-namespace@~0.1.1",
"dependencies": {
"methods": {
"version": "0.0.1",
"from": "methods@0.0.1"
}
}
},
"gm": {
"version": "1.14.2",
"from": "gm@1.14.2",
"resolved": "https://registry.npmjs.org/gm/-/gm-1.14.2.tgz",
"dependencies": {
"debug": {
"version": "0.7.0",
"from": "debug@0.7.0"
},
"array-series": {
"version": "0.1.5",
"from": "array-series@~0.1.0"
},
"array-parallel": {
"version": "0.1.3",
"from": "array-parallel@~0.1.0"
},
"stream-to-buffer": {
"version": "0.0.1",
"from": "stream-to-buffer@~0.0.1"
},
"through": {
"version": "2.3.4",
"from": "through@~2.3.1"
}
}
},
"gravatar": {
"version": "1.0.6",
"from": "gravatar@1.0.6"
},
"hiredis": {
"version": "0.1.16",
"from": "hiredis@~0.1.15",
"dependencies": {
"bindings": {
"version": "1.2.0",
"from": "bindings@*"
}
}
},
"less": {
"version": "1.6.3",
"from": "less@~1.6.3",
"dependencies": {
"mime": {
"version": "1.2.11",
"from": "mime@1.2.x"
},
"request": {
"version": "2.34.0",
"from": "request@>=2.12.0",
"dependencies": {
"qs": {
"version": "0.6.6",
"from": "qs@~0.6.0"
},
"json-stringify-safe": {
"version": "5.0.0",
"from": "json-stringify-safe@~5.0.0"
},
"forever-agent": {
"version": "0.5.2",
"from": "forever-agent@~0.5.0"
},
"node-uuid": {
"version": "1.4.1",
"from": "node-uuid@~1.4.0"
},
"tough-cookie": {
"version": "0.12.1",
"from": "tough-cookie@>=0.12.0",
"dependencies": {
"punycode": {
"version": "1.2.4",
"from": "punycode@>=0.2.0"
}
}
},
"form-data": {
"version": "0.1.2",
"from": "form-data@~0.1.0",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"from": "combined-stream@~0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
"from": "delayed-stream@0.0.5"
}
}
}
}
},
"tunnel-agent": {
"version": "0.3.0",
"from": "tunnel-agent@~0.3.0"
},
"http-signature": {
"version": "0.10.0",
"from": "http-signature@~0.10.0",
"dependencies": {
"assert-plus": {
"version": "0.1.2",
"from": "assert-plus@0.1.2"
},
"asn1": {
"version": "0.1.11",
"from": "asn1@0.1.11"
},
"ctype": {
"version": "0.5.2",
"from": "ctype@0.5.2"
}
}
},
"oauth-sign": {
"version": "0.3.0",
"from": "oauth-sign@~0.3.0"
},
"hawk": {
"version": "1.0.0",
"from": "hawk@~1.0.0",
"dependencies": {
"hoek": {
"version": "0.9.1",
"from": "hoek@0.9.x"
},
"boom": {
"version": "0.4.2",
"from": "boom@0.4.x"
},
"cryptiles": {
"version": "0.2.2",
"from": "cryptiles@0.2.x"
},
"sntp": {
"version": "0.2.4",
"from": "sntp@0.2.x"
}
}
},
"aws-sign2": {
"version": "0.5.0",
"from": "aws-sign2@~0.5.0"
}
}
},
"clean-css": {
"version": "2.0.8",
"from": "clean-css@2.0.x",
"dependencies": {
"commander": {
"version": "2.0.0",
"from": "commander@2.0.x"
}
}
},
"source-map": {
"version": "0.1.33",
"from": "source-map@0.1.x",
"dependencies": {
"amdefine": {
"version": "0.1.0",
"from": "amdefine@>=0.0.4"
}
}
}
}
},
"marked": {
"version": "0.2.8",
"from": "marked@0.2.8"
},
"mkdirp": {
"version": "0.3.5",
"from": "mkdirp@~0.3.5"
},
"mongodb": {
"version": "1.3.23",
"from": "mongodb@~1.3.19",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz",
"dependencies": {
"bson": {
"version": "0.2.5",
"from": "bson@0.2.5",
"resolved": "https://registry.npmjs.org/bson/-/bson-0.2.5.tgz"
},
"kerberos": {
"version": "0.0.3",
"from": "kerberos@0.0.3",
"resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"
}
}
},
"nconf": {
"version": "0.6.9",
"from": "nconf@~0.6.7",
"dependencies": {
"async": {
"version": "0.2.9",
"from": "async@0.2.9",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.9.tgz"
},
"ini": {
"version": "1.1.0",
"from": "ini@1.x.x"
},
"optimist": {
"version": "0.6.0",
"from": "optimist@0.6.0",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
},
"minimist": {
"version": "0.0.8",
"from": "minimist@~0.0.1"
}
}
}
}
},
"nodebb-plugin-markdown": {
"version": "0.4.1",
"from": "nodebb-plugin-markdown@~0.4.1",
"dependencies": {
"marked": {
"version": "0.2.10",
"from": "marked@~0.2.9"
},
"pygmentize-bundled": {
"version": "2.1.0",
"from": "pygmentize-bundled@~2.1.0",
"dependencies": {
"readable-stream": {
"version": "1.0.26-4",
"from": "readable-stream@~1.0.17",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"from": "core-util-is@~1.0.0"
},
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1"
},
"string_decoder": {
"version": "0.10.25-1",
"from": "string_decoder@~0.10.x"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1"
}
}
},
"bl": {
"version": "0.4.2",
"from": "bl@~0.4.1"
},
"through2": {
"version": "0.2.3",
"from": "through2@~0.2.1",
"dependencies": {
"readable-stream": {
"version": "1.1.12",
"from": "readable-stream@~1.1.9",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"from": "core-util-is@~1.0.0"
},
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1"
},
"string_decoder": {
"version": "0.10.25-1",
"from": "string_decoder@~0.10.x"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@^2.0.1"
}
}
},
"xtend": {
"version": "2.1.2",
"from": "xtend@~2.1.1",
"dependencies": {
"object-keys": {
"version": "0.4.0",
"from": "object-keys@~0.4.0"
}
}
}
}
}
}
}
}
},
"nodebb-plugin-mentions": {
"version": "0.4.1-2",
"from": "nodebb-plugin-mentions@~0.4.0"
},
"nodebb-theme-lavender": {
"version": "0.0.25-4",
"from": "nodebb-theme-lavender@~0.0.25"
},
"nodebb-theme-vanilla": {
"version": "0.0.19-13",
"from": "nodebb-theme-vanilla@~0.0.19"
},
"nodebb-widget-essentials": {
"version": "0.0.21-1",
"from": "nodebb-widget-essentials@~0.0.21",
"dependencies": {
"marked": {
"version": "0.3.2",
"from": "marked@^0.3.2"
}
}
},
"passport": {
"version": "0.2.0",
"from": "passport@~0.2.0",
"dependencies": {
"passport-strategy": {
"version": "1.0.0",
"from": "passport-strategy@1.x.x"
},
"pause": {
"version": "0.0.1",
"from": "pause@0.0.1"
}
}
},
"passport-local": {
"version": "0.1.6",
"from": "passport-local@0.1.6",
"dependencies": {
"pkginfo": {
"version": "0.2.3",
"from": "pkginfo@0.2.x"
},
"passport": {
"version": "0.1.18",
"from": "passport@~0.1.1",
"dependencies": {
"pause": {
"version": "0.0.1",
"from": "pause@0.0.1"
}
}
}
}
},
"prompt": {
"version": "0.2.12",
"from": "prompt@~0.2.11",
"dependencies": {
"pkginfo": {
"version": "0.3.0",
"from": "pkginfo@0.x.x"
},
"read": {
"version": "1.0.5",
"from": "read@1.0.x",
"dependencies": {
"mute-stream": {
"version": "0.0.4",
"from": "mute-stream@~0.0.4"
}
}
},
"revalidator": {
"version": "0.1.6",
"from": "revalidator@0.1.x"
},
"utile": {
"version": "0.2.1",
"from": "utile@0.2.x",
"dependencies": {
"deep-equal": {
"version": "0.2.1",
"from": "deep-equal@*"
},
"i": {
"version": "0.3.2",
"from": "i@0.3.x"
},
"ncp": {
"version": "0.4.2",
"from": "ncp@0.4.x"
}
}
},
"winston": {
"version": "0.6.2",
"from": "winston@0.6.x",
"dependencies": {
"async": {
"version": "0.1.22",
"from": "async@0.1.x"
},
"colors": {
"version": "0.6.2",
"from": "colors@0.x.x"
},
"cycle": {
"version": "1.0.3",
"from": "cycle@1.0.x"
},
"eyes": {
"version": "0.1.8",
"from": "eyes@0.1.x"
},
"pkginfo": {
"version": "0.2.3",
"from": "pkginfo@0.2.x"
},
"request": {
"version": "2.9.203",
"from": "request@2.9.x"
},
"stack-trace": {
"version": "0.0.9",
"from": "stack-trace@0.0.x"
}
}
}
}
},
"redis": {
"version": "0.8.3",
"from": "redis@0.8.3",
"resolved": "https://registry.npmjs.org/redis/-/redis-0.8.3.tgz"
},
"reds": {
"version": "0.2.4",
"from": "reds@~0.2.4",
"dependencies": {
"natural": {
"version": "0.1.17",
"from": "natural@0.1.17",
"dependencies": {
"sylvester": {
"version": "0.0.21",
"from": "sylvester@>= 0.0.12"
},
"apparatus": {
"version": "0.0.8",
"from": "apparatus@>= 0.0.6"
}
}
},
"redis": {
"version": "0.7.2",
"from": "redis@0.7.2",
"resolved": "https://registry.npmjs.org/redis/-/redis-0.7.2.tgz"
}
}
},
"rimraf": {
"version": "2.2.6",
"from": "rimraf@~2.2.6"
},
"rss": {
"version": "0.2.1",
"from": "rss@~0.2.0",
"dependencies": {
"xml": {
"version": "0.0.12",
"from": "xml@~0.0.4"
},
"mime": {
"version": "1.2.11",
"from": "mime@~1.2.11"
}
}
},
"semver": {
"version": "2.2.1",
"from": "semver@~2.2.1"
},
"sitemap": {
"version": "0.7.2",
"from": "sitemap@~0.7.1"
},
"socket.io": {
"version": "0.9.16",
"from": "socket.io@~0.9.16",
"dependencies": {
"socket.io-client": {
"version": "0.9.16",
"from": "socket.io-client@0.9.16",
"dependencies": {
"uglify-js": {
"version": "1.2.5",
"from": "uglify-js@1.2.5"
},
"ws": {
"version": "0.4.31",
"from": "ws@0.4.x",
"dependencies": {
"commander": {
"version": "0.6.1",
"from": "commander@~0.6.1"
},
"nan": {
"version": "0.3.2",
"from": "nan@~0.3.0"
},
"tinycolor": {
"version": "0.0.1",
"from": "tinycolor@0.x"
},
"options": {
"version": "0.0.5",
"from": "options@>=0.0.5"
}
}
},
"xmlhttprequest": {
"version": "1.4.2",
"from": "xmlhttprequest@1.4.2"
},
"active-x-obfuscator": {
"version": "0.0.1",
"from": "active-x-obfuscator@0.0.1",
"dependencies": {
"zeparser": {
"version": "0.0.5",
"from": "zeparser@0.0.5"
}
}
}
}
},
"policyfile": {
"version": "0.0.4",
"from": "policyfile@0.0.4"
},
"base64id": {
"version": "0.1.0",
"from": "base64id@0.1.0"
},
"redis": {
"version": "0.7.3",
"from": "redis@0.7.x",
"resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"
}
}
},
"socket.io-wildcard": {
"version": "0.1.1",
"from": "socket.io-wildcard@~0.1.1"
},
"string": {
"version": "1.7.0",
"from": "string@~1.7.0"
},
"uglify-js": {
"version": "2.4.13",
"from": "uglify-js@~2.4.0",
"dependencies": {
"source-map": {
"version": "0.1.33",
"from": "source-map@~0.1.33",
"dependencies": {
"amdefine": {
"version": "0.1.0",
"from": "amdefine@>=0.0.4"
}
}
},
"optimist": {
"version": "0.3.7",
"from": "optimist@~0.3.5",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
}
}
},
"uglify-to-browserify": {
"version": "1.0.2",
"from": "uglify-to-browserify@~1.0.0"
}
}
},
"underscore": {
"version": "1.6.0",
"from": "underscore@~1.6.0"
},
"validator": {
"version": "3.4.0",
"from": "validator@~3.4.0",
"resolved": "https://registry.npmjs.org/validator/-/validator-3.4.0.tgz"
},
"winston": {
"version": "0.7.3",
"from": "winston@~0.7.2",
"dependencies": {
"colors": {
"version": "0.6.2",
"from": "colors@0.6.x"
},
"cycle": {
"version": "1.0.3",
"from": "cycle@1.0.x"
},
"eyes": {
"version": "0.1.8",
"from": "eyes@0.1.x"
},
"pkginfo": {
"version": "0.3.0",
"from": "pkginfo@0.3.x"
},
"request": {
"version": "2.16.6",
"from": "request@2.16.x",
"dependencies": {
"form-data": {
"version": "0.0.10",
"from": "form-data@~0.0.3",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"from": "combined-stream@~0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
"from": "delayed-stream@0.0.5"
}
}
}
}
},
"mime": {
"version": "1.2.11",
"from": "mime@~1.2.7"
},
"hawk": {
"version": "0.10.2",
"from": "hawk@~0.10.2",
"dependencies": {
"hoek": {
"version": "0.7.6",
"from": "hoek@0.7.x"
},
"boom": {
"version": "0.3.8",
"from": "boom@0.3.x"
},
"cryptiles": {
"version": "0.1.3",
"from": "cryptiles@0.1.x"
},
"sntp": {
"version": "0.1.4",
"from": "sntp@0.1.x"
}
}
},
"node-uuid": {
"version": "1.4.1",
"from": "node-uuid@~1.4.0"
},
"cookie-jar": {
"version": "0.2.0",
"from": "cookie-jar@~0.2.0"
},
"aws-sign": {
"version": "0.2.0",
"from": "aws-sign@~0.2.0"
},
"oauth-sign": {
"version": "0.2.0",
"from": "oauth-sign@~0.2.0"
},
"forever-agent": {
"version": "0.2.0",
"from": "forever-agent@~0.2.0"
},
"tunnel-agent": {
"version": "0.2.0",
"from": "tunnel-agent@~0.2.0"
},
"json-stringify-safe": {
"version": "3.0.0",
"from": "json-stringify-safe@~3.0.0"
},
"qs": {
"version": "0.5.6",
"from": "qs@~0.5.4"
}
}
},
"stack-trace": {
"version": "0.0.9",
"from": "stack-trace@0.0.x"
}
}
},
"xregexp": {
"version": "2.0.0",
"from": "xregexp@~2.0.0"
}
}
}

View File

@@ -2,38 +2,62 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
"version": "0.0.5",
"version": "0.4.1",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
"url": "https://github.com/designcreateplay/NodeBB/"
},
"main": "app.js",
"scripts": {
"start": "./nodebb start",
"stop": "./nodebb stop",
"test": "mocha ./tests -t 10000"
},
"dependencies": {
"socket.io": "0.9.14",
"redis": "0.8.3",
"socket.io": "~0.9.16",
"express": "3.2.0",
"express-namespace": "0.1.1",
"emailjs": "0.3.4",
"cookie": "0.0.6",
"connect-redis": "1.4.5",
"passport": "0.1.17",
"express-namespace": "~0.1.1",
"passport": "~0.2.0",
"passport-local": "0.1.6",
"passport-twitter": "0.1.5",
"passport-google-oauth": "0.1.5",
"passport-facebook": "0.1.5",
"less-middleware": "0.1.12",
"marked": "0.2.8",
"bcrypt": "0.7.5",
"async": "0.2.8",
"node-imagemagick": "0.1.8",
"node-rss": "1.0.1",
"async": "~0.2.8",
"gm": "1.14.2",
"gravatar": "1.0.6",
"nconf": "~0.6.7",
"sitemap": "~0.6.0",
"cheerio": "~0.12.0",
"request": "~2.25.0",
"reds": "~0.2.4"
"sitemap": "~0.7.1",
"reds": "~0.2.4",
"winston": "~0.7.2",
"rss": "~0.2.0",
"prompt": "~0.2.11",
"uglify-js": "~2.4.0",
"validator": "~3.4.0",
"cron": "~1.0.4",
"semver": "~2.2.1",
"string": "~1.7.0",
"xregexp": "~2.0.0",
"socket.io-wildcard": "~0.1.1",
"bcryptjs": "~0.7.10",
"nodebb-plugin-mentions": "~0.4.0",
"nodebb-plugin-markdown": "~0.4.1",
"nodebb-widget-essentials": "~0.0.21",
"nodebb-theme-vanilla": "~0.0.19",
"nodebb-theme-lavender": "~0.0.25",
"less": "~1.6.3",
"daemon": "~1.1.0",
"underscore": "~1.6.0",
"mkdirp": "~0.3.5",
"rimraf": "~2.2.6"
},
"optionalDependencies": {
"redis": "0.8.3",
"hiredis": "~0.1.15",
"connect-redis": "1.4.5",
"mongodb": "~1.3.19",
"connect-mongo": "0.4.0"
},
"devDependencies": {
"mocha": "~1.13.0"
},
"bugs": {
"url": "https://github.com/designcreateplay/NodeBB/issues"
@@ -41,26 +65,21 @@
"engines": {
"node": ">=0.8"
},
"contributors": [
"maintainers": [
{
"name": "Andrew Rodrigues",
"email": "andrew@designcreateplay.com"
"email": "andrew@designcreateplay.com",
"url": "https://github.com/psychobunny"
},
{
"name": "Julian Lam",
"email": "julian@designcreateplay.com"
"email": "julian@designcreateplay.com",
"url": "https://github.com/julianlam"
},
{
"name": "Barış Soner Uşaklı",
"email": "baris@designcreateplay.com"
},
{
"name": "Damian Bushong",
"url": "https://github.com/damianb"
},
{
"name": "Matt Smith",
"url": "https://github.com/soimafreak"
"email": "baris@designcreateplay.com",
"url": "https://github.com/barisusakli"
}
]
}

0
plugins/.gitignore vendored
View File

View File

@@ -1,157 +0,0 @@
@import "mixins";
.admin {
.entry-row {
border-radius: 10px;
margin-bottom: 10px;
padding: 10px;
cursor: move;
}
input.description {
width: 400px;
}
.admin-categories {
form {
margin: 0 0 0px;
}
input {
height: 20px;
padding: 5px;
margin-left: 10px;
width: 150px;
border: 0;
border-radius: 5px;
margin-top: -8px;
}
.category_description {
width: 300px;
}
select {
border: 0;
margin-left: 10px;
padding: 5px;
margin-top: -8px;
}
button {
margin-top: -7px;
}
.icon{
width: 30px;
height: 30px;
text-align: center;
line-height: 35px;
display: inline-block;
}
}
.themes {
margin: 0;
padding: 0;
li {
padding: 10px 16px;
margin: 0.25em 1em;
list-style-type: none;
.pointer;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
-webkit-transition: background-color 250ms linear;
-moz-transition: background-color 250ms linear;
-ms-transition: background-color 250ms linear;
-o-transition: background-color 250ms linear;
transition: background-color 250ms linear;
img {
max-width: 150px;
float: left;
}
h4, p {
margin-left: 170px;
}
p {
font-size: 0.9em;
}
&:hover {
background-color: rgba(128, 128, 128, 0.2);
}
&.no-themes {
font-style: italic;
}
}
}
.motd textarea {
width: 100%;
}
.topics {
margin: 0;
padding: 0;
> li {
.zebra;
list-style-type: none;
padding: 1em;
margin-bottom: 1em;
ul {
margin: 0.5em 0;
li {
list-style-type: none;
}
}
}
}
.icon-container {
.row {
margin: 0;
.span3 {
width: 20px;
height: 20px;
margin: 1px;
cursor: pointer;
line-height: 20px;
text-align: center;
&:hover, &.selected {
background: black;
color: white;
}
}
}
}
.plugins {
li {
list-style-type: none;
background: rgba(64, 64, 64, 0.05);
padding: 1em;
border-left: 5px solid #08c;
h2 {
font-size: 16px;
margin: 0;
}
p {
font-size: 12px;
}
}
}
}

View File

@@ -1,224 +0,0 @@
.category {
.span9 {
margin-bottom: 50px;
}
a {
li {
list-style: none;
//border-bottom: 1px solid #eee;
margin-bottom: 10px;
padding-bottom: 10px;
&.deleted {
-moz-opacity: 0.30;
opacity: 0.30;
}
}
&:last-child li {
border-bottom: 0;
}
}
ul {
margin-left: 0;
}
.thread-rating {
color: #444;
text-align: center;
margin-top: 7px;
span {
display: inline-block; margin-left: 5px;
i {
padding-left: 2.4px;
}
@media (max-width: 1200px)
{
margin-left: -1px;
}
}
}
.topic-row {
border-radius: 5px;
padding-left: 20px;
border: 1px solid rgba(0, 0, 0, 0.2);
small {
vertical-align: 2px;
strong {
color: #666;
}
color: #999;
font-size: 14px;
}
h3 {
padding: 0;
margin: 0;
margin-top: 4px;
color: rgb(0, 136, 204);
line-height: 25px;
.topic-title {
width: 50%;
display: inline-block;
font-size: 20px;
white-space: nowrap;
text-overflow:ellipsis;
overflow: hidden;
.badge {
margin-right: 6px;
}
@media (max-width: 979px)
{
width: 100%;
}
}
}
@media (max-width: 979px)
{
width: 100%;
margin-left: 0px;
}
}
.latest-post {
float: right;
padding-top: 2px;
margin-right: 0px;
width: 40%;
.pull-right {
width: 100%;
height: 50px;
line-height: 16px;
margin-left: 1px;
padding: 5px;
border-left: 1px solid #bbb;
padding-left: 20px;
img {
display: block;
float: left;
}
p {
display: block;
float: left;
width: 70%;
margin-left: 10px;
overflow: hidden;
height: 32px;
}
span {
display: block;
float: left;
width: 70%;
margin-left: 10px;
overflow: hidden;
height: 16px;
margin-top: -10px;
color: #666;
}
}
}
.recent-replies {
overflow-y: auto;
overflow-x: hidden;
ul {
width: 100%;
height: 50px;
line-height: 16px;
margin-left: 1px;
padding: 5px 5px 5px 0px;
list-style-type: none;
li {
clear: both;
line-height: 16px;
margin-bottom: 1em;
&:last-child {
margin-bottom: 0;
}
img {
display: block;
float: left;
}
p {
display: block;
padding-left:5px;
padding-top: 2px;
overflow: hidden;
height: 32px;
margin-bottom: 0.5em;
}
span {
font-size: 12px;
display: block;
overflow: hidden;
height: 16px;
padding-left:5px;
color: #666;
}
}
}
}
.sidebar-block {
.block-header {
padding: 8px;
padding-left: 13px;
display: block;
background: rgb(245,245,245);
color: #676;
font-weight: 400;
font-size: 14px;
border-radius: 5px 5px 0 0;
border-bottom: 1px solid #ddd;
}
.block-content {
padding: 10px;
.img-polaroid {
width: 20%;
height: auto;
max-width: 48px;
}
}
border-radius: 5px;
padding: 0;
margin-bottom: 20px;
.img-polaroid {
margin-top: 2px;
}
}
}

View File

@@ -1,33 +0,0 @@
.no-select {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.pointer {
cursor: pointer;
*cursor: hand;
}
.inline-block {
display: inline-block;
*display: inline;
zoom: 1;
}
.clear {
clear: both;
}
.zebra {
&:nth-child(even) {
background: rgba(191,191,191,0.2);
}
&:nth-child(odd) {
background: rgba(223,223,223,0.2);
}
}

View File

@@ -1,5 +0,0 @@
@import "style";
@import "topic";
@import "category";
@import "noscript";

View File

@@ -1,57 +0,0 @@
@import "mixins";
noscript {
.default {
list-style-type: none;
padding: 1em;
margin-bottom: 1em;
.zebra;
}
.categories {
li {
.default;
.icon {
float: left;
margin-right: 1em;
}
a {
font-size: 20px;
}
}
}
.topics {
li {
.default;
}
.teaser {
margin-left: 16px;
margin-top: 8px;
img {
float: left;
width: 32px;
}
p {
color: #666;
font-size: 13px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
margin-left: 64px;
padding-top: 10px;
}
}
}
.posts {
li {
.default;
}
}
}

View File

@@ -1,846 +0,0 @@
@import "mixins";
body {
/*background: #fdfdfd;*/ // port to default theme when it is implemented.
-webkit-transition: margin-bottom 250ms ease;
-moz-transition: margin-bottom 250ms ease;
-ms-transition: margin-bottom 250ms ease;
-o-transition: margin-bottom 250ms ease;
transition: margin-bottom 250ms ease;
&.composing {
margin-bottom: 350px;
}
@media (min-width: 979px)
{
padding-top: 70px;
}
@media (max-width: 979px)
{
padding-bottom: 50px;
}
}
button, a {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
.none {
display: none !important;
}
.block, .show {
display: block;
}
.badge {
vertical-align: 17%;
}
.nav .badge {
vertical-align: 10%;
}
#alert_window {
position: fixed;
right: 20px;
top: 60px;
width: 300px;
height: 0px;
}
.toaster-alert {
cursor: pointer;
}
footer.footer {
color: #555;
text-align: center;
a {
color: #222;
}
}
#post_window {
width: 100%;
position: fixed;
height: 350px;
left: 0px;
bottom: 0px;
background: white;
z-index: 1500;
input {
width: 100%;
height: 30px;
padding: 5px;
}
textarea {
width: 100%;
background: #222;
height: 220px;
resize: none;
border-radius: 0;
border: 1px solid #111;
font-size: 16px;
color: #bebebe;
outline: 0;
&:focus {
outline: 0;
border:none !important;
box-shadow:none !important;
}
}
.post-title-container {
opacity: 0.8;
height: 50px;
}
.post-content-container {
opacity: 0.8;
background: #000;
width: 100%;
height: 300px;
}
}
#user_label { //belongs in header.less
img {
border: 1px solid #454;
margin-right: 8px;
margin-top: -2px;
float: left;
width:24px;
height:24px;
}
span {
font-size: 14px;
font-weight: 400;
color: #ded;
}
}
#reply_title {
font-size: 17px;
padding-top: 14px;
font-weight: 600;
}
.alt-logins {
margin: 0 0 0 1em;
padding: 0;
li {
vertical-align: top;
background: transparent;
display: none;
margin: 0.25em;
.pointer;
&.active {
.inline-block;
}
i {
-webkit-transition: color 100ms linear;
-moz-transition: color 100ms linear;
-ms-transition: color 100ms linear;
-o-transition: color 100ms linear;
transition: color 100ms linear;
&.icon-twitter-sign:hover {
color: #4099FF;
}
&.icon-facebook-sign:hover {
color: #3b5999;
}
&.icon-google-plus-sign:hover {
color: #d34836;
}
}
}
}
#thread_active_users {
float: right;
color: rgb(153,153,153);
strong {
color: rgb(100,100,100);
font-weight: 600;
cursor: pointer;
}
}
.account-username-box{
border-bottom:1px solid #e3e3e3;
margin-bottom:10px;
}
.account-sub-links a{
margin-left:10px;
}
.account-username{
font-size:20px;
font-weight:bold;
}
.account-picture-block{
display:inline-block;
vertical-align:top;
}
.account-online-status {
.icon-circle-blank {
color:red;
}
.icon-circle {
color:green;
}
}
.user-profile-picture {
width:128px;
margin-bottom:10px;
}
.user-picture-label {
font-size:20px;
}
.account-bio-block{
display:inline-block;
vertical-align:top;
}
.account-bio-label{
display:inline-block;
width:100px;
}
.user-recent-posts {
div {
color: #333;
margin-bottom: 10px;
cursor: pointer;
p {
color: #333;
}
}
span {
padding-top: 10px;
}
}
.category-icon {
width: 100%;
height: 90px;
text-align: center;
border-radius: 0px;
margin: 0;
padding-top:25px;
cursor: pointer;
margin-bottom: 20px;
border-radius: 5px;
overflow:hidden;
}
.category-row h4 {
font-weight: 700;
text-align: left;
/*color: #555;*/ // NOTE: color for cat/topic header links should be grey in the default theme when we get around to it.
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.category-row a {
text-decoration: none;
border: 0;
}
.category-purple {
@color: #ab1290;
background: @color;
color: white;
&:hover {
background: lighten(@color, 10%);
}
}
.category-darkblue {
@color: #004C66;
background: @color;
color: white;
&:hover {
background: lighten(@color, 10%);
}
}
.category-blue {
@color: #0059B2;
background: @color;
color: white;
&:hover {
background: lighten(@color, 10%);
}
}
.category-darkgreen {
@color: #004000;
background: @color;
color: white;
&:hover {
background: lighten(@color, 10%);
}
}
.category-orange {
@color: #FF7A4D;
color: white;
background: @color;
&:hover {
background: lighten(@color, 10%);
}
}
.category-list {
li {
.inline-block;
.pointer;
padding: 0.5em 0;
text-align: center;
margin: 0.5em;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 0.5em;
}
}
.hero-unit {
background: #56BCDA;
color: white;
padding: 30px;
word-wrap: break-word;
}
.users-box{
display: inline-block;
margin-top: 20px;
text-align: center;
vertical-align: top;
max-width: 104px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
img {
width:80px;
height:80px;
}
a {
margin:5px;
}
}
a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
text-decoration:none;
}
.formatting-bar {
.no-select;
span:focus {
outline: none;
}
}
.breadcrumb {
li {
max-width: 35%;
white-space: nowrap;
text-overflow:ellipsis;
overflow: hidden;
}
}
body .navbar .nodebb-inline-block {
display:inline-block;
}
#right-menu{
float:right;
}
#admin-redis-info {
span {
display:inline-block;
width:220px;
}
}
.post-signature {
color: #666;
font-size: 12px;
border-top: 1px solid #ddd;
display: inline-block;
img {
max-width:200px;
max-height:60px;
}
}
.username-field {
.icon-circle {
font-size: 12px;
color: green;
margin-right:3px;
}
.icon-circle-blank {
font-size: 12px;
color: red;
margin-right:3px;
}
}
#chat-content {
width:95%;
height:200px;
resize:none;
}
#chat-message-input {
width:95%;
}
#content{
padding-bottom:20px;
}
.dropdown-toggle {
i {
font-size: 12px;
&.active {
color: #558;
text-shadow: 0 0 1em #aaf, 0 0 1em #aaf, 0 0 1em #aaf;
}
}
}
#notif-list {
li {
font-size: 12px;
width: 300px;
text-align: left;
a {
white-space: normal;
}
&.unread {
background: #eceff5;
}
}
}
.taskbar {
display: none;
-moz-opacity: 0.5;
opacity: 0.5;
margin-top: 0;
-webkit-transition: opacity 250ms ease-in;
-moz-transition: opacity 250ms ease-in;
-ms-transition: opacity 250ms ease-in;
-o-transition: opacity 250ms ease-in;
transition: opacity 250ms ease-in;
&[data-active="1"] {
display: block;
}
&:hover {
-moz-opacity: 1;
opacity: 1;
}
li {
a > span {
.inline-block;
max-width: 200px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
img {
max-width: 24px;
max-height: 24px;
margin-right: 1em;
}
&.pulse {
-webkit-animation: pulsate 2500ms linear;
-webkit-animation-iteration-count: infinite;
}
@-webkit-keyframes pulsate {
0% { background: none; }
50% { background: #e5e5e5; }
100% { background: none; }
}
}
}
.post-window {
position: fixed;
display: none;
height: 350px;
visibility: hidden;
> div {
position: absolute;
height: 100%;
background: rgba(64, 64, 64, 0.6);
visibility: visible;
.btn-toolbar {
width: 90%;
margin: 0 auto;
span {
color: white;
&:hover {
text-decoration: none;
}
}
}
input {
width: 98%;
text-align: center;
border: none;
padding: 0.5em 0;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
margin: 1% 1% 2% 1%;
}
textarea {
background: rgba(64, 64, 64, 0.95);
border: none;
padding: 0.5em;
display: block;
width: 90%;
margin: 0.5em auto;
resize: none;
color: white;
height: 200px;
}
#imagedrop {
text-align:center;
color:white;
position: absolute;
top: 0px;
left: 0px;
width: 100%;
height:230px;
line-height:230px;
font-size:20px;
vertical-align: middle;
}
#imagelist {
position: absolute;
bottom: 5px;
left: 0px;
padding-left:2em;
div {
margin-right:5px;
}
span {
line-height:20px;
float:left;
}
button {
padding-left:5px;
}
}
}
}
@media (max-width: 979px) {
.post-window {
position: relative;
bottom: 0px !important;
> div {
position: static;
width: 100% !important;
}
}
}
#mobile-menu {
position: fixed;
bottom: 0px;
height: 50px;
background: #333;
width: 100%;
left: 0px;
}
#mobile-menu, #mobile-menu-overlay {
z-index: 999;
@media (min-width: 979px)
{
display: none !important;
}
}
.btn-none,
.btn-none:active,
.btn-none[disabled] {
background-color: transparent;
background-image: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.btn-none {
cursor: pointer;
border-color: transparent;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.btn-none:hover,
.btn-none:focus {
text-decoration: none;
background-color: transparent;
}
.btn-none[disabled]:hover,
.btn-none[disabled]:focus {
text-decoration: none;
}
.btn-none {
.icon-white {
color: white;
}
}
#mobile-menu {
button {
color: #eee;
padding: 10px;
text-shadow: none;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
}
#mobile-menu-overlay {
background: rgba(0, 0, 0, 0.85);
position: fixed;
top: 0px;
left: 0px;
height: 100%;
width: 100%;
//margin-top: 50px;
padding-top: 20px;
opacity: 0;
-webkit-transition: opacity 150ms ease;
-moz-transition: opacity 150ms ease;
-ms-transition: opacity 150ms ease;
-o-transition: opacity 150ms ease;
transition: opacity 150ms ease;
z-index: -1;
&.menu-visible {
z-index: 99;
opacity: 1;
}
.mobile-menu-icon {
color: white;
width: 20%;
min-width: 85px;
height: auto;
text-align: center;
padding: 10px;
display: inline-block;
cursor: pointer;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-transition: margin-top 250ms ease;
-moz-transition: margin-top 250ms ease;
-ms-transition: margin-top 250ms ease;
-o-transition: margin-top 250ms ease;
transition: margin-top 250ms ease;
margin-top: 20%;
&.menu-visible {
margin-top: 0%;
}
i {
width: 100%;
}
}
}
#mobile-sidebar {
height: 100%;
position: absolute;
left: 100%;
top: 0px;
overflow: hidden;
margin-top: 60px;
}
.category-box {
height:90px;
.post-preview {
padding-left:10px;
padding-right:10px;
text-align:left;
img {
width:60px;
height:60px;
padding-right:5px;
}
p {
overflow: hidden;
text-overflow:ellipsis;
height:60px;
}
}
}
#mark-allread-btn {
margin-bottom:15px;
}
@-webkit-keyframes scroll-2 /* Safari and Chrome */
{
0% {top: 0px;}
25% {top: -90px;}
50% {top: -180px;}
75% {top: -270px;}
100% {top: -360px;}
}
@keyframes scroll-2
{
0% {top: 0px;}
25% {top: -90px;}
50% {top: -180px;}
75% {top: -270px;}
100% {top: -360px;}
}
@-webkit-keyframes scroll-1 /* Safari and Chrome */
{
0% {top: 0px;}
33% {top: -90px;}
66% {top: -180px;}
100% {top: -270px;}
}
@keyframes scroll-1
{
0% {top: 0px;}
33% {top: -90px;}
66% {top: -180px;}
100% {top: -270px;}
}
@-webkit-keyframes scroll-0 /* Safari and Chrome */
{
0% {top: 0px;}
50% {top: -90px;}
100% {top: -180px;}
}
@keyframes scroll-0
{
0% {top: 0px;}
50% {top: -90px;}
100% {top: -180px;}
}
.category-slider-2:hover {
position:relative;
-webkit-animation: scroll-2 10s ease 0.5s infinite normal;
animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */
}
.category-slider-1:hover {
position:relative;
-webkit-animation: scroll-1 8s ease 0.5s infinite normal;
animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */
}
.category-slider-0:hover {
position:relative;
-webkit-animation: scroll-0 6s ease 0.5s infinite normal;
animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */
}
.form-search {
float: left;
margin-top: 5px;
margin-bottom:0px;
}
.search-result-post {
width: 100%;
line-height: 16px;
padding: 5px;
overflow:hidden;
img {
display: block;
float: left;
width:48px;
height:48px;
padding-right:10px;
}
}

View File

@@ -1,193 +0,0 @@
.post-container {
list-style-type: none;
padding: 0;
margin: 0;
clear: both;
.profile-image-block {
display: inline-block;
text-align: center;
font-size: 12px;
.stats {
clear: both;
}
}
li {
padding-bottom: 15px;
&.deleted {
-moz-opacity: 0.30;
opacity: 0.30;
height:30px;
overflow-y:hidden;
}
&.deleted-expanded {
height:100%;
overflow-y:default;
}
}
.profile-block, .post-block {
border: 1px solid rgba(0, 0, 0, 0.06);
border-radius: 5px;
padding: 10px;
p {
line-height: 1.75em;
}
}
.profile-block {
background: rgba(0, 0, 0, 0.02);
margin-right: -11px;
margin-left: -11px;
margin-bottom: -11px;
margin-top: 15px;
border-radius: 0 0 5px 5px;
font-size: 10px;
line-height: 18px;
padding: 5px;
padding-left: 10px;
img.hidden-desktop {
max-width: 10px;
max-height: 10px;
padding-top: 5px;
margin-right: 5px;
}
}
.post-content {
min-height: 50px;
padding: 2px 5px 0 5px;
word-wrap: break-word;
}
.post-images{
padding: 2px 5px 0 5px;
}
.post-block {
.post-buttons {
font-size: 12px;
float: right;
margin-right: 5px;
button, a {
display: inline-block;
padding: 0px 15px;
border: none;
border-left: 1px solid rgba(0, 0, 0, 0.06);
cursor: pointer;
background: none;
font-size: 12px;
height: 20px;
&:last-child {
padding-right: 5px;
}
}
.icon-star {
//theme this to make it yellow eventually
}
}
}
&.deleted {
-moz-opacity: 0.30;
opacity: 0.30;
}
/*http://stackoverflow.com/questions/11037517/bootstrap-making-responsive-changes-to-layout*/
@media (max-width: 979px) {
.span12-tablet {
width: 100% !important;
margin-left:0px;
*width: 100% !important;
}
}
.main-post {
h3 {
margin: 0;
.topic-title {
width: auto;
white-space: nowrap;
text-overflow:ellipsis;
overflow: hidden;
margin: 0;
padding: 0;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 5px;
}
}
.main-avatar {
color: white;
position: relative;
float: left;
margin-right: 25px;
margin-bottom: 0px;
padding-bottom: 0px;
text-align: center;
width:80px;
@media (max-width: 767px) {
display: none;
}
}
.main-avatar:hover .hover-overlay {
opacity: 0.75;
}
.hover-overlay {
margin: 5px;
position: absolute;
bottom: 0px;
height: 35px;
padding-top: 2px;
width: 80px;
font-size: 13px;
line-height: 16px;
background: #000;
opacity: 0;
transition: opacity 0.3s;
}
.post-content {
min-height: 80px;
}
hr {
margin-top: 0;
margin-right: 10px;
margin-bottom: 0;
}
.post-block {
.post-buttons {
div {
border: 0;
}
}
}
.favourite {
cursor: pointer;
}
.btn {
display: inline-block;
}
.topic-buttons {
margin-top: 8px;
}
}
}

3
public/language/TODO Normal file
View File

@@ -0,0 +1,3 @@
NPM INSTALL
For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm install-ability.
When that happens, server code will generate compressed JSON language files in this folder.

View File

@@ -0,0 +1,12 @@
{
"new_topic_button": "موضوع جديد",
"no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
"posts": "مشاركات",
"views": "مشاهدات",
"posted": "نشر",
"browsing": "يتصفح",
"no_replies": "لم يرد أحد",
"replied": "رد",
"last_edited_by": "تغيرت أخيراً عبر",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "حالياً على الموقع",
"stats.users": "مستخدمين",
"stats.topics": "مواضيع",
"stats.posts": "مشاركات",
"success": "نجاح"
}

View File

@@ -0,0 +1,55 @@
{
"home": "الصفحة الرئيسية",
"search": "بحث",
"buttons.close": "أغلق",
"403.title": "غير مسموح بالدخول",
"403.message": "يبدو أنك قد تعثر على الصفحة التي لم يكن لديك الوصول إليها. ربما يجب عليك <a href='/login'> تسجيل الدخول </a> ",
"404.title": "لم يتم العثور",
"404.message": "يبدو أنك قد تعثرت على صفحة غير موجودة. عودة إلى الصفحة الرئيسية.",
"500.title": "خطأ داخلي.",
"500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
"register": "تسجيل",
"login": "دخول",
"please_log_in": "Please Log In",
"logout": "تسجيل الخروج",
"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"save_changes": "حفظ التغييرات",
"close": "أغلق",
"pagination": "Pagination",
"header.admin": "مشرف",
"header.recent": "حديث",
"header.unread": "غير مقروء",
"header.popular": "Popular",
"header.users": "المستخدمين",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "بحث",
"header.profile": "ملف",
"notifications.loading": "تحميل التبليغات",
"chats.loading": "تحميل الدردشات",
"motd.welcome": "مرحبا بكم NodeBB، منصة مناقشة المستقبل",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Posts",
"recentips": "Recently Logged In IPs",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline",
"privacy": "Privacy"
}

View File

@@ -0,0 +1,5 @@
{
"name": "العربية",
"code": "ar",
"dir": "rtl"
}

View File

@@ -0,0 +1,10 @@
{
"login": "دخول",
"username": "Username / Email",
"password": "كلمة السر",
"remember_me": "تذكرني؟",
"forgot_password": "نسيت كلمة المرور؟",
"alternative_logins": "تسجيلات الدخول البديلة",
"failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
"login_successful": "قمت بتسجيل الدخول بنجاح!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
"chat.placeholder": "اكتب رسالة دردشة هنا، وإضغط ENTER لإرسال",
"chat.send": "أرسل",
"chat.no_active": "لا يوجد لديك دردشات نشطة."
}

View File

@@ -0,0 +1,10 @@
{
"title": "إعلام",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"back_to_home": "العودة إلى NodeBB",
"outgoing_link": "رابط خارجي",
"outgoing_link_message": "أنت الأن ترحل",
"continue_to": "أكمل إلى",
"return_to": "إرجع إلى"
}

View File

@@ -0,0 +1,15 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
"user.posts": "Posts made by %1",
"user.topics": "Topics created by %1",
"user.favourites": "%1's Favourite Posts",
"user.settings": "User Settings"
}

View File

@@ -0,0 +1,7 @@
{
"title": "Recent",
"day": "يوم",
"week": "أسبوع",
"month": "شهر",
"no_recent_topics": "There are no recent topics."
}

View File

@@ -0,0 +1,18 @@
{
"register": "تسجيل",
"help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من الجمهور.",
"help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
"help.minimum_password_length": "كلمتك السر يجب أن تكون على الأقل متألفة من 1% أحرف",
"email_address": "عنوان البريد الإلكتروني",
"email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
"username": "اسم المستخدم",
"username_placeholder": "أدخل اسم المستخدم",
"password": "كلمة السر",
"password_placeholder": "أدخل كلمة السر",
"confirm_password": "تأكيد كلمة السر",
"confirm_password_placeholder": "تأكيد كلمة السر",
"register_now_button": "قم بالتسجيل الآن",
"alternative_registration": "التسجيل البديلة",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

View File

@@ -0,0 +1,14 @@
{
"reset_password": "إعادة تعيين كلمة السر",
"update_password": "تحديث كلمة السر",
"password_changed.title": "تم تغير كلمة السر",
"password_changed.message": "<p>تم تغير كلمة السر بنجاح. يرجى <a href='/login'>إعادة الدخول</a></p>",
"wrong_reset_code.title": "إعادة تعيين رمز غير صحيح",
"wrong_reset_code.message": "رامز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمز جديد</a>",
"new_password": "كلمة السر الجديدة",
"repeat_password": "تأكيد كلمة السر",
"enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
"enter_email_address": "Enter Email Address",
"password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
"invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
}

View File

@@ -0,0 +1,93 @@
{
"topic": "موضوع",
"topics": "مواضيع",
"topic_id": "Topic ID",
"topic_id_placeholder": "Enter topic ID",
"no_topics_found": "لا توجد مواضيع !",
"no_posts_found": "No posts found!",
"profile": "ملف",
"posted_by": "Posted by",
"chat": "دردشة",
"notify_me": "تنبه من ردود جديدة في هذا الموضوع",
"quote": "اقتبس",
"reply": "رد",
"edit": "صحح",
"delete": "حذف",
"restore": "Restore",
"move": "انقل",
"fork": "فرع",
"banned": "محظور",
"link": "رابط",
"share": "شارك",
"tools": "أدوات",
"flag": "Flag",
"bookmark_instructions": "Click here to return to your last position or close to discard.",
"flag_title": "Flag this post for moderation",
"flag_confirm": "Are you sure you want to flag this post?",
"flag_success": "This post has been flagged for moderation.",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"following_topic.title": "Following Topic",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
"not_following_topic.title": "Not Following Topic",
"not_following_topic.message": "You will no longer receive notifications from this topic.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
"watch": "Watch",
"watch.title": "Be notified of new replies in this topic",
"share_this_post": "Share this Post",
"thread_tools.title": "أدوات الموضوع",
"thread_tools.markAsUnreadForAll": "علم غير مقروء",
"thread_tools.pin": "علق الموضوع",
"thread_tools.unpin": "Unpin Topic",
"thread_tools.lock": "قفل الموضوع",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.move": "نقل الموضوع",
"thread_tools.fork": "تفرع الموضوع",
"thread_tools.delete": "حذف الموضوع",
"thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
"thread_tools.restore": "Restore Topic",
"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
"post_delete_confirm": "Are you sure you want to delete this post?",
"post_restore_confirm": "Are you sure you want to restore this post?",
"post_delete_error": "Could not delete this post!",
"post_restore_error": "Could not restore this post!",
"load_categories": "تحميل الفئات",
"disabled_categories_note": "الفئات المجلدة رمادية",
"confirm_move": "انقل",
"confirm_fork": "فرع",
"favourite": "المفضل",
"favourites": "المفضلة",
"favourites.not_logged_in.title": "ليس موجود حالياً",
"favourites.not_logged_in.message": "الرجاء تسجيل الدخول لتفضل هذا الرد",
"favourites.has_no_favourites": "ليس لديك أي ردود مفضلة. فضل بعد الردود لرؤيتهم هنا",
"vote.not_logged_in.title": "Not Logged In",
"vote.not_logged_in.message": "Please log in in order to vote",
"vote.cant_vote_self.title": "Invalid Vote",
"vote.cant_vote_self.message": "You cannot vote for your own post",
"loading_more_posts": "تحميل المزيد من المشاركات",
"move_topic": "نقل الموضوع",
"move_post": "نقل الرد",
"fork_topic": "فرع الموضوع",
"topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
"fork_topic_instruction": "إضغط على الردود لتفريعهم",
"fork_no_pids": "لم تختار أي رد",
"fork_success": "تفريع الموضوع بنجاح!",
"reputation": "سمعة",
"posts": "ردود",
"composer.title_placeholder": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.help": "Help",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic",
"composer.uploading": "uploading...",
"composer.thumb_url_label": "Paste a topic thumbnail URL",
"composer.thumb_title": "Add a thumbnail to this topic",
"composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file",
"composer.thumb_remove": "Clear fields",
"composer.drag_and_drop_images": "Drag and Drop Images Here",
"composer.upload_instructions": "Upload images by dragging & dropping them."
}

View File

@@ -0,0 +1,6 @@
{
"title": "Unread",
"no_unread_topics": "ليس هناك أي موضوع غير مقروء",
"mark_all_read": "إجعل كل المواضيع مقرؤة",
"load_more": "حمل المزيد"
}

View File

@@ -0,0 +1,55 @@
{
"banned": "محظور",
"offline": "ليس موجود حالياً",
"username": "إسم المستخدم",
"email": "البريد الإلكتروني",
"fullname": "الاسم الكامل",
"website": "الموقع الإلكتروني",
"location": "موقع",
"age": "عمر",
"joined": "تاريخ التسجيل",
"lastonline": "تاريخ أخر دخول",
"profile": "Profile",
"profile_views": "مشاهد الملف",
"reputation": "سمعة",
"posts": "ردود",
"favourites": "Favourites",
"followers": "أتباع",
"following": "يتبع",
"signature": "توقيع",
"gravatar": "Gravatar",
"birthday": "عيد ميلاد",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"change_picture": "تغيير الصورة",
"edit": "صحح",
"uploaded_picture": "صورة تم تحميلها",
"upload_new_picture": "تحميل صورة جديدة",
"current_password": "Current Password",
"change_password": "تغيير كلمة السر",
"change_password_error": "Invalid Password!",
"change_password_error_wrong_current": "Your current password is not correct!",
"change_password_error_length": "Password too short!",
"change_password_error_match": "Passwords must match!",
"change_password_error_privileges": "You are not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "تأكيد كلمة السر",
"password": "كلمة السر",
"upload_picture": "تحميل الصورة",
"upload_a_picture": "تحميل صورة",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Settings",
"show_email": "أظهر بريدي الإلكتروني",
"has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
"follows_no_one": "هذا المستخدم لا يتبع أحد :(",
"has_no_posts": "This user didn't post anything yet.",
"has_no_topics": "This user didn't post any topics yet.",
"email_hidden": "البريد الإلكتروني مخفي",
"hidden": "مخفي",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.",
"topics_per_page": "Topics per Page",
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification."
}

View File

@@ -0,0 +1,9 @@
{
"latest_users": "أحدث المستخدمين",
"top_posters": "أكثر المشتركين",
"most_reputation": "أعلى سمعة",
"online": "موجودين حالياً",
"search": "بحث",
"enter_username": "أدخل اسم مستخدم للبحث",
"load_more": "حمل المزيد"
}

View File

@@ -0,0 +1,12 @@
{
"new_topic_button": "Nové téma",
"no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
"posts": "příspěvky",
"views": "zobrazení",
"posted": "odesláno",
"browsing": "prohlíží",
"no_replies": "Nikdo ještě neodpověděl",
"replied": "přispěl",
"last_edited_by": "naposledy upravil",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Uživatelé",
"stats.topics": "Témata",
"stats.posts": "Příspěvky",
"success": "úspěch"
}

View File

@@ -0,0 +1,55 @@
{
"home": "Domů",
"search": "Hledat",
"buttons.close": "Zavřít",
"403.title": "Přístup odepřen",
"403.message": "K této stránce nemáte přístup. Zkuste se <a href='/login'>přihlásit</a>?",
"404.title": "Stránka nenalezena",
"404.message": "Tato stránka bohužel neexistuje. Vraťte se na <a href='/'>domovskou stránku</a>.",
"500.title": "Neznámá chyba",
"500.message": "Jejda, vypadá to, že se něco pokazilo.",
"register": "Registrovat",
"login": "Přihlásit se",
"please_log_in": "Please Log In",
"logout": "Odhlásit se",
"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"save_changes": "Uložit změny",
"close": "Zrušit",
"pagination": "Pagination",
"header.admin": "Administrace",
"header.recent": "Aktuality",
"header.unread": "Nepřečtené",
"header.popular": "Populární",
"header.users": "Uživatelé",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "Hledat",
"header.profile": "Můj profil",
"notifications.loading": "Načítání upozornění",
"chats.loading": "Načítání grafů",
"motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
"previouspage": "Předchozí stránka",
"nextpage": "Další stránka",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Příspěvky",
"views": "Zobrazení",
"posted": "odesláno",
"in": "v",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Nedávné příspěvky",
"recentips": "Recently Logged In IPs",
"online": "Online",
"away": "Pryč",
"dnd": "Nerušit",
"invisible": "Neviditelný",
"offline": "Offline",
"privacy": "Privacy"
}

View File

@@ -0,0 +1,5 @@
{
"name": "Czech",
"code": "cs",
"dir": "ltr"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Přihlásit se",
"username": "Username / Email",
"password": "Heslo",
"remember_me": "Zapamatovat si mě?",
"forgot_password": "Zapomněli jste heslo?",
"alternative_logins": "Další způsoby přihlášení",
"failed_login_attempt": "Přihlášení se nezdařilo, zkuste to prosím znovu.",
"login_successful": "Přihlášení proběhlo úspěšně!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Chat s <span id=\"chat-with-name\"></span>",
"chat.placeholder": "napište zprávu sem a zmáčkněte enter pro odeslání",
"chat.send": "Odeslat",
"chat.no_active": "Nemáte žádné aktivní konverzace."
}

View File

@@ -0,0 +1,10 @@
{
"title": "Upozornění",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"back_to_home": "Zpět na úvodní stránku",
"outgoing_link": "Odkaz mimo fórum",
"outgoing_link_message": "Nyní opouštíte fórum",
"continue_to": "Přejít na",
"return_to": "Vrátit se na "
}

View File

@@ -0,0 +1,15 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
"user.posts": "Posts made by %1",
"user.topics": "Topics created by %1",
"user.favourites": "%1's Favourite Posts",
"user.settings": "User Settings"
}

View File

@@ -0,0 +1,7 @@
{
"title": "Nedávné",
"day": "Den",
"week": "Týden",
"month": "Měsíc",
"no_recent_topics": "There are no recent topics."
}

View File

@@ -0,0 +1,18 @@
{
"register": "Registrace",
"help.email": "Váš email nebude bez vašeho svolení zveřejněn.",
"help.username_restrictions": "Jedinečné uživatelské jméno dlouhé %1 až %2 znaků. Ostatní uživatelé Vás mohou zmínit jako @<span id='yourUsername'>uživatelské-jméno</span>.",
"help.minimum_password_length": "Délka vašeho hesla musí být alespoň %1 znaků.",
"email_address": "Email",
"email_address_placeholder": "Zadejte email",
"username": "Uživatelské jméno",
"username_placeholder": "Zadejte uživatelské jméno",
"password": "Heslo",
"password_placeholder": "Zadejte heslo",
"confirm_password": "Potvrzení hesla",
"confirm_password_placeholder": "Potvrďte heslo",
"register_now_button": "Zaregistrovat se",
"alternative_registration": "Jiný způsob registrace",
"terms_of_use": "Podmínky",
"agree_to_terms_of_use": "Souhlasím s Podmínkami"
}

View File

@@ -0,0 +1,14 @@
{
"reset_password": "Obnovit heslo",
"update_password": "Upravit heslo",
"password_changed.title": "Heslo změněno",
"password_changed.message": "<p>Heslo bylo úspěšně změněno, <a href=\"/login\">přihlaste se znovu</a> prosím.",
"wrong_reset_code.title": "Špatný kód",
"wrong_reset_code.message": "Byl zadán špatný kód. Zadejte ho prosím znovu, nebo <a href=\"/reset\">si nechte poslat nový</a>.",
"new_password": "Nové heslo",
"repeat_password": "Potvrzení hesla",
"enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
"enter_email_address": "Enter Email Address",
"password_reset_sent": "Obnova hesla odeslána",
"invalid_email": "Špatný email / Email neexistuje!"
}

View File

@@ -0,0 +1,93 @@
{
"topic": "Téma",
"topics": "Témata",
"topic_id": "Topic ID",
"topic_id_placeholder": "Enter topic ID",
"no_topics_found": "Nebyla nalezena žádná témata!",
"no_posts_found": "No posts found!",
"profile": "Profil",
"posted_by": "Odeslal",
"chat": "Chat",
"notify_me": "Sledovat toto téma",
"quote": "Citovat",
"reply": "Odpovědět",
"edit": "Upravit",
"delete": "Smazat",
"restore": "Restore",
"move": "Přesunout",
"fork": "Rozdělit",
"banned": "banned",
"link": "Odkaz",
"share": "Sdílet",
"tools": "Nástroje",
"flag": "Flag",
"bookmark_instructions": "Click here to return to your last position or close to discard.",
"flag_title": "Flag this post for moderation",
"flag_confirm": "Are you sure you want to flag this post?",
"flag_success": "This post has been flagged for moderation.",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"following_topic.title": "Following Topic",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
"not_following_topic.title": "Not Following Topic",
"not_following_topic.message": "You will no longer receive notifications from this topic.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
"watch": "Watch",
"watch.title": "Be notified of new replies in this topic",
"share_this_post": "Share this Post",
"thread_tools.title": "Nástroje",
"thread_tools.markAsUnreadForAll": "Označit jako nepřečtené",
"thread_tools.pin": "Pin Topic",
"thread_tools.unpin": "Unpin Topic",
"thread_tools.lock": "Lock Topic",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.move": "Move Topic",
"thread_tools.fork": "Fork Topic",
"thread_tools.delete": "Delete Topic",
"thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
"thread_tools.restore": "Restore Topic",
"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
"post_delete_confirm": "Are you sure you want to delete this post?",
"post_restore_confirm": "Are you sure you want to restore this post?",
"post_delete_error": "Could not delete this post!",
"post_restore_error": "Could not restore this post!",
"load_categories": "Načítání kategorií",
"disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.",
"confirm_move": "Přesunout",
"confirm_fork": "Rozdělit",
"favourite": "Oblíbené",
"favourites": "Oblíbené",
"favourites.not_logged_in.title": "Přihlaste se!",
"favourites.not_logged_in.message": "Pro oblíbení příspěvku se musíte přihlásit.",
"favourites.has_no_favourites": "Nemáte žádné oblíbené příspěvky, přidejte některý příspěvek k oblíbeným a uvidíte ho zde!",
"vote.not_logged_in.title": "Not Logged In",
"vote.not_logged_in.message": "Please log in in order to vote",
"vote.cant_vote_self.title": "Invalid Vote",
"vote.cant_vote_self.message": "You cannot vote for your own post",
"loading_more_posts": "Načítání více příspěvků",
"move_topic": "Přesunout téma",
"move_post": "Přesunout příspěvek",
"fork_topic": "Rozdělit příspěvek",
"topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
"fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
"fork_no_pids": "Žádné příspěvky nebyly vybrány!",
"fork_success": "Téma bylo úspěšně rozděleno!",
"reputation": "Reputace",
"posts": "Příspěvky",
"composer.title_placeholder": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.help": "Help",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic",
"composer.uploading": "uploading...",
"composer.thumb_url_label": "Paste a topic thumbnail URL",
"composer.thumb_title": "Add a thumbnail to this topic",
"composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file",
"composer.thumb_remove": "Clear fields",
"composer.drag_and_drop_images": "Drag and Drop Images Here",
"composer.upload_instructions": "Upload images by dragging & dropping them."
}

View File

@@ -0,0 +1,6 @@
{
"title": "Unread",
"no_unread_topics": "Nejsou zde žádné nepřečtené témata.",
"mark_all_read": "Označit vše jako přečtené",
"load_more": "Načíst další"
}

View File

@@ -0,0 +1,55 @@
{
"banned": "Banned",
"offline": "Offline",
"username": "Uživatelské jméno",
"email": "Email",
"fullname": "Jméno a příjmení",
"website": "Webové stránky",
"location": "Poloha",
"age": "Věk",
"joined": "Registrován",
"lastonline": "Naposledy online",
"profile": "Profile",
"profile_views": "Zobrazení profilu",
"reputation": "Reputace",
"posts": "Příspěvky",
"favourites": "Oblíbené",
"followers": "Sledují ho",
"following": "Sleduje",
"signature": "Podpis",
"gravatar": "Gravatar",
"birthday": "Datum narození",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"change_picture": "Změnit obrázek",
"edit": "Upravit",
"uploaded_picture": "Nahraný obrázek",
"upload_new_picture": "Nahrát nový obrázek",
"current_password": "Current Password",
"change_password": "Změnit heslo",
"change_password_error": "Invalid Password!",
"change_password_error_wrong_current": "Your current password is not correct!",
"change_password_error_length": "Password too short!",
"change_password_error_match": "Passwords must match!",
"change_password_error_privileges": "You are not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "Potvrzení hesla",
"password": "Heslo",
"upload_picture": "Nahrát obrázek",
"upload_a_picture": "Nahrát obrázek",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Nastavení",
"show_email": "Zobrazovat můj email v profilu",
"has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
"follows_no_one": "Tento uživatel nikoho nesleduje :(",
"has_no_posts": "This user didn't post anything yet.",
"has_no_topics": "This user didn't post any topics yet.",
"email_hidden": "Skrytý email",
"hidden": "skrytý",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.",
"topics_per_page": "Topics per Page",
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification."
}

View File

@@ -0,0 +1,9 @@
{
"latest_users": "Nejnovější uživatelé",
"top_posters": "Nejaktivnější",
"most_reputation": "Nejváženější",
"online": "Online",
"search": "Vyhledávat",
"enter_username": "Zadej uživatelské jméno k hledání",
"load_more": "Načíst další"
}

View File

@@ -0,0 +1,12 @@
{
"new_topic_button": "Neues Thema",
"no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
"posts": "Beiträge",
"views": "Aufrufe",
"posted": "Geschrieben",
"browsing": "Aktiv",
"no_replies": "Niemand hat geantwortet",
"replied": "geantwortet",
"last_edited_by": "zuletzt editiert durch",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Benutzer",
"stats.topics": "Themen",
"stats.posts": "Beiträge",
"success": "Erfolg"
}

View File

@@ -0,0 +1,55 @@
{
"home": "Übersicht",
"search": "Suche",
"buttons.close": "Schließen",
"403.title": "Zugriff Verweigert",
"403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. <a href='/login'>Logge dich ein</a> und versuche es erneut.",
"404.title": " Nicht Gefunden",
"404.message": "Die abgefragte Seite wurde nicht gefunden. <a href='/''>Zurück zur Übersicht</a>.",
"500.title": "Interner Fehler.",
"500.message": "Ups! Scheint als wäre etwas schief gelaufen!",
"register": "Registrierung",
"login": "Login",
"please_log_in": "Bitte einloggen",
"logout": "Logout",
"posting_restriction_info": "Nur registrierte Mitglieder dürfen Beiträge verfassen. Hier klicken zum Einloggen.",
"welcome_back": "Willkommen zurück",
"you_have_successfully_logged_in": "Du hast dich erfolgreich eingeloggt",
"save_changes": "Speichere Änderungen",
"close": "Schließen",
"pagination": "Seitennummerierung",
"header.admin": "Admin",
"header.recent": "Aktuell",
"header.unread": "Ungelesen",
"header.popular": "Beliebt",
"header.users": "Benutzer",
"header.chats": "Chats",
"header.notifications": "Benachrichtigungen",
"header.search": "Suche",
"header.profile": "Profil",
"notifications.loading": "Benachrichtigungen laden",
"chats.loading": "Nachrichten werden geladen",
"motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
"previouspage": "Vorherige Seite",
"nextpage": "Nächste Seite",
"alert.success": "Erfolg",
"alert.error": "Fehler",
"alert.banned": "Gebannt",
"alert.banned.message": "Du bist gebannt und wirst nun ausgeloggt.",
"alert.unfollow": "Du folgst %1 nicht länger!",
"alert.follow": "Du folgst nun %1!",
"posts": "Beiträge",
"views": "Aufrufe",
"posted": "geposted",
"in": "in",
"norecentposts": "Keine aktuellen Beiträge",
"norecenttopics": "Keine aktuellen Themen",
"recentposts": "Aktuelle Beiträge",
"recentips": "Zuletzt eingeloggte IPs",
"online": "Online",
"away": "Abwesend",
"dnd": "Nicht stören",
"invisible": "Unsichtbar",
"offline": "Offline",
"privacy": "Privatsphäre"
}

View File

@@ -0,0 +1,5 @@
{
"name": "German",
"code": "de",
"dir": "ltr"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Einloggen",
"username": "Nutzername / E-Mail Adresse",
"password": "Passwort",
"remember_me": "Eingeloggt bleiben?",
"forgot_password": "Passwort vergessen?",
"alternative_logins": "Login Alternativen",
"failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.",
"login_successful": "Du hast dich erfolgreich eingeloggt!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
"chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
"chat.send": "Senden",
"chat.no_active": "Du hast keine aktiven Chats."
}

View File

@@ -0,0 +1,10 @@
{
"title": "Benachrichtigungen",
"no_notifs": "Du hast keine neuen Benachrichtigungen",
"see_all": "Alle Benachrichtigungen ansehen",
"back_to_home": "Zurück zur Startseite",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun",
"continue_to": "Gehe weiter zu",
"return_to": "Kehre zurück zu"
}

View File

@@ -0,0 +1,15 @@
{
"home": "Home",
"unread": "Ungelesene Themen",
"popular": "Beliebte Themen",
"recent": "Neueste Topics",
"users": "Registrierte User",
"notifications": "Benachrichtigungen",
"user.edit": "Bearbeite \"%1\"",
"user.following": "User %1 folgen",
"user.followers": "User die folgen %1",
"user.posts": "Beiträge von %1",
"user.topics": "Topics created by %1",
"user.favourites": "%1's favorisierte Beiträge",
"user.settings": "User Einstellungen"
}

View File

@@ -0,0 +1,7 @@
{
"title": "Aktuell",
"day": "Tag",
"week": "Woche",
"month": "Monat",
"no_recent_topics": "Es gibt keine aktuellen Themen."
}

View File

@@ -0,0 +1,18 @@
{
"register": "Registrieren",
"help.email": "Deine E-Mail Adresse ist standardmäßig nicht öffentlich sichtbar.",
"help.username_restrictions": "Einen einmaligen Benutzernamen. 3-16 Zeichen. Andere Benutzer können dich mit @<span id='yourUsername'>Benutzername</span> anschreiben.",
"help.minimum_password_length": "Dein Passwort muss mindestens sechs Zeichen lang sein.",
"email_address": "E-Mail",
"email_address_placeholder": "E-Mail Adresse hier eingeben",
"username": "Benutzername",
"username_placeholder": "Benutzernamen eingeben",
"password": "Passwort",
"password_placeholder": "Passwort eingeben",
"confirm_password": "Passwort bestätigen",
"confirm_password_placeholder": "Passwort zur Bestätigung erneut eingeben",
"register_now_button": "Jetzt registrieren",
"alternative_registration": "Alternative Registrierung",
"terms_of_use": "Nutzungsbedingungen",
"agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu"
}

View File

@@ -0,0 +1,14 @@
{
"reset_password": "Passwort zurücksetzen",
"update_password": "Ändere Passwort",
"password_changed.title": "Passwort geändert",
"password_changed.message": "<p>Passwort erfolgreich zurückgesetzt. Bitte <a href=\"/login\">logge dich erneut ein</a>.",
"wrong_reset_code.title": "Der Reset-Code ist falsch.",
"wrong_reset_code.message": "Der empfangene Reset-Code war falsch. Bitte versuche es erneut oder <a href=\"/reset\">fordere einen neuen Code an</a>.",
"new_password": "Neues Passwort",
"repeat_password": "Wiederhole das Passwort",
"enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
"enter_email_address": "E-Mail Adresse eingeben",
"password_reset_sent": "Passwortzrücksetzung beantragt.",
"invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
}

View File

@@ -0,0 +1,93 @@
{
"topic": "Thema",
"topics": "Themen",
"topic_id": "Topic ID",
"topic_id_placeholder": "Topic ID eingeben",
"no_topics_found": "Keine passende Themen gefunden.",
"no_posts_found": "Keine Beiträge gefunden!",
"profile": "Profil",
"posted_by": "Geposted von",
"chat": "Chat",
"notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.",
"quote": "zitieren",
"reply": "antworten",
"edit": "bearbeiten",
"delete": "löschen",
"restore": "Wiederherstellen",
"move": "Verschieben",
"fork": "Aufspalten",
"banned": "gesperrt",
"link": "Link",
"share": "Teilen",
"tools": "Tools",
"flag": "Markieren",
"bookmark_instructions": "Klicke hier um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
"flag_title": "Diesen Beitrag zur Moderation markieren",
"flag_confirm": "Sind Sie sicher, dass Sie diesen Post markieren möchten?",
"flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
"deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können ihn sehen.",
"following_topic.title": "Thema wird gefolgt",
"following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
"not_following_topic.title": "Thema nicht gefolgt",
"not_following_topic.message": "Du erhälst keine weiteren Benachrichtigungen zu diesem Thema.",
"login_to_subscribe": "Bitte registrieren oder einloggen um dieses Thema zu abonnieren",
"markAsUnreadForAll.success": "Thema für Alle als ungelesen markiert.",
"watch": "Beobachten",
"watch.title": "Bei neuen Antworten benachrichtigen",
"share_this_post": "Diesen Beitrag teilen",
"thread_tools.title": "Tools",
"thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
"thread_tools.pin": "Thema anpinnen",
"thread_tools.unpin": "Thema nicht mehr anpinnen",
"thread_tools.lock": "Thema schließen",
"thread_tools.unlock": "Thema öffnen",
"thread_tools.move": "Thema verschieben",
"thread_tools.fork": "Thema aufspalten",
"thread_tools.delete": "Thema löschen",
"thread_tools.delete_confirm": "Sind Sie sicher, dass Sie dieses Thema löschen möchten?",
"thread_tools.restore": "Thema wiederherstellen",
"thread_tools.restore_confirm": "Sind Sie sicher, dass Sie dieses Thema wiederherstellen möchten?",
"post_delete_confirm": "Sind Sie sicher, dass Sie diesen Beitrag löschen möchten?",
"post_restore_confirm": "Sind Sie sicher, dass Sie diesen Beitrag wiederherstellen möchten?",
"post_delete_error": "Beitrag konnte nicht gelöscht werden!",
"post_restore_error": "Beitrag konnte nicht wiederhergestellt werden!",
"load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "Verschieben",
"confirm_fork": "Aufspalten",
"favourite": "Favorit",
"favourites": "Favoriten",
"favourites.not_logged_in.title": "Nicht eingeloggt!",
"favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
"favourites.has_no_favourites": "Du hast noch keine Favoriten.",
"vote.not_logged_in.title": "Nicht eingeloggt",
"vote.not_logged_in.message": "Zum Bewerten bitte einloggen",
"vote.cant_vote_self.title": "Ungültige Bewertung",
"vote.cant_vote_self.message": "Du kannst deinen eigenen Beitrag nicht bewerten",
"loading_more_posts": "Lade Mehr Posts",
"move_topic": "Thema verschieben",
"move_post": "Beitrag verschieben",
"fork_topic": "Thema aufspalten",
"topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
"fork_topic_instruction": "Klicke auf die Posts, die du aufspalten willst",
"fork_no_pids": "Keine Beiträge ausgewählt!",
"fork_success": "Thema erfolgreich aufgespalten!",
"reputation": "Reputation",
"posts": "Beiträge",
"composer.title_placeholder": "Hier den Titel des Themas eingeben...",
"composer.write": "Schreiben",
"composer.preview": "Vorschau",
"composer.help": "Hilfe",
"composer.discard": "Verwerfen",
"composer.submit": "Absenden",
"composer.replying_to": "Als Antwort auf",
"composer.new_topic": "Neues Thema",
"composer.uploading": "Upload läuft...",
"composer.thumb_url_label": "Vorschaubild-URL hier einfügen",
"composer.thumb_title": "Vorschaubild zu diesem Thema hinzufügen",
"composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Oder eine Datei hochladen",
"composer.thumb_remove": "Felder leeren",
"composer.drag_and_drop_images": "Bilder hier reinziehen",
"composer.upload_instructions": "Zum Hochladen Bilder hier reinziehen."
}

View File

@@ -0,0 +1,6 @@
{
"title": "Ungelesen",
"no_unread_topics": "Es gibt keine ungelesenen Themen.",
"mark_all_read": "alle als gelesen markieren",
"load_more": "mehr laden"
}

View File

@@ -0,0 +1,55 @@
{
"banned": "Gebannt",
"offline": "offline",
"username": "Nutzername",
"email": "E-Mail",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
"age": "Alter",
"joined": "Beigetreten",
"lastonline": "Zuletzt online",
"profile": "Profil",
"profile_views": "Profilaufrufe",
"reputation": "Reputation",
"posts": "Posts",
"favourites": "Favoriten",
"followers": "Follower",
"following": "Folgt",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Geburtstag",
"chat": "Chat",
"follow": "Folgen",
"unfollow": "Nicht mehr folgen",
"change_picture": "Ändere Profilbild",
"edit": "Ändern",
"uploaded_picture": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen",
"current_password": "Aktuelles Passwort",
"change_password": "Ändere Passwort",
"change_password_error": "Ungültiges Passwort!",
"change_password_error_wrong_current": "Ihr derzeitiges Passwort ist ungültig!",
"change_password_error_length": "Passwort zu kurz!",
"change_password_error_match": "Passworte müssen übereinstimmen!",
"change_password_error_privileges": "Sie haben nicht die Berechtigungen dieses Passwort zu ändern.",
"change_password_success": "Ihr Passwort wurde aktualisiert!",
"confirm_password": "Passwort wiederholen",
"password": "Passwort",
"upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen",
"image_spec": "Sie dürfen nur Dateien vom Typ PNG, JPG oder GIF hochladen",
"max": "max.",
"settings": "Einstellungen",
"show_email": "Zeige meine E-Mail Adresse an.",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden.",
"has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
"has_no_topics": "This user didn't post any topics yet.",
"email_hidden": "E-Mail Adresse versteckt",
"hidden": "versteckt",
"paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verweden",
"topics_per_page": "Themen pro Seite",
"posts_per_page": "Beiträge pro Seite",
"notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte."
}

View File

@@ -0,0 +1,9 @@
{
"latest_users": "neuste Benutzer",
"top_posters": "meiste Beiträge",
"most_reputation": "höhstes Ansehen",
"online": "Online",
"search": "Suchen",
"enter_username": "Benutzer durchsuchen",
"load_more": "mehr laden"
}

View File

@@ -0,0 +1,12 @@
{
"new_topic_button": "New Topic",
"no_topics": "<strong>Thar be no topics in 'tis category.</strong><br />Why don't ye give a go' postin' one?",
"posts": "messages",
"views": "views",
"posted": "sent",
"browsing": "browsin'",
"no_replies": "No one has replied to ye message",
"replied": "replied",
"last_edited_by": "last edited by",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Mates",
"stats.topics": "Topics",
"stats.posts": "Messages",
"success": "success"
}

View File

@@ -0,0 +1,55 @@
{
"home": "Home Port",
"search": "Finderer",
"buttons.close": "Shoot down",
"403.title": "Not Enough Booty Power",
"403.message": "Ye seem to have stumbled upon a page that ye do not have access to. Perhaps ye <a href='/login'>give a go' loggin' in</a>?",
"404.title": "T'ere be nut'in 'ere",
"404.message": "Ye seem to have stumbled upon a page that does not exist. Return to th' <a href='/'>home page</a>",
"500.title": "Broken beam.",
"500.message": "Looks like we've got somethin' in th' sails.",
"register": "Register",
"login": "Login",
"please_log_in": "Please Log In",
"logout": "Logout",
"posting_restriction_info": "Postin' be currently restricted to registered members only, click here to log in.",
"welcome_back": "Welcome to Port",
"you_have_successfully_logged_in": "Ye have successfully logged in",
"save_changes": "Save yer Changes",
"close": "Shoot down",
"pagination": "Pagination",
"header.admin": "Captains only",
"header.recent": "Recent",
"header.unread": "Undiscovered",
"header.popular": "Famous",
"header.users": "Mates",
"header.chats": "Yik-Yaks",
"header.notifications": "Parrot Calls",
"header.search": "Finderer",
"header.profile": "Bunk",
"notifications.loading": "Fetching yer Parrot Calls",
"chats.loading": "Loading Yik-Yaks",
"motd.welcome": "Welcome to NodeBB, th' discussion platform 'o th' future.",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Somethin' broke",
"alert.banned": "Exiled",
"alert.banned.message": "Ye be banned ye gunna be logged out!",
"alert.unfollow": "Ye be no longer stalkin' %1!",
"alert.follow": "Ye be stalkin' %1",
"posts": "Messages",
"views": "Views",
"posted": "posted",
"in": "in",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Messages",
"recentips": "Recently Logged In IPs",
"online": "Available",
"away": "Out to sea",
"dnd": "Do not Disturb",
"invisible": "Magic usin'",
"offline": "Dead",
"privacy": "Privacy"
}

View File

@@ -0,0 +1,5 @@
{
"name": "English (Pirate)",
"code": "en@pirate",
"dir": "ltr"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Login",
"username": "Yer handle or email",
"password": "Secret Combination",
"remember_me": "Remember Me?",
"forgot_password": "My mind be a scatt'rbrain, help a matey out!",
"alternative_logins": "Oth'r gangplanks",
"failed_login_attempt": "Failed login attempt, please give it a go' again.",
"login_successful": "Welcome on board, matey!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Letters from <span id=\"chat-with-name\"></span>",
"chat.placeholder": "Yer message goes here, hit enter to send 'er off",
"chat.send": "Send Parrot",
"chat.no_active": "Ye be a lonely sailor."
}

View File

@@ -0,0 +1,10 @@
{
"title": "Notifications",
"no_notifs": "You have no new notifications",
"see_all": "Spy wit' ye eye all ye notifications",
"back_to_home": "Take me back!",
"outgoing_link": "Go offshore",
"outgoing_link_message": "Ye be goin' offshore",
"continue_to": "Continue to",
"return_to": "Return to"
}

View File

@@ -0,0 +1,15 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
"user.posts": "Posts made by %1",
"user.topics": "Topics created by %1",
"user.favourites": "%1's Favourite Posts",
"user.settings": "User Settings"
}

View File

@@ -0,0 +1,7 @@
{
"title": "Recent",
"day": "Day",
"week": "Week",
"month": "Month",
"no_recent_topics": "There be no recent topics."
}

View File

@@ -0,0 +1,18 @@
{
"register": "Board the ship",
"help.email": "By default, your email will be hidden from the public.",
"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
"help.minimum_password_length": "Your password's length must be at least %1 characters.",
"email_address": "Email Address",
"email_address_placeholder": "Enter Email Address",
"username": "Username",
"username_placeholder": "Enter Username",
"password": "Password",
"password_placeholder": "Enter Password",
"confirm_password": "Confirm Password",
"confirm_password_placeholder": "Confirm Password",
"register_now_button": "Register Now",
"alternative_registration": "Alternative Registration",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

View File

@@ -0,0 +1,14 @@
{
"reset_password": "Reset Password",
"update_password": "Update Password",
"password_changed.title": "Password Changed",
"password_changed.message": "<p>Password successfully reset, please <a href=\"/login\">log in again</a>.",
"wrong_reset_code.title": "Incorrect Reset Code",
"wrong_reset_code.message": "The reset code received was incorrect. Please try again, or <a href=\"/reset\">request a new reset code</a>.",
"new_password": "New Password",
"repeat_password": "Confirm Password",
"enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
"enter_email_address": "Enter Email Address",
"password_reset_sent": "Password Reset Sent",
"invalid_email": "Invalid Email / Email does not exist!"
}

View File

@@ -0,0 +1,93 @@
{
"topic": "Topic",
"topics": "Topics",
"topic_id": "Topic ID",
"topic_id_placeholder": "Enter topic ID",
"no_topics_found": "No topics found!",
"no_posts_found": "No posts found!",
"profile": "Profile",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"restore": "Restore",
"move": "Move",
"fork": "Fork",
"banned": "banned",
"link": "Link",
"share": "Share",
"tools": "Tools",
"flag": "Flag",
"bookmark_instructions": "Click here to return to your last position or close to discard.",
"flag_title": "Flag this post for moderation",
"flag_confirm": "Are you sure you want to flag this post?",
"flag_success": "This post has been flagged for moderation.",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"following_topic.title": "Following Topic",
"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
"not_following_topic.title": "Not Following Topic",
"not_following_topic.message": "You will no longer receive notifications from this topic.",
"login_to_subscribe": "Please register or log in in order to subscribe to this topic.",
"markAsUnreadForAll.success": "Topic marked as unread for all.",
"watch": "Watch",
"watch.title": "Be notified of new replies in this topic",
"share_this_post": "Share this Post",
"thread_tools.title": "Thread Tools",
"thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Pin Topic",
"thread_tools.unpin": "Unpin Topic",
"thread_tools.lock": "Lock Topic",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.move": "Move Topic",
"thread_tools.fork": "Fork Topic",
"thread_tools.delete": "Delete Topic",
"thread_tools.delete_confirm": "Are you sure you want to delete this thread?",
"thread_tools.restore": "Restore Topic",
"thread_tools.restore_confirm": "Are you sure you want to restore this thread?",
"post_delete_confirm": "Are you sure you want to delete this post?",
"post_restore_confirm": "Are you sure you want to restore this post?",
"post_delete_error": "Could not delete this post!",
"post_restore_error": "Could not restore this post!",
"load_categories": "Loading Categories",
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"confirm_fork": "Fork",
"favourite": "Favourite",
"favourites": "Favourites",
"favourites.not_logged_in.title": "Not Logged In",
"favourites.not_logged_in.message": "Please log in in order to favourite this post",
"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
"vote.not_logged_in.title": "Not Logged In",
"vote.not_logged_in.message": "Please log in in order to vote",
"vote.cant_vote_self.title": "Invalid Vote",
"vote.cant_vote_self.message": "You cannot vote for your own post",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_post": "Move Post",
"fork_topic": "Fork Topic",
"topic_will_be_moved_to": "This topic will be moved to the category",
"fork_topic_instruction": "Click the posts you want to fork",
"fork_no_pids": "No posts selected!",
"fork_success": "Succesfully forked topic!",
"reputation": "Reputation",
"posts": "Posts",
"composer.title_placeholder": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.help": "Help",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic",
"composer.uploading": "uploading...",
"composer.thumb_url_label": "Paste a topic thumbnail URL",
"composer.thumb_title": "Add a thumbnail to this topic",
"composer.thumb_url_placeholder": "http://example.com/thumb.png",
"composer.thumb_file_label": "Or upload a file",
"composer.thumb_remove": "Clear fields",
"composer.drag_and_drop_images": "Drag and Drop Images Here",
"composer.upload_instructions": "Upload images by dragging & dropping them."
}

View File

@@ -0,0 +1,6 @@
{
"title": "Unread",
"no_unread_topics": "There be no unread topics.",
"mark_all_read": "I seen 'em all!",
"load_more": "Giv'er more"
}

View File

@@ -0,0 +1,55 @@
{
"banned": "Blackmarked",
"offline": "Asleep at the wheel",
"username": "User Name",
"email": "Email",
"fullname": "Full Name",
"website": "Website",
"location": "Location",
"age": "Age",
"joined": "Joined",
"lastonline": "Last Online",
"profile": "Profile",
"profile_views": "Profile views",
"reputation": "Reputation",
"posts": "Posts",
"favourites": "Favourites",
"followers": "Followers",
"following": "Following",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Birthday",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"change_picture": "Change Picture",
"edit": "Edit",
"uploaded_picture": "Uploaded Picture",
"upload_new_picture": "Upload New Picture",
"current_password": "Current Password",
"change_password": "Change Password",
"change_password_error": "Invalid Password!",
"change_password_error_wrong_current": "Your current password is not correct!",
"change_password_error_length": "Password too short!",
"change_password_error_match": "Passwords must match!",
"change_password_error_privileges": "You are not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "Confirm Password",
"password": "Password",
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Settings",
"show_email": "Show My Email",
"has_no_follower": "This user doesn't have any followers :(",
"follows_no_one": "This user isn't following anyone :(",
"has_no_posts": "This user didn't post anything yet.",
"has_no_topics": "This user didn't post any topics yet.",
"email_hidden": "Email Hidden",
"hidden": "hidden",
"paginate_description": "Paginate topics and posts instead of using infinite scroll.",
"topics_per_page": "Topics per Page",
"posts_per_page": "Posts per Page",
"notification_sounds": "Play a sound when you receive a notification."
}

View File

@@ -0,0 +1,9 @@
{
"latest_users": "Land lubbers",
"top_posters": "Top mateys",
"most_reputation": "Most Reputation",
"online": "Online",
"search": "Search",
"enter_username": "Gimme y'er handle",
"load_more": "Load More"
}

View File

@@ -0,0 +1,12 @@
{
"new_topic_button": "New Topic",
"no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
"posts": "posts",
"views": "views",
"posted": "posted",
"browsing": "browsing",
"no_replies": "No one has replied",
"replied": "replied",
"last_edited_by": "last edited by",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,20 @@
{
"invalid-data": "Invalid Data",
"not-logged-in": "You don't seem to be logged in, so you cannot reply.",
"invalid-cid": "Invalid Category ID",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-privileges": "You don't have enough privileges for this action.",
"topic-locked": "Topic Locked",
"still-uploading" : "Please wait for uploads to complete.",
"content-too-short" : "Please enter a longer post. At least %1 characters.",
"title-too-short" : "Please enter a longer title. At least %1 characters.",
"title-too-long" : "Please enter a shorter title. Titles can't be longer than %1 characters.",
"too-many-posts" : "You can only post every %1 seconds.'",
"file-too-big" : "Maximum allowed file size is %1 kbs"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Users",
"stats.topics": "Topics",
"stats.posts": "Posts",
"success": "success"
}

View File

@@ -0,0 +1,73 @@
{
"home": "Home",
"search": "Search",
"buttons.close": "Close",
"403.title": "Access Denied",
"403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should <a href='/login'>try logging in</a>?",
"404.title": "Not Found",
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='/'>home page</a>.",
"500.title": "Internal error.",
"500.message": "Oops! Looks like something went wrong!",
"register": "Register",
"login": "Login",
"please_log_in": "Please Log In",
"logout": "Logout",
"posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
"welcome_back": "Welcome Back ",
"you_have_successfully_logged_in": "You have successfully logged in",
"save_changes": "Save Changes",
"close": "Close",
"pagination": "Pagination",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.popular": "Popular",
"header.users": "Users",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "Search",
"header.profile": "Profile",
"notifications.loading": "Loading Notifications",
"chats.loading": "Loading Chats",
"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Posts",
"recentips": "Recently Logged In IPs",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline",
"privacy": "Privacy"
}

View File

@@ -0,0 +1,5 @@
{
"name": "English (United Kingdom/Canada)",
"code": "en_GB",
"dir": "ltr"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Login",
"username": "Username / Email",
"password": "Password",
"remember_me": "Remember Me?",
"forgot_password": "Forgot Password?",
"alternative_logins": "Alternative Logins",
"failed_login_attempt": "Failed login attempt, please try again.",
"login_successful": "You have successfully logged in!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
"chat.placeholder": "type chat message here, press enter to send",
"chat.send": "Send",
"chat.no_active": "You have no active chats."
}

View File

@@ -0,0 +1,11 @@
{
"title": "Notifications",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"back_to_home": "Back to NodeBB",
"outgoing_link": "Outgoing Link",
"outgoing_link_message": "You are now leaving",
"continue_to": "Continue to",
"return_to": "Return to "
}

View File

@@ -0,0 +1,15 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"user.edit": "Editing \"%1\"",
"user.following": "People %1 Follows",
"user.followers": "People who Follow %1",
"user.posts": "Posts made by %1",
"user.topics": "Topics created by %1",
"user.favourites": "%1's Favourite Posts",
"user.settings": "User Settings"
}

View File

@@ -0,0 +1,7 @@
{
"title": "Recent",
"day": "Day",
"week": "Week",
"month": "Month",
"no_recent_topics": "There are no recent topics."
}

View File

@@ -0,0 +1,18 @@
{
"register": "Register",
"help.email": "By default, your email will be hidden from the public.",
"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
"help.minimum_password_length": "Your password's length must be at least %1 characters.",
"email_address": "Email Address",
"email_address_placeholder": "Enter Email Address",
"username": "Username",
"username_placeholder": "Enter Username",
"password": "Password",
"password_placeholder": "Enter Password",
"confirm_password": "Confirm Password",
"confirm_password_placeholder": "Confirm Password",
"register_now_button": "Register Now",
"alternative_registration": "Alternative Registration",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

Some files were not shown because too many files have changed in this diff Show More