Compare commits

...

2609 Commits

Author SHA1 Message Date
Julian Lam
b85261e2bf why did the shrinkwrap file get deleted? 2014-09-17 09:43:55 -04:00
Julian Lam
4c289a63b9 updating shrinkwrap file 2014-09-16 10:27:37 -04:00
Julian Lam
5b3a2b951b Merge branch 'master' into v0.5.x 2014-09-16 10:26:16 -04:00
Julian Lam
963428174b fixed #2091 2014-09-16 09:18:21 -04:00
Julian Lam
52bb7ebe52 0.5.0 2014-09-15 22:12:12 -04:00
Julian Lam
6ade1e858d updating default config so the site title is shown 2014-09-15 22:10:32 -04:00
Julian Lam
d80d4df80d 0.5.0 2014-09-15 22:10:09 -04:00
Julian Lam
d721e96226 updated shrinkwrap file 2014-09-15 22:10:00 -04:00
Julian Lam
af4881c695 updating default config so the site title is shown 2014-09-15 22:09:41 -04:00
Julian Lam
fb6b6243f2 Merge branch 'master' into v0.5.x 2014-09-15 21:39:17 -04:00
Julian Lam
6bb924f25a removed theme-rocket folder, closed #2076 2014-09-14 15:24:39 -04:00
barisusakli
6bde9a1656 prevent getTopicsByTids crash if a topic is null 2014-09-13 19:33:09 -04:00
barisusakli
ae02c1a06c closes #2068 2014-09-10 18:48:43 -04:00
barisusakli
25ed131b13 show stack trace of error 2014-09-10 13:04:57 -04:00
barisusakli
e9798028de show error 2014-09-09 22:10:17 -04:00
barisusakli
5696ea2396 check errors on decodeURIComponent 2014-09-09 22:09:27 -04:00
barisusakli
0b79a73732 crash fix
if composer is opened in a topic that was deleted/purged
2014-09-01 17:24:23 -04:00
Barış Soner Uşaklı
43ca61de8c Update README.md 2014-09-01 14:42:11 -04:00
barisusakli
6c2ae0302d closes #2030 2014-09-01 13:29:49 -04:00
barisusakli
537dea4e4b crash fix 2014-08-30 14:42:48 -04:00
barisusakli
87c8cd2fb0 another crash fix 2014-08-30 11:56:29 -04:00
barisusakli
73bef8168f another crash fix 2014-08-30 11:54:43 -04:00
barisusakli
0473e7f25b crash fix 2014-08-30 11:50:45 -04:00
barisusakli
5f2380fdcd dont display all categories 2014-08-29 14:08:13 -04:00
Julian Lam
fa545c5bfd 0.5.0-4
Conflicts:
	package.json
2014-08-28 21:14:37 -04:00
Julian Lam
cc9b5d65fc 0.5.0-4 2014-08-28 21:05:15 -04:00
Julian Lam
2d7132d9d3 updated shrinkwrap file 2014-08-28 21:05:00 -04:00
Julian Lam
50d5be1b0e Merge branch 'master' into v0.5.x 2014-08-28 20:56:39 -04:00
psychobunny
ad00c3cb50 updating font path 2014-08-28 14:29:22 -04:00
psychobunny
20da1b37a5 updating fontawesome, closes #2024 2014-08-28 14:29:09 -04:00
psychobunny
8f3f409e0f documentation status badge 2014-08-27 16:27:55 -04:00
psychobunny
4384958bf2 passwords can now contain spaces 2014-08-26 15:05:42 -04:00
psychobunny
6a4bcf8ab8 fixed password error message 2014-08-26 14:57:20 -04:00
psychobunny
1f6f2c13d5 apparently this was confusing 2014-08-26 11:35:54 -04:00
Julian Lam
ff38394f96 latest translations 2014-08-26 10:32:16 -04:00
barisusakli
b856ddb98f closes #2018 2014-08-25 19:59:03 -04:00
barisusakli
e751a0c0cf closes #2003 2014-08-24 12:58:13 -04:00
Julian Lam
851ebc2a6e more translations... heh 2014-08-23 19:10:21 -04:00
Julian Lam
36752f94dc latest translations 2014-08-23 14:15:38 -04:00
Julian Lam
5424f63b9e 0.5.0-3 2014-08-20 18:06:04 -04:00
Julian Lam
f087acfe54 updated shrinkwrap file 2014-08-20 18:05:14 -04:00
Julian Lam
f2332b0af6 Merge branch 'master' into v0.5.x 2014-08-20 18:02:35 -04:00
psychobunny
2ced285f89 closes #2004 2014-08-20 14:21:23 -04:00
psychobunny
91e29d7bb2 updated latest templates.js 2014-08-20 14:08:14 -04:00
psychobunny
eed57603ef templates.js 0.0.10 2014-08-19 13:29:27 -04:00
psychobunny
6d580df8b1 temporarily dropping templates.js to 0.0.8, closes #2001 2014-08-19 13:28:48 -04:00
Julian Lam
74e5524492 fixing request to /api not returning api result 2014-08-18 13:44:27 -04:00
psychobunny
4dd32e1024 filter:category.get applies to all category-like API calls now
@a5mith
https://gist.github.com/psychobunny/572d867935469774c6e8#comment-1281883
2014-08-18 13:05:20 -04:00
Julian Lam
dd5424ff38 Merge pull request #1997 from nchase/patch-1
fix link to travis-ci build in README.md
2014-08-18 00:03:39 -04:00
nchase
01f5acea9b fix link to travis-ci build in README.md 2014-08-17 23:34:08 -04:00
Julian Lam
e19e6cd3f0 Merge pull request #1961 from RefinedSoftwareLLC/patch-4
Corrected node.js version requirement.
2014-08-17 11:28:55 -04:00
Barış Soner Uşaklı
02889f2e70 call callback on follow/unfollow 2014-08-17 01:29:20 -04:00
barisusakli
a9ca035e1e gotto check read after each pass 2014-08-15 18:15:10 -04:00
psychobunny
e097ac1fa7 latest templates.js 2014-08-15 17:26:49 -04:00
barisusakli
b50b5e4787 satifying my OCD
fire hook after successful follow/unfollow
2014-08-14 17:59:33 -04:00
psychobunny
0c17ee15f7 action:user.follow and action:user.unfollow 2014-08-14 17:52:17 -04:00
psychobunny
1036ba4636 removing timestamp from thread hooks... completely pointless 2014-08-14 17:47:05 -04:00
barisusakli
2d0637d7c6 fix user online status on profile page 2014-08-14 07:51:21 -04:00
barisusakli
dda0322968 getUsersInCategory 2014-08-13 18:44:40 -04:00
Julian Lam
a2fb4a66b0 migrated ACP themes page from html rendered via js to template engine 2014-08-13 16:55:41 -04:00
psychobunny
5bf9c6db7b closes #1975 2014-08-13 16:28:18 -04:00
psychobunny
544afd4e4c importing latest templates.js client-side 2014-08-13 16:27:29 -04:00
barisusakli
1a97302d68 fix double anchors around images
if the image is already inside an anchor dont wrap again
2014-08-13 16:25:34 -04:00
Julian Lam
b48571ceb8 fixed #1988 2014-08-13 16:03:33 -04:00
barisusakli
0847eb2c3d added uid to filter:header.build 2014-08-13 15:32:31 -04:00
barisusakli
b16932a676 check mainPid 2014-08-12 15:08:42 -04:00
barisusakli
c358ff3d83 fix isSortedSetMembers on mongo 2014-08-12 14:39:58 -04:00
Julian Lam
4fa80263b0 fixed #1981 2014-08-12 14:15:01 -04:00
Julian Lam
cf6acf6b41 sacrificing a goat to ensure this doesn't come back to bite me 2014-08-12 14:02:40 -04:00
Julian Lam
5936c72f96 further fix to #1957 2014-08-12 13:57:30 -04:00
barisusakli
1cf5c3145a doing it properly this time
mainPost always has index 0
2014-08-12 12:32:38 -04:00
barisusakli
8584da75f2 reverted main post change, breaks indices 2014-08-12 11:49:28 -04:00
barisusakli
32d46f3889 crash fix 2014-08-12 11:41:18 -04:00
barisusakli
851d5c0f32 send uids to isOnline in messaging 2014-08-12 11:36:36 -04:00
barisusakli
c07d9121df small optimizations
user.isOnline works with an array of uids
do not make 2 trips to db to get main post and first 10 posts
2014-08-12 11:19:17 -04:00
Julian Lam
c818a37f0f possible fix for #1981 2014-08-12 09:56:04 -04:00
Julian Lam
0e28b6f2d5 fixed #1980 -- missing pass-through 2014-08-12 09:17:41 -04:00
barisusakli
c4b083330c closes #1978 2014-08-11 18:07:56 -04:00
barisusakli
c8084e9b2e closes #1978 2014-08-11 16:26:20 -04:00
barisusakli
5e68e0b009 same deal as previous commit 2014-08-11 15:41:45 -04:00
barisusakli
e137baccd9 fixed ip:recent weird 2014-08-11 13:47:24 -04:00
barisusakli
c991997552 removed off from search button 2014-08-11 12:16:01 -04:00
barisusakli
7642be3608 closes #1939 2014-08-10 14:52:23 -04:00
barisusakli
53d20cf058 parse variables before rendering widgets 2014-08-09 21:05:59 -04:00
barisusakli
b5cc852551 do a single filter after getting all unread tids 2014-08-09 16:15:22 -04:00
barisusakli
41ed52a414 moved newlines from language file to core 2014-08-09 13:30:13 -04:00
barisusakli
b8279dc737 optimize getUserGroups to work with multiple user ids 2014-08-09 02:07:03 -04:00
barisusakli
5b681678b1 could use async.apply here hm 2014-08-08 17:42:03 -04:00
barisusakli
4e4a583d9d took out the meta config check from image.js 2014-08-08 17:30:37 -04:00
barisusakli
ea2975cb3f eachLimit on expire nids 2014-08-08 16:28:29 -04:00
barisusakli
a2bb8029fe use utils.toISOString 2014-08-08 15:28:44 -04:00
psychobunny
193832ea9b closes #1957 2014-08-08 13:15:35 -04:00
barisusakli
5c6e26832e removed console.logs 2014-08-07 21:31:34 -04:00
barisusakli
df0a5e780a prevent edit to change title length above max 2014-08-07 20:03:56 -04:00
psychobunny
025403b9a8 optimizing data transfer *rolls eyes* 2014-08-07 17:52:03 -04:00
psychobunny
ee108ed963 bumping up templates.js version 2014-08-07 17:44:50 -04:00
barisusakli
46398fa924 removed unused require 2014-08-07 16:20:50 -04:00
psychobunny
db2ef15a09 linting 2014-08-07 16:06:23 -04:00
psychobunny
e77491fcbb closes #1956 2014-08-07 16:02:25 -04:00
barisusakli
049d7f766e use getSetsMembers instead of async.map 2014-08-07 13:48:07 -04:00
RefinedSoftwareLLC
215ec041bb Corrected node.js version requirement.
package.json was being told that nodebb only required version >=0.8.x of node. Per documentation and communication with developers this should be >=0.10.x
Changing this should help users who accidentally run nodebb on node.js 0.8 to run it on a supported version of 0.10.x or highter.
2014-08-07 09:14:28 -06:00
Julian Lam
84f3fee488 latest translations 2014-08-07 10:25:10 -04:00
barisusakli
7d179b68df faster notif prune 2014-08-07 00:44:25 -04:00
barisusakli
f39d772a40 if notification is purged delete from user mapping as well 2014-08-07 00:17:26 -04:00
barisusakli
cb519d53a1 isArray check 2014-08-07 00:06:13 -04:00
barisusakli
8e8b678d40 small tweak 2014-08-07 00:02:20 -04:00
barisusakli
84aadc03fd fix filter condition 2014-08-06 22:04:35 -04:00
psychobunny
90513be321 send callback directly
except this time I'm fixing my own derps instead of @barisusakli
2014-08-06 21:42:23 -04:00
barisusakli
7ffad7e0d1 send callback directly 2014-08-06 21:30:41 -04:00
barisusakli
528ee335d5 optimize getTopicsByTids and getTeasers 2014-08-06 21:30:11 -04:00
psychobunny
c6ced111b5 quotes are better 2014-08-06 18:53:00 -04:00
psychobunny
9a5ed0bf27 forgot err, thanks @barisusakli 2014-08-06 18:52:04 -04:00
psychobunny
b1ef42889d updated site title for tags page to be more user friendly 2014-08-06 18:51:32 -04:00
psychobunny
38dc35f480 console.log 2014-08-06 18:49:11 -04:00
psychobunny
3a32058be1 closes #1958 2014-08-06 18:48:46 -04:00
psychobunny
4cda8207e2 adding uid to filter:category.get 2014-08-06 13:56:05 -04:00
psychobunny
c88327d075 added filter:category.get 2014-08-06 13:51:46 -04:00
barisusakli
76b257f7b8 optimized User.getUsers 2014-08-06 12:39:14 -04:00
barisusakli
59d4d2880f fixed markAsUnreadForAll permissions 2014-08-05 23:47:17 -04:00
barisusakli
906e1a3846 removed unused meta 2014-08-05 23:29:49 -04:00
barisusakli
90ac399f6d fix topics.loadMore so it checks read permission 2014-08-05 23:22:21 -04:00
barisusakli
805e6934b9 derp this function should only return err 2014-08-05 23:10:45 -04:00
barisusakli
f55d1897c8 fix categories.loadMore so it checks read permission 2014-08-05 22:59:29 -04:00
barisusakli
100328ef06 shorter markAsUnread 2014-08-05 22:52:33 -04:00
barisusakli
f49c95c16f closes #1950 2014-08-05 18:18:39 -04:00
psychobunny
d4dc716acd filter:templates.get_config, allows you to modify template config
as found here
https://github.com/NodeBB/nodebb-theme-vanilla/blob/master/templates/config.json
@Schamper
2014-08-05 17:17:13 -04:00
psychobunny
a880ac6e9f do one api call for template configs rather than two on cold load 2014-08-05 17:17:13 -04:00
psychobunny
631edc92d3 extra var 2014-08-05 17:17:12 -04:00
barisusakli
5ce0ebb4ac single socket call on topic enter 2014-08-05 17:09:56 -04:00
psychobunny
39d6941603 remove chat/flag for new incoming posts 2014-08-05 16:25:02 -04:00
psychobunny
eb297d7eab client side hooks: action:composer.topics.post, action:composer.posts.reply, action:composer.posts.edit 2014-08-05 16:00:52 -04:00
psychobunny
bb48bdb008 closes #1942 2014-08-05 15:12:23 -04:00
Barış Soner Uşaklı
f9631ae8c0 Merge pull request #1949 from filipsalpe/master
Leave the chat window within the screen
2014-08-05 14:39:45 -04:00
Filips Alpe
378fd095eb Leave the chat window within the screen
On smaller screens, the top of the chat window can appear so high that it is outside the screen, this fixes that.
2014-08-05 21:31:51 +03:00
barisusakli
95979d9d97 closes #1947 2014-08-05 13:38:50 -04:00
Julian Lam
fcfa9c1733 Merge branch 'master' into v0.5.x 2014-08-05 11:42:40 -04:00
Julian Lam
1e6eaffd43 0.5.0-2 2014-08-05 11:42:09 -04:00
Julian Lam
4321cef397 added shrinkwrap file 2014-08-05 11:41:47 -04:00
barisusakli
d3e57d0930 on entry to topic mark notifications read 2014-08-05 10:44:30 -04:00
barisusakli
473310d42d use empty string if referer is undefined 2014-08-05 10:12:09 -04:00
Julian Lam
3df591a118 latest french translations 2014-08-04 16:30:08 -04:00
Julian Lam
33c4211ac2 latest fallbacks for new assets 2014-08-04 16:00:00 -04:00
Julian Lam
074489020f added missing configs for email, search, and groups, latest fallbacks, removed footer from language strings 2014-08-04 15:57:53 -04:00
Julian Lam
2a4717c80c latest translations from tx 2014-08-04 15:48:12 -04:00
barisusakli
b4182f57fe simplified callback 2014-08-04 13:00:42 -04:00
barisusakli
b0b78c3092 minor fix to prevent err when trying to mark null nid 2014-08-03 12:40:46 -04:00
barisusakli
214f6af324 parseInt 2014-08-02 19:46:28 -04:00
barisusakli
e420ee5fb6 privilege fix for single category check 2014-08-02 19:45:13 -04:00
barisusakli
e7700a3fde minor refactor 2014-08-02 16:53:42 -04:00
barisusakli
c6c23aad5e eachLimit on move all topics 2014-08-02 16:48:34 -04:00
barisusakli
115598f382 minor refactor 2014-08-02 16:41:44 -04:00
barisusakli
4fd2973c53 closes #1938 2014-08-02 16:03:28 -04:00
barisusakli
62681c36ef if notif is deleted don't push, prevent crash 2014-08-02 15:10:32 -04:00
barisusakli
97909a6cac err checks 2014-08-01 18:21:39 -04:00
Julian Lam
9dead8ec9e latest translations... again 2014-08-01 18:03:02 -04:00
Julian Lam
770ea77cac latest translations 2014-08-01 17:52:42 -04:00
psychobunny
e14a1e90c3 linting emitter.js 2014-08-01 17:02:07 -04:00
psychobunny
533659e2fd unnecessary property check 2014-08-01 16:56:35 -04:00
psychobunny
be21e11b69 cleanup / lint 2014-08-01 16:55:35 -04:00
Julian Lam
77e0cb170f removed console.log 2014-08-01 16:35:39 -04:00
barisusakli
3424288f0a actually set url #1926 2014-08-01 15:57:46 -04:00
Julian Lam
87a20b1816 0.5.0-1 2014-08-01 15:50:55 -04:00
psychobunny
53ae0c586d closes #1926 2014-08-01 15:41:50 -04:00
barisusakli
3163f70ef2 add tid to post notification so its marked read on entry 2014-08-01 14:07:01 -04:00
barisusakli
0773f51260 closes #1932 2014-07-31 23:16:12 -04:00
barisusakli
25483e376f fix online users page
insert users before the anon box if there is one
2014-07-31 20:25:52 -04:00
barisusakli
76ad2b8fb2 fixed to account header 2014-07-31 20:15:11 -04:00
barisusakli
c217834165 fixed typo 2014-07-31 17:44:13 -04:00
barisusakli
1398937dd8 early outs for privs
no need to check if empty array is passed in, happens if there are no
unread topics
remove dupe cids before checking for privileges
2014-07-31 17:29:20 -04:00
barisusakli
7bfec99df1 permission fix for popular page 2014-07-31 16:32:17 -04:00
barisusakli
aa4089e6d7 #1930
simple solution for now, wraps images with <a> that opens in new tab
2014-07-31 13:36:05 -04:00
barisusakli
de6e74c50e #1914 2014-07-31 08:57:27 -04:00
barisusakli
e0be4d146f closes #1913 2014-07-31 08:47:37 -04:00
barisusakli
3ff91b8c50 closes #1912 2014-07-31 08:23:07 -04:00
barisusakli
d9a0af712d group null and err check 2014-07-31 08:01:11 -04:00
barisusakli
dc68dce27f check err 2014-07-31 07:38:19 -04:00
Barış Soner Uşaklı
63a92fee84 Merge pull request #1928 from chronize/master
fix fatal error when renaming new group with no users
2014-07-31 07:35:22 -04:00
root---
da7a161245 fluidized ACP groups modal dialog 2014-07-31 03:19:47 -04:00
root---
f2d07d3182 fix fatal error when renaming group with no users 2014-07-31 01:39:41 -04:00
barisusakli
a0ded64394 db search 0.0.13 2014-07-30 19:07:43 -04:00
barisusakli
38b6c4ce55 #1925 2014-07-30 18:52:58 -04:00
barisusakli
d97af5020a small cleanup to postSummary 2014-07-30 18:40:00 -04:00
barisusakli
9312675a77 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-07-30 17:45:20 -04:00
barisusakli
5a2b02e798 fix var name, #1925 2014-07-30 17:45:12 -04:00
Julian Lam
89a9d4b7f2 logic for #1837 2014-07-30 17:12:11 -04:00
barisusakli
cfc67d4e90 closes #1924 2014-07-30 15:14:04 -04:00
barisusakli
7e82d3d9a5 fix guest priv 2014-07-30 14:47:04 -04:00
barisusakli
efdd795084 closes #1922 2014-07-30 14:29:48 -04:00
barisusakli
da780cdee7 closes #1920 2014-07-30 02:45:41 -04:00
barisusakli
8caedc935b online users fix
and jshint cleanup
2014-07-29 23:49:49 -04:00
Julian Lam
bb7a71389e using websocketAddress config if supplied 2014-07-29 22:24:57 -04:00
barisusakli
fed8cc6d53 optimize privileges and assorted fixes.
* new methods
privileges.categories.filter
privileges.topics.filter
privileges.posts.filter

they take a list of ids and a privilege, and return the filtered list of
ids, faster than doing  async.filter and calling the db for each id.

* remove event listeners on recent page before adding
* group.exists works for both single group names and arrays
* helpers.allowedTo works for both a single cid and an array of cids
* moved filter:topic.post hook right before topic creation.
* moved filter:topic.reply hook right before topic reply.
2014-07-29 21:51:46 -04:00
barisusakli
eeb4c9f487 optimize getPostSummaryByPids 2014-07-29 17:33:28 -04:00
barisusakli
1a68fe5a26 possible fix for #1909 2014-07-29 17:12:02 -04:00
barisusakli
68cf064b1e cleaned up a bit 2014-07-29 02:37:33 -04:00
barisusakli
d0a0d02d31 mongodb list fix 2014-07-29 02:34:55 -04:00
barisusakli
e8b767d0dd get recent poster uids 2014-07-29 01:36:33 -04:00
barisusakli
783926687c reduced active users 2014-07-29 00:50:53 -04:00
barisusakli
96b0b449b9 closes #1911 2014-07-29 00:42:33 -04:00
barisusakli
f31978aa2c moved core notifications all the way to the end 2014-07-28 19:09:08 -04:00
barisusakli
6e335ff29a removed debug 2014-07-28 18:18:23 -04:00
barisusakli
f71bd41408 more fixes 2014-07-28 18:18:22 -04:00
barisusakli
dfb6606432 one more fix 2014-07-28 18:18:21 -04:00
barisusakli
08ba683c7d fix callback 2014-07-28 18:18:21 -04:00
barisusakli
d7520508e3 #1375 part1 2014-07-28 18:18:20 -04:00
Julian Lam
4d73a563c5 closed #1850 2014-07-28 15:25:04 -04:00
Julian Lam
e5be1d2840 closed #1910 2014-07-28 14:40:02 -04:00
psychobunny
947c9b6eea you're now logged out server-side when you're banned, so csrf token doesn't work in app.logout 2014-07-28 14:28:59 -04:00
psychobunny
3f9e6e7d86 closes #1901 2014-07-28 14:23:25 -04:00
psychobunny
60e74cc2c3 LTRIM support for mongo 2014-07-28 14:20:29 -04:00
psychobunny
7327730252 LTRIM support for redis 2014-07-28 14:20:24 -04:00
psychobunny
cf031be904 better error handling for custom langauge files 2014-07-27 23:21:42 -04:00
barisusakli
8146358aac closes #1905
fixed translator.load, it wasn't passing in language and was trying to
load undefined.json
2014-07-26 23:41:22 -04:00
barisusakli
093e373025 removed console.log 2014-07-26 22:38:04 -04:00
barisusakli
2d94df93b8 isArray is enough 2014-07-26 14:55:17 -04:00
barisusakli
0792731873 new hook filter:topics.get 2014-07-25 19:58:44 -04:00
Julian Lam
0b01a780f8 registering static:app.load in core 2014-07-25 19:28:27 -04:00
Julian Lam
0bad6198d4 firing new third type of hook, static. New hook: static:app.load, closed #1812 2014-07-25 19:16:06 -04:00
barisusakli
eea987d8dd removed console.log 2014-07-25 19:02:10 -04:00
barisusakli
5a0e99956e some cleanup 2014-07-25 18:35:33 -04:00
psychobunny
20ca31d6b1 moved documentation out of core and into https://github.com/NodeBB/nodebb-english 2014-07-25 17:11:53 -04:00
Julian Lam
b7d27fe48b god damnit @barisusakli :P 2014-07-25 16:57:36 -04:00
Julian Lam
91ce3634fc fixed #1904 2014-07-25 16:46:04 -04:00
Julian Lam
086ebb7e5a closed #1874 2014-07-25 15:37:57 -04:00
Julian Lam
b273d07ce5 Merge pull request #1903 from RefinedSoftwareLLC/patch-3
Update smartos.rst
2014-07-25 14:40:57 -04:00
Julian Lam
cff30dbe79 latest translations and fallbacks 2014-07-25 12:53:27 -04:00
Julian Lam
87465ae090 merged latest French translations in, closed #1891 2014-07-25 12:52:48 -04:00
RefinedSoftwareLLC
bd1942ee21 Update smartos.rst
Minor fixes.
2014-07-25 08:17:48 -06:00
barisusakli
3829019bfa removed optional params 2014-07-24 23:33:33 -04:00
barisusakli
c7de38f28e closes #1902
messages:<uid>:<uid> list changed to messages:uid:<uid>:to:<uid>
sortedset
2014-07-24 22:38:35 -04:00
Julian Lam
a79bb29216 partial fix to #1874 2014-07-24 22:04:41 -04:00
barisusakli
3bfad766b3 closes #1900 2014-07-24 21:11:46 -04:00
Barış Soner Uşaklı
385d714dab Merge pull request #1897 from Aure77/master
Allow session cookie domain customization
2014-07-24 19:22:36 -04:00
Aure77
965d6a0d66 Allow cookie domain customization from meta config 2014-07-25 00:45:36 +02:00
psychobunny
7b27c349ae closes #1867 2014-07-25 00:45:36 +02:00
psychobunny
c3843a0564 closes #1892 2014-07-25 00:45:36 +02:00
psychobunny
ff7ce55ae2 #1892 2014-07-25 00:45:35 +02:00
psychobunny
57770b3d38 #1892 2014-07-25 00:45:35 +02:00
RefinedSoftwareLLC
f3ca87d139 Update smartos.rst
Fixed glitch with line being bolded.
2014-07-25 00:45:34 +02:00
RefinedSoftwareLLC
89a630a705 Update smartos.rst
Many small updates
2014-07-25 00:45:34 +02:00
barisusakli
d7bd35ab08 #1741 2014-07-25 00:45:34 +02:00
barisusakli
297f523f18 closes #1899 2014-07-24 18:45:01 -04:00
psychobunny
4f868f99c1 closes #1867 2014-07-24 18:43:09 -04:00
psychobunny
8769f791bc closes #1892 2014-07-24 18:38:46 -04:00
psychobunny
5fba8f541d #1892 2014-07-24 18:37:56 -04:00
psychobunny
1cd2f060aa #1892 2014-07-24 18:34:18 -04:00
Julian Lam
0ab3a2099a Merge pull request #1898 from RefinedSoftwareLLC/patch-3
Update Docs / Install / SmartOS
2014-07-24 18:03:28 -04:00
RefinedSoftwareLLC
570ccb631d Update smartos.rst
Fixed glitch with line being bolded.
2014-07-24 15:52:49 -06:00
RefinedSoftwareLLC
6624b1f64a Update smartos.rst
Many small updates
2014-07-24 15:35:44 -06:00
barisusakli
d25300043c #1741 2014-07-24 16:44:45 -04:00
Aure77
e28ed490ee Allow session cookie domain customization 2014-07-24 22:26:19 +02:00
psychobunny
b604a4961c thanks @barisusakli 2014-07-24 16:17:49 -04:00
barisusakli
e459592ac9 closes #1893 2014-07-24 16:12:57 -04:00
psychobunny
bb997e18a0 updating docs 2014-07-24 16:04:24 -04:00
psychobunny
47a86662de adding timestamp to topic action hooks 2014-07-24 16:04:22 -04:00
psychobunny
df37c1e235 translator.compile 2014-07-24 16:04:21 -04:00
psychobunny
5428ea635c updating docs 2014-07-24 16:04:19 -04:00
psychobunny
788b16fa62 adding uid to the topic hooks, so plugins can know the user that did the action 2014-07-24 16:04:18 -04:00
Julian Lam
fd78085c59 Merge pull request #1894 from JonathanMH/patch-2
added info about MongoDB 2.4 user setup
2014-07-24 15:18:36 -04:00
Jonathan
3f85ddb98a added info about MongoDB 2.4 user setup 2014-07-24 20:59:11 +02:00
psychobunny
63df69f4fb documenting hooks 2014-07-24 14:24:34 -04:00
psychobunny
2e7d1f33dc action:topic.lock, action:topic.pin, action:topic.move 2014-07-24 14:22:48 -04:00
psychobunny
640c4a1063 added hook to doc 2014-07-24 14:17:33 -04:00
psychobunny
1a37176a9d filter:topic.get, surprisingly never implemented till today 2014-07-24 14:16:41 -04:00
barisusakli
8dce99250b final fix for #1884
fix mongo functions so they return correct data if duplicate keys are
passed. getObjects(['post:1', 'post:1'], callback) was only returning
one object.
2014-07-24 12:41:22 -04:00
barisusakli
3557aa2f9a fixed tags page search 2014-07-24 11:57:34 -04:00
barisusakli
fa8fcc00ec fix tag counts
if a tag is removed from a topic, update number of topics in that tag
2014-07-24 03:46:45 -04:00
barisusakli
bc2f7339ee getLatestUndeletedPid will return string #1884 2014-07-24 03:30:17 -04:00
Julian Lam
73e9a7fec0 backticks are italics? wtf. 2014-07-23 21:30:14 -04:00
Julian Lam
700519ddf2 added new FAQ entry re: Recently Logged IPs, re: https://community.nodebb.org/topic/2062/forwarding-ips-on-nginx-proxy/3, ping @a5mith 2014-07-23 21:28:17 -04:00
psychobunny
685cd38162 calculate levenshtein distance between recent chat messages and temporarily ban if determined to be spam 2014-07-23 18:23:03 -04:00
psychobunny
4723b6d68b danger instead of warning for banned alert 2014-07-23 17:29:22 -04:00
psychobunny
e95bc35240 Merge branch 'master' of https://github.com/NodeBB/NodeBB
Conflicts:
	src/upgrade.js
2014-07-23 17:26:59 -04:00
psychobunny
b209af1e32 info instead of error 2014-07-23 17:26:00 -04:00
Julian Lam
12f954f4bd Merge pull request #1890 from derrg/master
Fixed Typo
2014-07-23 17:13:21 -04:00
Julian Lam
883cee31bc added support for showSiteTitle in ACP, closes #1519 2014-07-23 17:12:41 -04:00
Ken Van Dalsum
f38949d185 Fixed Typo 2014-07-23 17:05:52 -04:00
barisusakli
7454fd53b9 possible fix for #1741 2014-07-23 16:49:32 -04:00
barisusakli
7c20e38556 updated vanilla and lavender to latest 2014-07-23 15:43:56 -04:00
barisusakli
dc30d94ff8 info 2014-07-23 15:41:51 -04:00
Julian Lam
440a19ed57 Merge branch 'sourcemap-windows' 2014-07-23 14:37:52 -04:00
barisusakli
e961e3c552 reduced hightlight duration by 2 seconds 2014-07-23 14:33:35 -04:00
Julian Lam
ce8bec5edb fixed mapping in web inspector 2014-07-23 14:27:01 -04:00
Barış Soner Uşaklı
485f14ef7f Merge pull request #1873 from frissdiegurke/patch-2
[Settings] fixed data-empty usage within checkboxes
2014-07-23 13:40:15 -04:00
Barış Soner Uşaklı
6f728f1eb0 Merge pull request #1887 from derrg/master
Added ImageMagic to Windows 8 prerequisites
2014-07-23 13:39:31 -04:00
Ken Van Dalsum
0c8253b23a Added ImageMagic to Windows 8 prerequisites 2014-07-23 13:34:18 -04:00
barisusakli
fde8e9d90f on group destroy, remove it from all groups
previously if a group was destroyed it was left behind in privilege
groups
2014-07-23 13:32:23 -04:00
barisusakli
5c57ed5ea0 install db dependencies in upgrade script 2014-07-23 13:30:12 -04:00
Julian Lam
7cdcb83a98 fixed #1640 2014-07-23 13:18:32 -04:00
barisusakli
d565de60d0 updated passport-local dependency 2014-07-23 10:50:59 -04:00
barisusakli
7887c0934b updated dependencies 2014-07-23 10:45:48 -04:00
barisusakli
238d6602a2 check for valid content, #1884 2014-07-23 09:40:07 -04:00
barisusakli
8113ed6a4d closes #1883, no upgrade script #successkid 2014-07-23 03:09:07 -04:00
barisusakli
054ceab0be isMemberOfGroups fix 2014-07-23 00:36:03 -04:00
barisusakli
6c48cbe6ce regFormEntry array 2014-07-22 22:00:39 -04:00
barisusakli
20df6fd5cd small fix 2014-07-22 18:00:59 -04:00
barisusakli
2bf38ec84b handle pinned topics 2014-07-22 17:58:27 -04:00
barisusakli
5292bdad5a closes #1871 2014-07-22 15:39:23 -04:00
barisusakli
1e6d589080 show topics on home instead of replies
no template changes, instead of showing the latest x posts under
categories, we are now showing the latest x posts of the latest x
topics.
2014-07-22 14:35:30 -04:00
barisusakli
3e252187ad closes #1868
updated out of date dependencies expect socket.io
2014-07-22 13:43:43 -04:00
barisusakli
a3fecee781 removed console.log err check 2014-07-22 13:00:04 -04:00
barisusakli
89bb11a58c closes #1880 2014-07-22 12:56:34 -04:00
barisusakli
0e241456e4 less code 2014-07-22 12:02:15 -04:00
Julian Lam
8e0bc0257d fixed #1869 2014-07-22 11:21:39 -04:00
Julian Lam
5546b4e04d closed #1877 2014-07-22 11:05:12 -04:00
Julian Lam
8be7ab55f9 latest translatios 2014-07-22 10:15:55 -04:00
frissdiegurke
021e5bfcc5 [Settings] fixed data-empty usage within checkboxes 2014-07-22 12:01:05 +02:00
barisusakli
82ffaad939 parseint 2014-07-21 19:39:06 -04:00
barisusakli
ed18ac7fdf category recent post fix
if a category is not displaying any recent posts dont render new posts
2014-07-21 18:14:44 -04:00
barisusakli
c9fb5b3e11 changed user posted notification to include title
dont send 2 notifications if you are already following topic
2014-07-21 17:43:42 -04:00
psychobunny
67c5477fb2 testing transition speed change without waiting for widgets to render 2014-07-21 17:30:57 -04:00
psychobunny
310dbc754e closes #1839 2014-07-21 16:20:17 -04:00
psychobunny
224dd49102 no need to delay prefetcher anymore 2014-07-21 16:10:35 -04:00
psychobunny
829dcb134e logic fail, time for coffee 2014-07-21 16:06:48 -04:00
psychobunny
e382e34656 unnecessary brackets 2014-07-21 15:50:55 -04:00
psychobunny
2851a9a96b don't ajaxify in until animation is completed; reduced minimum wait duration for preloader 2014-07-21 15:49:27 -04:00
barisusakli
9aeab08109 removed stop 2014-07-21 15:33:02 -04:00
barisusakli
81018d1305 closes #1863 2014-07-21 15:03:04 -04:00
psychobunny
cb08d4b04f getting rid of this one for good 2014-07-21 14:44:27 -04:00
psychobunny
1b2de8d7af updating docs for adding i8n to plugin/themes 2014-07-21 14:41:19 -04:00
psychobunny
b5d3186120 plugins and themes can now define their own custom language strings. closes #1865 2014-07-21 14:37:46 -04:00
barisusakli
1920f88f31 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-07-21 14:22:16 -04:00
barisusakli
0a84d49a6d docs update 2014-07-21 14:22:14 -04:00
Barış Soner Uşaklı
3e7420333d Update README.md 2014-07-21 14:19:31 -04:00
barisusakli
ab9af6202d Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-07-21 14:18:45 -04:00
barisusakli
d00740703b use the new $text query from mongo 2.6 2014-07-21 14:18:42 -04:00
psychobunny
423da904de allow core to tap into NodeBB's hook system, closes #989 2014-07-21 13:42:33 -04:00
psychobunny
e10307426d optional callback for registerHook 2014-07-21 13:25:25 -04:00
psychobunny
7e82393d9f plugins:loaded - using emitter class instead 2014-07-21 13:14:12 -04:00
psychobunny
bab995626c some unused vars 2014-07-21 13:10:45 -04:00
Julian Lam
bee4feff12 updated module deps for widget-essentials and markdown 2014-07-21 12:35:48 -04:00
Julian Lam
be8e63cd50 special handling for filter:app.load 2014-07-21 10:36:05 -04:00
barisusakli
ef8bbdd359 closes #1864
doing andrew's //todo's since 1991
2014-07-20 21:10:23 -04:00
barisusakli
04c6ca2ebb closes #1862 2014-07-20 18:44:12 -04:00
Julian Lam
045dc220ac latest translations 2014-07-20 17:40:15 -04:00
barisusakli
b1e93c4558 fix for wrapper 2014-07-20 14:53:29 -04:00
barisusakli
341a0c8190 closes #1855 2014-07-20 14:35:25 -04:00
Barış Soner Uşaklı
ec9cc52d03 Merge pull request #1857 from a5mith/patch-1
In response to lukelarris bug report
2014-07-19 22:01:09 -04:00
Barış Soner Uşaklı
ea85ebe016 Merge pull request #1858 from lukelarris/patch-1
Made it easier to paste command in MongoDB console
2014-07-19 22:00:17 -04:00
lukelarris
d35ac87128 Made it easier to paste command in MongoDB console
It's a pain to paste MongoDB console commands with linebreaks, as the console adds its own linebreaks. I removed the linebreaks to make it easier.
2014-07-19 20:46:52 -05:00
Aaron Smith
45518d620b In response to lukelarris bug report
Configure is in docs, not installing, so needs to go up another directory. (I think, I'm on my iPad)
2014-07-20 02:15:51 +01:00
barisusakli
7a60d478f4 small tweak to chat height 2014-07-19 18:02:35 -04:00
barisusakli
6e66911ef7 delete unread chats on account delete 2014-07-19 11:01:54 -04:00
barisusakli
a4975cab33 closes #1825, closes #1674 2014-07-19 10:33:27 -04:00
barisusakli
a69973e7a7 topics.getPids will return mainPid as well 2014-07-19 08:59:59 -04:00
barisusakli
523b3db3f1 no header tooltips in xs 2014-07-18 20:43:52 -04:00
Julian Lam
bf2cba028d fixed #1851 2014-07-18 19:12:09 -04:00
Julian Lam
14d7461252 updated deprecation notice for social network sso icons 2014-07-18 19:10:53 -04:00
Julian Lam
2f9fd620d7 fixed #1849 2014-07-18 11:10:47 -04:00
psychobunny
d78fdb1520 more confusing, works perfectably 2014-07-17 22:26:50 -04:00
psychobunny
a67e0ea3c2 less confusing 2014-07-17 19:01:46 -04:00
psychobunny
de5a564780 hinting 2014-07-17 18:59:56 -04:00
barisusakli
2c890ad609 moved pushUnreadCount 2014-07-17 18:50:03 -04:00
barisusakli
e6a5199174 pass router to app.load closes #1845
add a render method to router that forwards it to app
2014-07-17 18:34:30 -04:00
barisusakli
206acab1bf added posted data back whoops 2014-07-17 17:49:28 -04:00
barisusakli
afb62c7484 optional timestamp to post.create 2014-07-17 17:48:24 -04:00
psychobunny
7401744112 trigger action:ajaxify.contentLoaded on cold load as well 2014-07-17 15:48:28 -04:00
barisusakli
bb0223897f closes #1843 2014-07-17 11:56:07 -04:00
Julian Lam
21637a1513 Merge pull request #1836 from unixfox/master
Update guide openshift with redis and added nitrous.io
2014-07-17 10:30:44 -04:00
Emilien Devos
55a47b56e3 Added Nitrous.IO #2 2014-07-17 13:47:18 +02:00
Emilien Devos
341525c58c Added Nitrous.io 2014-07-17 13:46:41 +02:00
psychobunny
803b6f64b8 ability to disable sitemap.xml 2014-07-17 01:38:20 -04:00
psychobunny
704d81fe53 disable category RSS 2014-07-17 01:34:15 -04:00
psychobunny
b6a8845d52 disable topic RSS 2014-07-17 01:34:14 -04:00
psychobunny
dab44e0768 ability to disable rss feed 2014-07-17 01:34:13 -04:00
barisusakli
8ff34e4dc2 parseint tid 2014-07-16 21:48:21 -04:00
Julian Lam
021e31a03a better comments 2014-07-16 21:19:25 -04:00
barisusakli
7212f95582 small fix to routes 2014-07-16 21:12:10 -04:00
Julian Lam
645eb051ec added new hook filter:app.load, and deprecated action:app.load, hopefully fixes #1822 2014-07-16 21:09:55 -04:00
barisusakli
67d5307a8f small change to tag search 2014-07-16 20:46:49 -04:00
psychobunny
08df29e4dd random console.log 2014-07-16 20:43:35 -04:00
barisusakli
161069c390 closes #1840 2014-07-16 20:16:50 -04:00
barisusakli
8cfce1c91c dont select hidden br 2014-07-16 19:51:28 -04:00
Emilien Devos
e168d117e1 The last update commit of openshift guide 2014-07-16 23:20:32 +02:00
Emilien Devos
06886caf18 Update openshift.rst 2014-07-16 22:57:44 +02:00
Emilien Devos
e28abefd5c Update openshift.rst 2014-07-16 22:52:05 +02:00
Emilien Devos
f9b5249a49 Update guide openshift with redis 2014-07-16 22:43:15 +02:00
psychobunny
7132df8590 Merge pull request #1835 from unixfox/master
Added openshift
2014-07-16 16:12:09 -04:00
Emilien Devos
0766f56ed2 Update cloud.rst 2014-07-16 21:56:51 +02:00
Emilien Devos
d7050718db Update openshift.rst 2014-07-16 21:55:24 +02:00
Emilien Devos
6e0d7160db Added openshift second correction
if there are mistakes thank you to correct them.
2014-07-16 21:54:30 +02:00
Emilien Devos
d1ed7d6746 Added openshift
if there are mistakes, thank you to correct them.
2014-07-16 21:53:28 +02:00
Julian Lam
04ea475f0b Update heroku.rst
updated redis dependencies
2014-07-16 13:46:22 -04:00
barisusakli
90392025e6 small fix to router 2014-07-16 13:43:02 -04:00
Emilien Devos
8ff2581e6a #1 2014-07-16 19:05:11 +02:00
barisusakli
6d8cc5648c some tag hooks/filters 2014-07-15 21:26:02 -04:00
psychobunny
9f6c05bb24 closes #1830 2014-07-15 16:32:51 -04:00
barisusakli
42ea8652f1 possible fix for #1830 2014-07-15 16:16:35 -04:00
Barış Soner Uşaklı
7f093bccfd Merge pull request #1829 from akhoury/master
Group.join() callback made optional
2014-07-15 13:42:07 -04:00
Aziz Khoury
ed7631cab5 tab indent fix 2014-07-15 13:39:02 -04:00
Aziz Khoury
d1f97723e7 Group.join() callback made optional 2014-07-15 13:32:21 -04:00
barisusakli
943f3814e5 closes #1813 2014-07-15 13:00:22 -04:00
Julian Lam
49d29db347 latest translations and fallbacks 2014-07-14 14:39:38 -04:00
barisusakli
e036c20072 closes #1808 2014-07-14 14:28:23 -04:00
psychobunny
4385ec5e8c latest templates.js, fixes #1823 2014-07-14 13:55:50 -04:00
barisusakli
61f7f0f889 fixed file upload checks 2014-07-14 13:48:37 -04:00
barisusakli
ebaf8df0a9 #1824 2014-07-14 13:28:04 -04:00
barisusakli
fcd460438d closes #1824 2014-07-14 13:25:44 -04:00
barisusakli
d3312f1b8e fixer or in jobs and users redefinition 2014-07-13 16:25:54 -04:00
barisusakli
d999116541 wait for widgets to render to send ajaxify end
possible fix for broken masonry on f5
2014-07-13 15:38:17 -04:00
barisusakli
633980ce4b active users cleanup 2014-07-13 14:57:55 -04:00
barisusakli
93a6402879 removed stop increase timeout to 100ms 2014-07-11 23:14:50 -04:00
barisusakli
0362c1a3b0 show day/week/month/year popular topics 2014-07-11 18:43:26 -04:00
psychobunny
13f94ee32a updating copyright 2014-07-11 16:26:26 -04:00
Julian Lam
fe689908bc latest translations 2014-07-11 15:40:23 -04:00
Julian Lam
061eadb595 requiring v0.4.2 of markdown plugin, and removed marked dep from core, as it didn't seem to be used. 2014-07-10 21:43:11 -04:00
barisusakli
b2ece27263 topic post hook 2014-07-10 15:45:25 -04:00
psychobunny
1d8aeda9c2 closes #1814 2014-07-10 14:16:46 -04:00
Julian Lam
23c4b8ca35 only showing ACP setting saved alert if no callback is passed in 2014-07-10 13:35:48 -04:00
Julian Lam
84832f57cc firing action:settings.set hook AFTER the object is saved in the db. What was I thinking?! 2014-07-10 13:27:11 -04:00
Barış Soner Uşaklı
c72d0232f4 Merge pull request #1811 from Fastinyoh/master
Change user.delete hook from action to filter
2014-07-10 01:39:38 -04:00
dhingey
9d45373b59 Change user.delete hook from action to filter
The user.delete hook is now a filter, giving plugins a chance to access
the user's data before it's deleted from Redis.
2014-07-09 22:20:49 -07:00
psychobunny
5b6acbad1e optimized widget call by bundling all queries into one for #1428; fixes active users widget crash
also fixes b3819fd076 properly
2014-07-09 19:23:10 -04:00
barisusakli
9fbd535b79 fixes vote buttons on infinite scroll and new posts 2014-07-09 16:59:39 -04:00
Julian Lam
2bd99e2d16 properly did #1809, lol, whoops 2014-07-09 16:27:24 -04:00
psychobunny
b3819fd076 temporary fix for acp, need to reconsider how I'm doing this 2014-07-09 16:14:37 -04:00
Julian Lam
5aabe47e2e closed #1809 2014-07-09 16:14:15 -04:00
Julian Lam
b3e04ed2bc closed #1744 2014-07-09 15:56:53 -04:00
psychobunny
4cbe97a466 don't need this file anymore 2014-07-09 15:56:21 -04:00
Julian Lam
5f68b8f657 passing in all environment variables when forking, #1714 2014-07-09 15:49:04 -04:00
psychobunny
c6183f1a82 closes #1428 2014-07-09 15:41:03 -04:00
psychobunny
ecbb05ccca widgets.render doesn't actually use the url 2014-07-09 15:20:59 -04:00
barisusakli
9d7a8fcc0b getSortedSetRevRangeWithScores 2014-07-09 13:45:33 -04:00
barisusakli
b5df5c0a91 closes #1562, level session 2014-07-09 13:26:39 -04:00
barisusakli
53d68be7c0 level sortedSetsRemove 2014-07-09 12:57:04 -04:00
barisusakli
0f5c1d1892 added messaging hook #1798 2014-07-09 12:43:02 -04:00
barisusakli
75bf9e62be cleaned languages.js 2014-07-09 12:21:40 -04:00
Julian Lam
cac3ebc9e5 vertically centering modal when opened 2014-07-09 11:05:50 -04:00
Julian Lam
c259e0407e closed #1807 2014-07-09 11:03:32 -04:00
Julian Lam
cd8c1eeff6 started #1807 2014-07-09 10:55:22 -04:00
Julian Lam
dae2e14aac epic hax to make the chat message list resize #1788 2014-07-08 21:54:31 -04:00
Julian Lam
4404387218 Merge branch 'master' into chat-route 2014-07-08 20:09:09 -04:00
barisusakli
bb9caa7228 removed dupe 2014-07-08 14:15:53 -04:00
psychobunny
46d3e4a6eb undo 2014-07-08 13:26:18 -04:00
psychobunny
615b81a447 closes #1797 2014-07-08 13:14:59 -04:00
psychobunny
0c55417df2 purge topic if it's the post is purged in that topic 2014-07-08 12:37:31 -04:00
psychobunny
0aef2d2be9 closes #1805 2014-07-08 12:31:44 -04:00
psychobunny
3f81aaafb0 Merge pull request #1804 from Fastinyoh/master
Added a hook: action:user.delete
2014-07-08 12:19:24 -04:00
Julian Lam
7b3159292f added some utility functions for #1798, fixed chat notifications bodyLong value 2014-07-08 11:55:55 -04:00
Julian Lam
2b15f46638 removed console.log, fixing language key reference error #1788 2014-07-08 10:05:59 -04:00
dhingey
f7372ba8d5 Added a hook: action:user.delete
Allows plugins to access the uid of the user being deleted.
2014-07-08 00:21:58 -07:00
Julian Lam
95102f7e74 jshinting 2014-07-07 20:02:26 -04:00
Julian Lam
71916f0691 marathon bugfixing with @barisusakli re: #1788 2014-07-07 19:47:03 -04:00
barisusakli
5497b8c419 striptags 2014-07-07 17:56:58 -04:00
barisusakli
64d04f7aa6 closes #1803 2014-07-07 17:36:14 -04:00
Julian Lam
d9cdd2f165 limiting recent chats to 20 2014-07-07 17:02:35 -04:00
Julian Lam
13e4e8dad7 a couple final tweaks to contact list and such... #1788 2014-07-07 16:59:46 -04:00
Julian Lam
ac9f104b39 Merge remote-tracking branch 'origin/chat-route' into chat-route
How in the seven hells do I manage to conflict myself?

Conflicts:
	public/src/forum/chats.js
	public/src/modules/chat.js
	src/middleware/middleware.js
2014-07-07 16:06:56 -04:00
Julian Lam
c684ec8958 Merge remote-tracking branch 'origin/master' 2014-07-07 15:57:29 -04:00
Julian Lam
186473fa7b adding undefined check to hrefEmpty 2014-07-07 15:57:21 -04:00
Julian Lam
55afa17651 getting chats working between both page and modal, yay #1788 2014-07-07 15:55:34 -04:00
Julian Lam
a031bc2721 highlighting of the user with whom you are currently chatting with #1788 2014-07-07 13:09:09 -04:00
barisusakli
80e69bc210 missing ; 2014-07-07 12:57:31 -04:00
Julian Lam
07a82ec12c more WIP 2014-07-07 12:31:11 -04:00
Julian Lam
1db96dc627 typing notifcation socket implementation for chat page, #1788 2014-07-07 12:31:10 -04:00
Julian Lam
84e046185b WIP 2014-07-07 12:31:10 -04:00
Julian Lam
4d85df5bae issue #1788 - start 2014-07-07 12:31:10 -04:00
Julian Lam
3d90ca6a46 more WIP 2014-07-07 12:26:17 -04:00
Julian Lam
404ab4878b typing notifcation socket implementation for chat page, #1788 2014-07-06 16:28:49 -04:00
barisusakli
bc257c1c10 removed dupe version 2014-07-06 15:12:13 -04:00
barisusakli
c5ccf4333b translate helpers 2014-07-05 16:59:02 -04:00
Julian Lam
d18461c8eb wtf. Merge remote-tracking branch 'origin/chat-route' into chat-route
Conflicts:
	public/language/en_GB/modules.json
	src/controllers/accounts.js
	src/middleware/middleware.js
	src/routes/index.js
2014-07-05 15:46:37 -04:00
Julian Lam
89acec13dc latest translations from transifex 2014-07-05 15:05:47 -04:00
Zurg
f430feec65 Update users.json 2014-07-05 15:05:47 -04:00
Zurg
76aa16ce30 Update the error.json 2014-07-05 15:05:47 -04:00
Barış Soner Uşaklı
2bdf9713c9 Update README.md 2014-07-05 15:05:09 -04:00
Julian Lam
89dc8c490a WIP 2014-07-05 15:01:25 -04:00
barisusakli
43c1787754 dont exist if cant parse css 2014-07-05 14:27:21 -04:00
barisusakli
4ab6a5d4b2 removed double meta require 2014-07-05 00:19:19 -04:00
barisusakli
04144ed75d missing semicolon 2014-07-05 00:11:40 -04:00
barisusakli
f5232dbc96 check db errors on start and upgrade 2014-07-05 00:11:21 -04:00
barisusakli
37b73e1c02 cleaner mongo setRemoveRandom 2014-07-04 23:36:40 -04:00
Julian Lam
0dad7adb8d issue #1788 - start 2014-07-04 22:04:20 -04:00
Julian Lam
b03bb3a32b issue #1788 - start 2014-07-04 19:54:47 -04:00
barisusakli
5097526ae0 pass express app to plugins, closes #1789 2014-07-04 18:25:08 -04:00
barisusakli
f288f80da6 meta.js refactor 2014-07-04 18:20:44 -04:00
Julian Lam
49b4af42e1 latest translations for Chinese Simplified 2014-07-04 16:01:42 -04:00
Julian Lam
507fc2cc56 latest persian translations 2014-07-04 16:01:42 -04:00
Julian Lam
ae37cdb048 latest chinese translations 2014-07-04 16:01:42 -04:00
barisusakli
80cb0cf7e0 plugins.js jslint 2014-07-04 14:43:08 -04:00
psychobunny
ddcca28cf0 pass allowRegistration in login API for #1786 2014-07-04 11:41:03 -04:00
Julian Lam
8432e3ff82 latest translations for persian 2014-07-03 15:02:37 -04:00
barisusakli
3e75a4397a fixes guest post data in topics 2014-07-03 09:42:39 -04:00
barisusakli
dcbed4e935 closes #1763
show alert if email not confirmed, clicking alert will send confirmation
email
2014-07-03 09:36:46 -04:00
Julian Lam
a960f53f92 latest translations 2014-07-03 09:21:18 -04:00
Julian Lam
699795621a Merge branch 'master' of github.com:nodebb/NodeBB 2014-07-03 09:19:47 -04:00
barisusakli
586aeaf53f added error checking to install.js for categories 2014-07-02 21:55:05 -04:00
barisusakli
5ea74ae9e9 closes #1776 2014-07-02 16:19:55 -04:00
barisusakli
5d0755c4a8 package.json 2014-07-02 16:13:28 -04:00
barisusakli
119d13053d move static to end 2014-07-02 16:13:27 -04:00
barisusakli
ec1196d288 use router for relative path 2014-07-02 16:13:27 -04:00
barisusakli
38494a2af0 pass in session directly 2014-07-02 16:13:26 -04:00
barisusakli
78c977e8f6 removed trailing slash 2014-07-02 16:13:26 -04:00
barisusakli
9e8584eee7 uploads 2014-07-02 16:13:25 -04:00
barisusakli
24ebf20d7e first commit 2014-07-02 16:13:25 -04:00
barisusakli
4b005a4037 crash fix 2014-07-02 15:01:14 -04:00
Julian Lam
9a9ce8684c latest translations and fallbacks 2014-07-02 12:24:52 -04:00
Barış Soner Uşaklı
c0227b46f5 Merge pull request #1775 from frissdiegurke/patch-1
fixed no href-attribute handled as external link
2014-07-01 16:52:31 -04:00
frissdiegurke
2d9bc7eee7 fixed no href-attribute handled as external link 2014-07-01 22:45:00 +02:00
barisusakli
e6c9647acf display user post topic stats in admin index 2014-07-01 16:30:06 -04:00
barisusakli
684f858415 closes #1772 2014-07-01 15:40:21 -04:00
barisusakli
64f680a0a3 action:chat.loaded hook 2014-07-01 15:05:07 -04:00
barisusakli
9a4e6aa01c closes #1774 2014-07-01 14:49:51 -04:00
Julian Lam
6057da57a2 Merge pull request #1771 from heidar/patch-1
Enable the correct modules in apache instructions
2014-06-30 22:21:49 -04:00
Heidar Bernhardsson
ea45500079 Enable the correct modules in apache instructions
See #1770 for more information.
2014-06-30 16:39:52 -07:00
barisusakli
6389bc762c fire post edit after hook after post is saved 2014-06-30 17:33:31 -04:00
barisusakli
c29dcc0ec9 fire topic edit action after topic is saved 2014-06-30 16:59:36 -04:00
barisusakli
b8b6ae7b2f moved upload route into API namespace 2014-06-30 16:33:10 -04:00
barisusakli
b41b311d94 another eachLimit 2014-06-30 15:45:39 -04:00
Julian Lam
7bb7bc8630 updated lithuanian 2014-06-30 15:21:10 -04:00
Julian Lam
ffd2ddc3e7 Revert "moved meta up"
This reverts commit 8c9feb85a4.
2014-06-30 14:55:23 -04:00
Julian Lam
cda3f9376d updated error text to show proper setup command 2014-06-30 14:55:21 -04:00
barisusakli
5ec289eee2 closes #1769 2014-06-30 14:19:06 -04:00
barisusakli
efcc42f170 added eachLimit to upgrade script 2014-06-30 14:07:30 -04:00
barisusakli
9ddff0ec4a fix language string 2014-06-29 23:29:13 -04:00
barisusakli
1b31f5b2ca single arrows wont go all the way to bottom 2014-06-29 22:35:22 -04:00
barisusakli
c9c68f8cbe move cursor to end 2014-06-29 16:47:11 -04:00
barisusakli
105acc0197 not used 2014-06-29 14:35:32 -04:00
barisusakli
8c9feb85a4 moved meta up 2014-06-29 14:30:51 -04:00
barisusakli
82a1215128 setOnEmpty 2014-06-29 14:29:32 -04:00
barisusakli
56830d773e cleaned up resizeStop 2014-06-29 14:19:07 -04:00
barisusakli
9aacb5e259 remove dupe code 2014-06-29 14:10:20 -04:00
barisusakli
7d3d9f5ae1 blockquote fix again 2014-06-28 17:04:09 -04:00
barisusakli
e6371ad539 remove listeners before adding 2014-06-28 16:36:30 -04:00
barisusakli
24aa166ed5 dont error when no teaser data 2014-06-28 16:18:29 -04:00
barisusakli
9157708b45 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-06-28 15:05:50 -04:00
barisusakli
d57f183f42 privileges.posts.get takes an array of pids now 2014-06-28 14:59:01 -04:00
Barış Soner Uşaklı
018022412a Merge pull request #1764 from daxingplay/master
missing comma fix
2014-06-28 01:39:52 -04:00
daxingplay
ce13e8b64f missing comma fix 2014-06-28 13:36:50 +08:00
barisusakli
6cd29a31a4 removed timing 2014-06-28 01:14:24 -04:00
barisusakli
c3a9767bf6 late night optimizations
-isMemberOfSets returns true/false instead of 1/0
-when loading the posts of a topic only get the userdata for each user
once, before this commit if a topic had 10 posts from 2 different users
we were getting the user data for each user 5 times (drunk)
-getVoteStatusByPostIDs and getFavouritesByPostIDs no longer make
pids.length calls to the db, they use isMemberOfSets now
-getUserInfoForPost renamed to getUserInfoForPosts and doesnt make
uids.length calls to db, uses getMultipleUserFields instead
2014-06-28 01:03:26 -04:00
barisusakli
d3fc71529a callback 2014-06-27 23:23:27 -04:00
Julian Lam
b338ac2a4c fixing space-indentation, modifying behaviour a little bit so that the maximized position is not saved, and minimizing can return back to the previous saved position 2014-06-27 21:07:49 -04:00
Julian Lam
517c70951f Merge branch 'patch-3' of github.com:mani95lisa/NodeBB into mani95lisa-patch-3 2014-06-27 20:49:46 -04:00
Julian Lam
11f40d1580 fallbacks for #1763 2014-06-27 20:49:23 -04:00
Julian Lam
74be49d46f new language strings for #1763 2014-06-27 20:47:20 -04:00
barisusakli
a9e5e82431 closes #1758 2014-06-27 15:35:58 -04:00
Julian Lam
181613e946 tag fallbacks 2014-06-27 15:19:29 -04:00
Julian Lam
d6d3a5d8cc added tags to translation index 2014-06-27 15:18:56 -04:00
Julian Lam
190b3b518b latest translations 2014-06-27 15:04:59 -04:00
Julian Lam
46f9a7860c applying translator to messages. 2014-06-27 14:52:30 -04:00
Julian Lam
c8e3433fa4 new language strings for outgoing emails, and changing the anchor text to not be an URL, closed #1759, closed #1760 2014-06-27 14:52:30 -04:00
Mani Wang
1050efbe65 make expand postContainer more easier
If user don't know drag to expand and move 0 after down, then think user clicked and toggle postContainer's height between max and default 400.
2014-06-28 02:38:48 +08:00
Julian Lam
d706c390bb Merge branch 'master' of github.com:nodebb/NodeBB 2014-06-27 13:10:54 -04:00
psychobunny
92c0bd07c9 Ability to enable/disable the upvote/downvote system, closes #1672 2014-06-27 13:05:05 -04:00
psychobunny
b040201764 prevent hax voting via websockets if system disabled 2014-06-27 13:05:04 -04:00
psychobunny
a2f85648c5 allow voting system to be disabled 2014-06-27 13:05:03 -04:00
Julian Lam
17d33a6720 Added Romanian to NodeBB. Mulțumesc! 2014-06-27 13:04:02 -04:00
barisusakli
fb72b4c8e0 only search tag value 2014-06-26 23:05:47 -04:00
barisusakli
94dbb15b21 search tags 2014-06-26 22:57:49 -04:00
barisusakli
1cabf885a2 closes #1730
postCount != lastPostIndex unfortunately, that will need some rethinking
2014-06-26 22:11:16 -04:00
barisusakli
49a9601a04 closes #1752 2014-06-26 13:44:02 -04:00
psychobunny
b3c9323026 use admin setting for downvote privileges, closes #1757 2014-06-26 13:37:34 -04:00
psychobunny
2e1cda3532 added lang strings for not having enough rep to downvote 2014-06-26 13:30:43 -04:00
psychobunny
8a03b42d62 prevent a user from downvoting if at negative rep 2014-06-26 13:28:58 -04:00
psychobunny
6685e140c3 pass err through 2014-06-26 12:53:40 -04:00
psychobunny
f4955ffb8d closes #1729 2014-06-26 12:51:47 -04:00
barisusakli
b822e8babc render preview on image upload 2014-06-26 11:25:21 -04:00
barisusakli
67186edda7 fix drag drop 2014-06-26 11:22:37 -04:00
Julian Lam
c1444903c4 latest translations 2014-06-26 10:54:08 -04:00
psychobunny
61519277f9 Merge pull request #1754 from Chocobozzz/patch-1
Fix typo debian install doc
2014-06-26 03:45:12 -04:00
Bigard Florian
113044b452 Fix typo debian install doc
Bash commands didn't appear as code
2014-06-26 09:17:27 +02:00
psychobunny
426e992030 Merge pull request #1753 from ruvata-code/patch-1
Update windows8.rst
2014-06-26 02:04:07 -04:00
ruvata-code
6d421b7f07 Update windows8.rst
missed double backslash (UTP specifics shielded characters) at "The default location of Redis Server is" path
2014-06-26 09:38:11 +04:00
psychobunny
876cb878a9 added action:posts.loaded client-side hook 2014-06-25 21:28:03 -04:00
psychobunny
4b248804bd deprecation message for 0.6 2014-06-25 18:55:43 -04:00
psychobunny
0e92c7ed94 use templates.js module instead 2014-06-25 18:55:42 -04:00
psychobunny
e235cd5288 added templates.js to package.json 2014-06-25 18:55:41 -04:00
barisusakli
f80b3c3b66 simpler union 2014-06-25 18:27:22 -04:00
barisusakli
7f534cc7b8 sorted set refactor 2014-06-25 18:16:42 -04:00
barisusakli
9240f65f20 moved resize code, removed old tab code 2014-06-25 17:50:06 -04:00
barisusakli
9d11ca8cfe not used 2014-06-25 16:40:41 -04:00
barisusakli
197300b347 moved populateOnline users out of app.js 2014-06-25 16:27:39 -04:00
barisusakli
aecd3b4653 handlebookmark func 2014-06-25 16:21:33 -04:00
barisusakli
d5b36518a2 moved out scrollTo 2014-06-25 16:17:14 -04:00
Julian Lam
391b5eaf73 latest translations 2014-06-25 16:15:06 -04:00
barisusakli
7af597d7c2 closes #1750 2014-06-25 12:57:09 -04:00
Barış Soner Uşaklı
2d734c1648 fixed move recent replies 2014-06-24 21:57:33 -04:00
barisusakli
eb9b4a62dc fix topic move, fix moveAll
move topic wasnt moving mainPid, also fixed crash on move all
clicking permissions on admin/categories no longer goes to top of page
2014-06-24 17:40:41 -04:00
barisusakli
c3e4d11f69 closes #1719 2014-06-24 15:49:59 -04:00
xizhao
c7897250bd Add LICENSE information to Readme.md & summary 2014-06-24 14:42:08 -04:00
barisusakli
0d0af7ba96 closes #1721 2014-06-24 14:09:16 -04:00
psychobunny
207ad4d859 Merge pull request #1746 from flipflopsimsommer/master
Update docs/os/debian.rst
2014-06-24 13:52:55 -04:00
flipflopsimsommer
37e356284d Update debian.rst
improve formatting
2014-06-24 19:39:24 +02:00
barisusakli
f4dfae7fcb fixed lock icon side 2014-06-24 13:31:22 -04:00
barisusakli
c191aa079f closes #1735 2014-06-24 13:27:37 -04:00
barisusakli
0cbb440629 fix blockquote toggle and use different icons 2014-06-24 12:52:04 -04:00
Julian Lam
94a4abc80f latest translations 2014-06-24 10:06:29 -04:00
barisusakli
d90d45261e fixed on edit #1400 2014-06-24 10:01:46 -04:00
barisusakli
c642493bce guest post fix 2014-06-24 09:53:19 -04:00
barisusakli
836540ff78 replaceSelfLinks on new posts and reload 2014-06-24 09:29:12 -04:00
barisusakli
e6d8e9c959 searchIndex callbacks 2014-06-24 09:15:44 -04:00
Julian Lam
aac2dd47af latest translations and fallbacks 2014-06-23 21:03:04 -04:00
barisusakli
397fc4f4f1 closes #1581 2014-06-23 20:09:20 -04:00
barisusakli
1296cd58b9 closes #1723 2014-06-23 19:45:49 -04:00
Julian Lam
3e73e17502 latest translations 2014-06-23 19:45:20 -04:00
barisusakli
c296aaeb8a discard language string 2014-06-23 19:15:58 -04:00
barisusakli
3c3ad7d115 closes #1728 2014-06-23 19:10:59 -04:00
barisusakli
36ed21ad72 closes #1739 2014-06-23 18:47:52 -04:00
barisusakli
bd4722665d closes #1725
removed move button from main post, disable moving main post, fixed
moving posts.
2014-06-23 18:06:59 -04:00
barisusakli
9af12819e3 closes #1731 2014-06-23 17:26:02 -04:00
barisusakli
a9adfe9428 fix crash in topic move 2014-06-23 16:22:05 -04:00
barisusakli
ae72d8ab7e fixes block quote toggles on dynamic posts 2014-06-23 15:39:51 -04:00
barisusakli
0987aed0e6 callback undefined error 2014-06-23 14:46:47 -04:00
barisusakli
12a51ee2f3 fixed username 2014-06-23 12:35:44 -04:00
barisusakli
1d91ce4c6b fixed typo in english translation 2014-06-23 12:34:24 -04:00
psychobunny
f6838ef51e only use passport.authenticate if a strategy url is defined 2014-06-23 10:20:29 -04:00
barisusakli
b7e04239e9 use water in post edit 2014-06-22 18:14:48 -04:00
barisusakli
35d1aacc45 no success alert on posting and editing #1721 2014-06-22 17:34:27 -04:00
barisusakli
93149cebb9 fixed thread tools inside topic, closes #1732 2014-06-22 17:26:43 -04:00
barisusakli
ab6429c578 closes #1734 2014-06-22 17:08:55 -04:00
barisusakli
78509b4ad0 use sortedSetsRemove to remove tid from tags 2014-06-21 22:43:02 -04:00
barisusakli
fd12ec763a sortedSetsRemove
instead of calling sortedSetRemove() one at a time for each id remove
value from multiple sortedSets with one db call
2014-06-21 22:37:46 -04:00
barisusakli
a4d4e53f45 speed up category purge
using eachLimit
dont emit stats on every topic delete
2014-06-21 22:11:44 -04:00
barisusakli
dceeed22f7 closes #1724 2014-06-21 19:54:21 -04:00
Julian Lam
458e294293 switched validator library out in favour of String lib 2014-06-21 17:17:08 -04:00
barisusakli
7d1ba0eb7c closes #1718 2014-06-21 11:52:04 -04:00
Julian Lam
d229cd21b2 parsing the post content that's passed into bodyLong in notifs #1720 2014-06-21 01:16:08 -04:00
barisusakli
f9b5bf83ad added search to admin/plugins 2014-06-20 19:35:12 -04:00
barisusakli
6303ac4a90 closes #1716, #1717 2014-06-20 19:18:17 -04:00
Julian Lam
c41bb05711 final pass #1720, closed #1720 2014-06-20 17:53:40 -04:00
Julian Lam
d257632878 first pass #1720, updating existing calls to notifications.create, backwards compatibility in case plugins create notifications too. 2014-06-20 16:54:34 -04:00
Julian Lam
454c05c391 fixed missing var in user profile 2014-06-20 15:55:17 -04:00
barisusakli
9151040250 side by side preview 2014-06-20 14:51:06 -04:00
Julian Lam
a3d01aea58 added error handling if bad LESS is written in ACP. closes #1715 2014-06-20 14:36:25 -04:00
barisusakli
13854e8774 closes #1603 2014-06-19 18:46:01 -04:00
barisusakli
03ec1c3216 added group.hide back into groups.join 2014-06-18 20:00:01 -04:00
Julian Lam
b1faca3614 saving portless hostNAME into server config, not the host! Argh. closed #1713 2014-06-18 19:34:33 -04:00
Julian Lam
adc2fcc649 added deserialize library to frontend 2014-06-18 13:11:52 -04:00
barisusakli
27f9929ac8 hook 2014-06-18 12:42:13 -04:00
barisusakli
f8afb8da3e allow plugins to add new links to user profile menu 2014-06-18 12:40:49 -04:00
Julian Lam
6f218857cb added connect-flash package. npm also alphabetically re-ordered the deps... thanks npm? 2014-06-18 10:17:50 -04:00
Julian Lam
fb504473e1 latest translations 2014-06-18 09:16:36 -04:00
Julian Lam
dedc6d8154 added new hook for notification pushing 2014-06-17 21:10:21 -04:00
barisusakli
15c16c2502 closes #1311, set category post counts to 0 before starting upgrade 2014-06-17 15:33:40 -04:00
barisusakli
7c84680b06 closes #1709 2014-06-17 13:11:13 -04:00
psychobunny
bbd4201a38 closes #1704 2014-06-17 12:58:06 -04:00
Barış Soner Uşaklı
09861cbc0e Merge pull request #1712 from char101/PR/update-global-counters-on-topic-delete-v2
Update global counters when deleting/restoring topic
2014-06-17 11:42:10 -04:00
Charles
b811bef42c Don't decrease postCount when purging post from a deleted topic 2014-06-17 12:34:09 +07:00
Charles
1448bed057 Remove console.log 2014-06-17 11:57:55 +07:00
Charles
31f1914ec8 Update global postCount when deleting/restoring topic 2014-06-17 11:56:47 +07:00
psychobunny
0c7a8b3908 no need to reset global widget areas, closes #1701 2014-06-16 15:21:15 -04:00
barisusakli
2479a34c56 closes #1710, closes #1700 2014-06-16 14:13:55 -04:00
psychobunny
db3523b10b #1701 2014-06-16 14:08:42 -04:00
barisusakli
3c44beb4bb group userTitle default 2014-06-16 13:10:00 -04:00
psychobunny
c8de2c02b4 Merge pull request #1703 from char101/patch-8
Fix widget drafts position
2014-06-16 13:09:38 -04:00
psychobunny
d2e1cc3371 Merge pull request #1707 from char101/PR/dont-reset-widgets-on-changing-skins
Don't reset widgets when changing skin
2014-06-16 13:07:43 -04:00
Barış Soner Uşaklı
da1baee511 Merge pull request #1708 from char101/PR/redirect-to-category-after-purging-topic
Redirect to category after purging topic
2014-06-16 12:51:13 -04:00
Charles
0cba152516 Redirect to category after purging topic 2014-06-16 15:49:43 +07:00
Charles
51fb7786f5 Don't reset widgets when changing skin 2014-06-16 13:01:37 +07:00
Charles
86634415da Fix widget drafts position 2014-06-16 11:59:30 +07:00
barisusakli
76190718d3 indents 2014-06-15 23:30:40 -04:00
Barış Soner Uşaklı
5b45b3395d Merge pull request #1699 from char101/patch-7
Fix client side template mapping
2014-06-15 23:29:50 -04:00
Charles
6e50016a11 Cleanup the vars 2014-06-16 10:28:57 +07:00
Charles
23a88492a6 Get template mapping after removing relative path 2014-06-16 10:25:48 +07:00
Charles
be06d386e5 Revert change to ajaxify.js 2014-06-16 10:25:03 +07:00
Charles
b748a832a2 Fix client side template mapping 2014-06-16 10:21:54 +07:00
barisusakli
39886c8545 removed unread total route 2014-06-15 21:08:43 -04:00
barisusakli
d1b4efeaa3 filter files before minify, removed unused ctime 2014-06-14 20:34:26 -04:00
barisusakli
ab80016910 fixed group hide for privilege groups 2014-06-14 18:26:16 -04:00
barisusakli
1908f7b57a filter missing less and css files from plugins 2014-06-14 18:10:38 -04:00
barisusakli
501c81e357 closes #1687 2014-06-14 14:38:48 -04:00
barisusakli
3bd4d0e418 closes #1692 2014-06-14 14:12:33 -04:00
barisusakli
bf18e70d66 small fix to title escape 2014-06-14 13:55:06 -04:00
barisusakli
07275b5fc4 some checks to make last admin isnt removed 2014-06-13 22:48:24 -04:00
barisusakli
842a1f90cf fix crash on push 2014-06-13 18:55:53 -04:00
barisusakli
42d03cc491 closes #1678 2014-06-13 18:27:03 -04:00
barisusakli
9d4f1e18e1 #1688 removed length check 2014-06-13 15:58:32 -04:00
barisusakli
cd5c24efe3 possible fix for #1688 2014-06-13 15:35:35 -04:00
barisusakli
4c2765a79c closes #1679 2014-06-13 15:33:22 -04:00
barisusakli
ce1934e566 closes #1684 2014-06-13 13:57:42 -04:00
psychobunny
8402c3edc3 closes #1680 2014-06-13 12:21:00 -04:00
barisusakli
3b1e373e7b group titles 2014-06-12 18:53:58 -04:00
barisusakli
e8b89513d4 some cleanup in addUserInfoToPost 2014-06-12 16:45:00 -04:00
barisusakli
b9139ef263 some escaping and fixed uploads in progress 2014-06-12 13:58:21 -04:00
psychobunny
3198275209 use "undo" icon instead of comment for restoring posts 2014-06-11 16:47:20 -04:00
psychobunny
b12ca5ab9f closes #1673 2014-06-11 16:42:13 -04:00
barisusakli
870bf95e5b deleted topic feed fix 2014-06-11 13:04:24 -04:00
psychobunny
eeabae5738 closes https://github.com/NodeBB/NodeBB/issues/1668 2014-06-11 12:04:22 -04:00
psychobunny
b5a06e58fd Merge pull request #1667 from a5mith/patch-1
Few changes to the Ubuntu Installation Guide
2014-06-11 11:28:20 -04:00
barisusakli
3f9fa0137c taskbar text incase <script> is title 2014-06-11 03:38:42 -04:00
barisusakli
4fa79dc821 closes #1281
category purge, deletes all topics and posts in the category
2014-06-10 17:48:48 -04:00
barisusakli
311a7ad5b9 #1281 topic purge 2014-06-10 16:57:00 -04:00
Aaron Smith
72f9605414 Few changes to the Ubuntu Installation Guide
Changes: 

Removed `cd/path/to/nodebb/install` as we haven't instructed how to create the directory before changing to it. The git pull will create the nodebb directory in their root/profile folder anyway, which is fine for most installs. 

Added sudo to the base stack install.

Added command for checking Node.js version. 

The guide at the minute might seem a bit daunting for newer users, so if psychobunny doesn't mind, I could create a post over on the community for an up to date noobs guide on how to install using digital ocean as an example. Then if it helps, add it to the docs. (Also, changes in this github aren't showing up in docs.nodebb, the update to sudo apt-get update && sudo apt-get dist-upgrade aren't displayed.

Hope this helps.
2014-06-10 21:40:58 +01:00
psychobunny
b43602f5b6 closes https://github.com/NodeBB/NodeBB/issues/1631 2014-06-10 15:32:08 -04:00
psychobunny
2688ea9733 upgrading topics take a while, so let the user know 2014-06-10 15:14:25 -04:00
psychobunny
35e72dbb37 load composer-mobile.tpl if in xs/sm environment, for https://github.com/NodeBB/NodeBB/issues/1657 2014-06-10 14:45:56 -04:00
barisusakli
a65d612907 #1281 post purge 2014-06-10 14:24:56 -04:00
barisusakli
eb1b48092d closes #1666 2014-06-10 14:24:56 -04:00
psychobunny
e5d465392f closes #1639 2014-06-10 13:40:37 -04:00
psychobunny
8443ae58ff users.getXbyEmail - lowercase before searching 2014-06-10 13:35:31 -04:00
Barış Soner Uşaklı
3b55e65714 Merge pull request #1664 from char101/patch-6
Fix callback execution in redis search
2014-06-10 11:57:44 -04:00
Charles
90b2d766f7 Fix callback execution in redis search
`callback` should be passed to `reds.search` otherwise the execution will be overlapped. 

For example in the plugin `nodebb-plugin-dbsearch':

```javascript
db.searchRemove('topic', tid, function() {
	if (typeof title === 'string' && title.length) {
		db.searchIndex('topic', title, tid);
	}

	if (typeof callback === 'function') {
		callback();
	}
});
```

The actual execution is like this

```
1402387863.625553 [0 127.0.0.1:16660] "zrevrangebyscore" "nodebbtopicsearch:object:6" "+inf" "0"
1402387863.625891 [0 127.0.0.1:16660] "MULTI"
1402387863.626043 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:word:123" "1" "6"
1402387863.626052 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:object:6" "1" "123"
1402387863.626060 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:word:TST" "1" "6"
1402387863.626065 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:object:6" "1" "TST"
1402387863.626071 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:word:AN0" "1" "6"
1402387863.626076 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:object:6" "1" "AN0"
1402387863.626083 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:word:TPK" "1" "6"
1402387863.626092 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:object:6" "1" "TPK"
1402387863.626104 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:word:ETTT" "1" "6"
1402387863.626116 [0 127.0.0.1:16660] "zadd" "nodebbtopicsearch:object:6" "1" "ETTT"
1402387863.626130 [0 127.0.0.1:16660] "EXEC"
1402387863.626253 [0 127.0.0.1:16660] "del" "topic:6:tags"
1402387863.626281 [0 127.0.0.1:16660] "MULTI"
1402387863.626515 [0 127.0.0.1:16660] "del" "nodebbtopicsearch:object:6"
1402387863.626524 [0 127.0.0.1:16660] "EXEC"
```

The key nodebbtopicsearch:object is added and then just being deleted again.
2014-06-10 15:30:53 +07:00
Barış Soner Uşaklı
a7bd83a549 Merge pull request #1663 from char101/patch-5
Fix relative path on topic replaceState
2014-06-09 22:51:56 -04:00
Charles
c7b308d65e Fix relative path on topic replaceState 2014-06-10 09:46:38 +07:00
barisusakli
b9c30aa42d possible fix to #1660
modified the tagsinput source to use keypress instead of keydown for the
confirmKeys
2014-06-09 22:46:04 -04:00
Julian Lam
a40b06c304 latest translations 2014-06-09 20:18:56 -04:00
Julian Lam
d66bead245 Merge remote-tracking branch 'origin/master' 2014-06-09 19:56:14 -04:00
Julian Lam
b655474150 fixed #1661 2014-06-09 19:56:05 -04:00
barisusakli
833aa0f738 derp 2014-06-09 12:51:49 -04:00
barisusakli
b81f3552bb fixed typo 2014-06-09 02:34:21 -04:00
barisusakli
b5071d504f removed timing #1654 2014-06-09 02:33:07 -04:00
barisusakli
d4b48cd2ac closes #1654 2014-06-09 02:32:32 -04:00
barisusakli
aadca3a675 fix calls to removeRelativePath in ajaxify.js 2014-06-09 02:13:19 -04:00
barisusakli
db84ced78f removeRelativePath public 2014-06-09 02:03:36 -04:00
barisusakli
4bdbce9cd8 use removeRelativePath in app.js too 2014-06-09 01:28:58 -04:00
Barış Soner Uşaklı
26309b5d65 Merge pull request #1658 from char101/patch-4
Fix removeRelativePath
2014-06-09 01:26:58 -04:00
Charles
9734403114 Fix removeRelativePath
Instead of checking the existence of relative_path (without /) anywhere on the url, it really should check that the url only starts with the relative_path.

Example

```
relative_path = /forum
without / = forum
url = /category/forum/5
removeRelativePath = ory/forum/5
```
2014-06-09 12:21:58 +07:00
barisusakli
974e0823d8 copyright 2014-06-08 17:48:33 -04:00
barisusakli
ee88693448 callback 2014-06-08 16:06:42 -04:00
barisusakli
178f567659 closes #1655 2014-06-07 15:34:25 -04:00
barisusakli
b7f71ca0b4 fixes removePostFromTopic
remove the pid from the votes set too
2014-06-07 13:04:30 -04:00
barisusakli
bf04749f5e fixes posttools.ismain 2014-06-07 11:38:43 -04:00
barisusakli
d32dfd98b7 remove main post if page is greater than 1
this fixes pagination after the main post change
2014-06-06 23:09:05 -04:00
barisusakli
7610c11cd1 closes #450
backup database before upgrade!
upgrade script will take the first post of each topic and set the
`mainPid` property on the topic. then it will remove that pid from the
sorted sets for that topic, this was done to make alternative sorting
work.

added a new sorted set called `tid:<id>:posts:votes` that is used to
sort topic posts by vote count, the original sorted set `tid:<id>:posts`
is used to sort by oldest first or newest first.

the main post is added to the returned posts array on topic load and is
always at the top.
theme changes are minimal just a few new data properties on the posts
and the sorting dropdown.
hopefully didn't miss anything too critical.
2014-06-06 22:12:19 -04:00
psychobunny
c5b8a7b163 filter:templates.get_virtual for ajaxifying to virtual templates 2014-06-06 17:30:23 -04:00
Julian Lam
b648e84836 latest translations and fallbacks 2014-06-06 16:50:32 -04:00
Julian Lam
57f40e1e1c Merge pull request #1648 from char101/patch-1
Add relative_path to authentication redirects
2014-06-06 16:27:33 -04:00
Julian Lam
b44cbc89ad Merge branch 'master' of github.com:Fastinyoh/NodeBB into Fastinyoh-master 2014-06-06 15:47:03 -04:00
Julian Lam
8587dd11d8 closed #1653 -- removed that spinner thing npm uses now. 2014-06-06 15:44:14 -04:00
Charles
5f1b1ad2bf Also add relative_path to destination
Because the destination url does not include the relative_path
2014-06-06 18:36:02 +07:00
Charles
ce083573a9 Fix typo 2014-06-06 18:06:42 +07:00
Charles
f26a250b01 Add relative_path to authentication redirects 2014-06-06 18:05:26 +07:00
dhingey
b57dbc37cd Fix relative path URL bugs in the plugin API.
Fixes plugin-related 404 URLs, as well as the plugin directory URL
for installations which use a relative path.
2014-06-05 23:12:46 -07:00
psychobunny
d5c6b6c334 modifying installation instructions as per @a5mith 2014-06-05 15:41:47 -04:00
psychobunny
201a309801 added documentation for the hooks I created yesterday 2014-06-05 13:18:44 -04:00
barisusakli
f609098ca7 moved secondry db config message #1645 2014-06-05 10:59:21 -04:00
barisusakli
8d0c659f08 small fix to redirect 2014-06-04 19:54:29 -04:00
barisusakli
61b79de3e8 closes #1641 2014-06-04 19:35:08 -04:00
psychobunny
a0bdd06a6a filter:user.custom_fields - ability to add custom fields into userData 2014-06-04 18:55:37 -04:00
psychobunny
013f62cd7d action:user.verify & filter:user.verify.code - plugins can now override the verification system 2014-06-04 18:55:35 -04:00
psychobunny
31adf7084d filter:register.complete - plugins can redirect the user elsewhere post-registration 2014-06-04 18:55:34 -04:00
psychobunny
4bb8762746 send in the entire registration form for userData 2014-06-04 18:55:33 -04:00
barisusakli
d1c2c87510 fixed double index in post notification 2014-06-04 16:56:40 -04:00
psychobunny
5ac788565f eventEmitter.any 2014-06-04 15:57:08 -04:00
barisusakli
e1491e4182 fixed wrong admin tags on admin/user/search 2014-06-04 11:58:05 -04:00
barisusakli
7d0eb9afaa closes #1463 2014-06-04 11:14:36 -04:00
barisusakli
6b93095204 more link fixes 2014-06-03 18:55:58 -04:00
barisusakli
efe04c12d3 closes #1635
if email isnt confirmed, show a warning in account/edit and let users
resend confirm email
2014-06-03 18:39:54 -04:00
barisusakli
930f1e4789 default off 2014-06-03 17:23:58 -04:00
barisusakli
65e9f68d73 change requireEmail default to off 2014-06-03 17:23:36 -04:00
barisusakli
4aec62f3eb #1636
👼
2014-06-03 16:42:45 -04:00
psychobunny
87a08c9528 closes #1636 2014-06-03 16:34:50 -04:00
barisusakli
b537666e5c closes #1592, closes #1634 2014-06-03 16:10:28 -04:00
psychobunny
d7eb89336d add logo to windows live tile 2014-06-03 15:38:51 -04:00
psychobunny
cf3f33a23d closes #1633 2014-06-03 15:27:08 -04:00
barisusakli
b2e48b21a2 pass url to onAjaxError 2014-06-03 14:58:24 -04:00
psychobunny
e88abcc1d9 fixed updated language strings 2014-06-03 14:38:33 -04:00
psychobunny
b881131a65 fixes #1632 2014-06-03 14:32:41 -04:00
barisusakli
6bd4524a79 fixed share for category 2014-06-03 13:16:19 -04:00
barisusakli
573cb4b4d7 fixed share links 2014-06-03 13:12:28 -04:00
barisusakli
123d1e06f1 closes #1578 2014-06-03 13:02:44 -04:00
barisusakli
e20920c536 closes #1630 2014-06-03 12:30:36 -04:00
barisusakli
0574022e02 fixes to infinitescroll 2014-06-02 20:41:08 -04:00
psychobunny
c342e75f6e Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-06-02 17:42:52 -04:00
psychobunny
94312cfda8 closes #1595 2014-06-02 17:42:29 -04:00
psychobunny
f6cf36ca29 emit nodebb:ready 2014-06-02 17:40:08 -04:00
psychobunny
646f0f00b3 move "NodeBB Ready" message to when it's actually ready 2014-06-02 17:34:13 -04:00
psychobunny
5891246700 emitter.all 2014-06-02 17:33:44 -04:00
barisusakli
55dbc5c823 closes #1612
changed post links to "topic/<topic_id>/<topic_slug>/<post_id>"
2014-06-02 17:31:14 -04:00
psychobunny
46028e49f7 closes #1600 2014-06-02 16:58:38 -04:00
psychobunny
aafbb55572 closes #1616 2014-06-02 16:52:16 -04:00
psychobunny
ee1e869ccb add loggedIn state to template parsing 2014-06-02 15:57:24 -04:00
psychobunny
0816928949 unset preloader cache after loading url 2014-06-02 15:00:43 -04:00
psychobunny
22d459d4cc temporary fixes for chrome users who have cookies disabled 2014-06-02 14:58:27 -04:00
barisusakli
aa0b9f9029 semicolon 2014-06-02 14:03:01 -04:00
barisusakli
ee9fae581e closes #1618 2014-06-02 13:12:48 -04:00
barisusakli
09d4f4b47b leaving tags box will create tag 2014-06-02 13:10:52 -04:00
barisusakli
4570edb122 closes #1623 2014-06-02 12:44:37 -04:00
barisusakli
d0c468c190 new language string 2014-06-02 12:36:15 -04:00
psychobunny
92b0b926c7 instructions on how to reset plugins 2014-06-01 22:55:59 -04:00
barisusakli
69ac63ed4e updated repo link in admin 2014-06-01 11:57:44 -04:00
barisusakli
364d55938c if no categories found return empty array 2014-05-31 22:24:22 -04:00
psychobunny
257491801d optimizing template compilation 2014-05-31 17:08:24 -04:00
psychobunny
c97d6635fc plugin templates now have higher priority than theme templates 2014-05-31 17:06:27 -04:00
psychobunny
85aa88e6ed show correct path on windows 2014-05-31 16:53:18 -04:00
Julian Lam
ef831cca9a Merge branch 'patch-1' of github.com:giorgiochiodi/NodeBB into giorgiochiodi-patch-1
closes #1614
2014-05-31 15:33:19 -04:00
psychobunny
8c735ce4dd updating credits in the docs to the people who deserve it ;) 2014-05-31 03:10:20 -04:00
psychobunny
b21d6c76cf closes #1615 2014-05-31 01:58:26 -04:00
psychobunny
09c632330b render widgets sooner 2014-05-30 17:52:33 -04:00
psychobunny
cad10a3f9e implemented caching for widgets 2014-05-30 17:38:03 -04:00
psychobunny
28dcb9e33d pair programming ftw 2014-05-30 17:27:57 -04:00
psychobunny
a1815b41c7 I still don't know what I'm fixing, I'm just doing as @barisusakli says 2014-05-30 17:25:23 -04:00
psychobunny
7197f9b621 fixes... something, whatever it is @barisusakli 2014-05-30 17:23:35 -04:00
psychobunny
f2bf9f9383 fixes for windows (flex) @julianlam 2014-05-30 17:13:20 -04:00
Julian Lam
b0464ff912 fixed another hardcoded prefix value 2014-05-30 17:11:37 -04:00
Julian Lam
86457558b0 no more hardcoding of the prefix value for minification mapping 2014-05-30 16:27:42 -04:00
psychobunny
bfcd13144e Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-05-30 15:35:30 -04:00
psychobunny
4ee055c3ea closes #1608 2014-05-30 15:30:37 -04:00
psychobunny
bbcff6a0a5 moved widget rendering up a bit 2014-05-30 15:29:17 -04:00
psychobunny
ff25c4600a yeah.. woops 2014-05-30 15:27:50 -04:00
barisusakli
e035d8f1de closes #1497
fixes user images in subfolder installs, if user image has https dont
append relative_path,
also removes relative_path in ajaxify.loadData so it doesnt call
/forum/api/forum/category etc.
2014-05-30 15:22:52 -04:00
psychobunny
c7691a8cdc Merge remote-tracking branch 'origin/master' into require.js
Conflicts:
	src/meta.js
2014-05-30 15:18:17 -04:00
Julian Lam
be19222817 en_US will no longer throw js error from missing timeago file 2014-05-30 14:45:55 -04:00
Barış Soner Uşaklı
125b18f704 Merge pull request #1610 from JonathanMH/patch-1
backup instructions for mongodb
2014-05-30 14:27:56 -04:00
Jonathan
fceb4ca134 backup instructions for mongodb 2014-05-30 19:53:34 +02:00
Julian Lam
b553d44107 plugin source mapping fix -- closes #1609 2014-05-30 09:17:10 -04:00
Julian Lam
53f5dbfeca updating package.json to use my fork 2014-05-30 09:17:10 -04:00
Julian Lam
256fa937d8 added last two missing options to source map config 2014-05-30 09:17:10 -04:00
Julian Lam
f8061e23ec source map support, first pass 2014-05-30 09:17:10 -04:00
psychobunny
3ba51b05f7 fixing the minified version of string.js instead 2014-05-29 17:46:44 -04:00
psychobunny
65f3fa1bbc fixing string.js compatibility 2014-05-29 17:44:41 -04:00
psychobunny
f0811f7a2f added buzz; cleanup 2014-05-29 17:42:53 -04:00
psychobunny
f98a52013a Merge remote-tracking branch 'origin/master' into require.js 2014-05-29 17:25:16 -04:00
psychobunny
281aa0049c init, attempt to increase cold load speed 2014-05-29 17:24:38 -04:00
barisusakli
5ae29ef33a fix sitemap 2014-05-29 15:36:28 -04:00
barisusakli
652e1ef574 closes #1597
turns out clicking back causes double script.init() calls and
ajaxify.variables.get('topic_id') can be undefined in one of those
calls.
2014-05-29 12:09:54 -04:00
Julian Lam
584fe60284 fixed #1554, redis error handling will go back to crashing the error (though the error will be logged at least) 2014-05-28 20:40:40 -04:00
psychobunny
5b17f9a7a4 added caching per url + rate limiting mechanism to prefetcher, closes #1576 2014-05-28 19:03:54 -04:00
psychobunny
1e05a92c1e no need to send prefetched state anymor 2014-05-28 18:24:30 -04:00
psychobunny
b2b76f701d woops, okay actually fixing it properly this time 2014-05-28 18:23:59 -04:00
psychobunny
d5e55d27ed fix for previous commit 2014-05-28 18:22:34 -04:00
psychobunny
d81351579d don't require passing in uid for topics.markAsRead 2014-05-28 18:21:15 -04:00
psychobunny
791fde7904 fixing #1587 properly for unread count 2014-05-28 18:20:02 -04:00
psychobunny
08bbf7fdd8 console.log 2014-05-28 18:16:26 -04:00
psychobunny
0334a487b5 fixing #1587 properly for profile views 2014-05-28 18:15:53 -04:00
psychobunny
74097be2e4 additional fix for #1587 2014-05-28 17:49:31 -04:00
psychobunny
71214c6255 fixed preloader 2014-05-28 17:48:03 -04:00
psychobunny
fee591e551 fixes #1587 2014-05-28 17:43:03 -04:00
psychobunny
1fecbd0b90 fixed function signature for ajaxify.loadData 2014-05-28 17:26:28 -04:00
psychobunny
bfa3b0f22f global header widgets 2014-05-28 16:30:29 -04:00
barisusakli
351e376812 hide area if there are no widgets 2014-05-28 16:24:10 -04:00
barisusakli
9c0446d416 closes #1593 2014-05-28 14:18:00 -04:00
barisusakli
e1ad2537b6 fixes navigator progress bar 2014-05-28 13:13:29 -04:00
barisusakli
c852574cef closes #1572 2014-05-28 13:04:19 -04:00
barisusakli
fbdff5bb43 name too short error string 2014-05-28 12:09:25 -04:00
barisusakli
60742ce316 closes #1590, closes #1589 2014-05-27 21:12:57 -04:00
barisusakli
0dce8647ba closes #1476 2014-05-27 15:15:06 -04:00
Barış Soner Uşaklı
50d37d65f9 Merge pull request #1583 from tomcheung789/patch-1
Update mongo.rst
2014-05-27 14:55:37 -04:00
barisusakli
eb0a06b777 closes #1577 2014-05-27 14:53:51 -04:00
Julian Lam
667a78902e closed #1586 2014-05-27 13:30:27 -04:00
barisusakli
48aba5fc64 category widget changes 2014-05-27 12:44:28 -04:00
Julian Lam
640500bc5f closed #1437 2014-05-27 09:52:27 -04:00
Julian Lam
93e3eb4d28 fixed #1584 2014-05-27 09:20:03 -04:00
Chong Cheung
6c17fb49ef Update mongo.rst
1. Use db.createUser() instead of db.addUser() to add users to MongoDB. Deprecated since version 2.6
2. NodeBB causes mongo error during setup procedure. Change the role from "userAdmin" to "readWrite".
2014-05-27 14:12:49 +08:00
Julian Lam
eb2929f497 removing slufigication when checking for group existence 2014-05-26 21:37:50 -04:00
Julian Lam
64c6546daa updating mentions minver #1331 2014-05-26 21:22:06 -04:00
Julian Lam
3baf00208f slugifying group name when checking for existence 2014-05-26 21:13:18 -04:00
Julian Lam
8efb930ec0 site title fallbacks for daily digest titles 2014-05-26 18:50:08 -04:00
barisusakli
e685e7c376 removed console.log 2014-05-26 14:52:48 -04:00
barisusakli
4e8a9fbe27 closes #1582 2014-05-26 14:49:08 -04:00
psychobunny
9c2bb027d3 fire action:widgets.loaded regardless of callback 2014-05-26 12:26:41 -04:00
psychobunny
bf63c927c6 trigger ajaxify.loadingData regardless of cached state 2014-05-26 12:00:37 -04:00
psychobunny
6aeec3a399 action:widgets.loaded 2014-05-26 11:38:04 -04:00
Julian Lam
b0b28fad8e removing console logs 2014-05-25 15:57:00 -04:00
Julian Lam
753779296b increased sitemap cache time -- #1578 2014-05-25 15:39:54 -04:00
Julian Lam
d948f2a29d moved login via email detection into the internal login block 2014-05-25 13:08:56 -04:00
barisusakli
04309ac09c show error message if password empty 2014-05-25 13:04:58 -04:00
barisusakli
18810e7203 allow dots in tags 2014-05-25 12:49:41 -04:00
barisusakli
9079d7f26f fix create tags crash if no callback is passed 2014-05-25 12:38:49 -04:00
Julian Lam
d0d5c5a8a5 added FAQ entry for #1537 -- closed #1537 2014-05-24 20:33:58 -04:00
psychobunny
7f011fe583 calling it ajaxify.preloader instead 2014-05-24 18:54:55 -04:00
psychobunny
eb69d898ce use cache-buster in translator instead of timestamp 2014-05-24 17:58:49 -04:00
psychobunny
d5bf83f43f closes #1570 2014-05-24 17:35:29 -04:00
Julian Lam
b1eb5b175c Merge remote-tracking branch 'origin/master' into groups-pages
Conflicts:
	src/topics/tags.js
2014-05-24 12:38:16 -04:00
Barış Soner Uşaklı
16304ced50 Merge pull request #1568 from akhoury/patch-2
my bad
2014-05-24 10:36:47 -04:00
Aziz Khoury
e0a5cb2b44 my bad
:/
2014-05-24 10:21:20 -04:00
barisusakli
1a753bf64d fixes forking
if there are no tags just return
2014-05-24 06:29:44 -04:00
barisusakli
b6e0a2ecce parseInt 2014-05-23 22:55:58 -04:00
Julian Lam
d74de798fc removing backwards compatibility fixed in preparation for 0.5.0. Prepare for stuff to break!!!!! 2014-05-23 19:13:22 -04:00
barisusakli
e505a9a6ac changed order of cleanup 2014-05-23 19:07:39 -04:00
barisusakli
b7fcde446b proper score aggregation #1562 2014-05-23 17:03:53 -04:00
barisusakli
5e51895982 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-05-23 15:36:58 -04:00
barisusakli
7585b72644 remove duplicates 2014-05-23 15:36:54 -04:00
psychobunny
7895bf3e2f updated logo again 2014-05-23 15:34:20 -04:00
psychobunny
d728c54b30 updated logo 2014-05-23 15:32:43 -04:00
psychobunny
4cd86affae update all files with new url 2014-05-23 15:21:51 -04:00
psychobunny
5f6217e831 update all docs with new url 2014-05-23 15:21:36 -04:00
barisusakli
dbf07f786d closes #1565 2014-05-23 15:01:54 -04:00
Julian Lam
4ca04067f0 updated badges 2014-05-23 14:42:50 -04:00
psychobunny
abe01ba720 Update README.md 2014-05-23 14:38:07 -04:00
barisusakli
b32bb76429 #1562 2014-05-23 14:30:59 -04:00
Julian Lam
f20926f93d finished up group list and group details pages - closed #1563 2014-05-23 09:49:18 -04:00
Julian Lam
7afe3bea59 added getSortedSetRevUnion... just because. 2014-05-23 09:49:18 -04:00
Julian Lam
6e597a9cdb fixed tests, and added getSortedSetUnion method to redis db, added test for new redis method 2014-05-23 09:49:18 -04:00
Julian Lam
840a56006c added missing files for #1563 2014-05-23 09:49:18 -04:00
Julian Lam
7425b72245 most of the work for #1563 2014-05-23 09:49:18 -04:00
Julian Lam
7bdbb966aa groups pages WIP 2014-05-23 09:49:18 -04:00
barisusakli
66701afdaa closes #1559
fixes the notification image too, the property was called image not
picture
2014-05-22 21:31:52 -04:00
Julian Lam
4be979f88d Merge pull request #1564 from MrHohenheim/patch-1
Update user.json
2014-05-22 21:17:34 -04:00
Pénzes Tamás
9d0672f193 Update user.json 2014-05-23 03:04:34 +02:00
barisusakli
ee1495a44d fixes reply/quote buttons on new posts 2014-05-22 18:24:58 -04:00
barisusakli
e003582289 fixes redirect loop for empty slugs 2014-05-22 15:05:29 -04:00
barisusakli
b8b482e287 closes #1555 2014-05-22 14:56:15 -04:00
barisusakli
fa1275c03a closes #1557 2014-05-22 14:41:11 -04:00
barisusakli
746df87d89 upgrade tags to sorted set 2014-05-22 13:06:19 -04:00
barisusakli
853acaa6c7 closes #1558 2014-05-22 11:42:55 -04:00
Julian Lam
8a510c340b limiting user and group creation so that their slugs can't intersect. 2014-05-22 10:21:27 -04:00
barisusakli
51e07e197b added isSelf to account route 2014-05-21 21:52:10 -04:00
barisusakli
a1de4cb2dd added no tags language key 2014-05-21 21:27:49 -04:00
Julian Lam
8df40c4b74 latest translations and fallbacks 2014-05-21 21:26:27 -04:00
barisusakli
3f43db090b return topics tags #1557 2014-05-21 21:15:11 -04:00
barisusakli
87fe5bf1bb delete tag if it has no topics left 2014-05-21 20:25:35 -04:00
barisusakli
56f442f283 remove punctuation and limit tag length 2014-05-21 20:20:44 -04:00
barisusakli
90cea84af9 max 5 tags per topic
asdasd
2014-05-21 19:50:27 -04:00
barisusakli
d8fd29581e deleting a user will delete topic tags too 2014-05-21 19:39:10 -04:00
barisusakli
df73ceaeb7 closes #1556
added tag input box to composer when creating a topic
added new routes for viewing tags 'tags' and 'tags/:tagname'
respectively
post_bar.tpl shows the tags of the topic
can edit the main post to remove or add new tags
added a new menu item to header to go to the tags page
2014-05-21 16:13:51 -04:00
Julian Lam
1d7c293197 added option to remove ephemeralGroups from groups listing 2014-05-21 11:30:32 -04:00
Julian Lam
3849b2d6b3 added pushGroup method to notifications object #1331 2014-05-21 11:30:32 -04:00
barisusakli
dfa1150709 fix missing category data 2014-05-21 00:03:22 -04:00
barisusakli
c7c54560bc fixes going into deleted topics for admins 2014-05-20 20:21:57 -04:00
barisusakli
1e68974f50 small refactor 2014-05-20 17:46:17 -04:00
Julian Lam
9bb13a0d29 closed #1552 2014-05-20 14:45:04 -04:00
psychobunny
7f7cc8dc62 merging in latest templates.js 2014-05-20 13:52:12 -04:00
barisusakli
b30dee2601 no need to store titleEl 2014-05-20 13:23:09 -04:00
barisusakli
4397b7ab4b removed meta.scripts.get warning #1544 2014-05-20 12:38:33 -04:00
barisusakli
9ba0dc3363 closes #1539 2014-05-20 12:35:46 -04:00
giorgiochiodi
6d50ae7624 Update ubuntu.rst 2014-05-20 16:34:34 +02:00
barisusakli
05872ad458 closes #1545 2014-05-19 21:28:26 -04:00
barisusakli
cd08a16f77 return post count to with categories 2014-05-19 19:24:06 -04:00
barisusakli
4acc264cb8 added upload error string 2014-05-19 18:42:21 -04:00
barisusakli
20a707e6c1 uploads cleanup 2014-05-19 15:33:41 -04:00
Julian Lam
152a307b51 Merge pull request #1543 from akhoury/patch-1
Update hooks.rst
2014-05-19 14:08:02 -04:00
Aziz Khoury
2a333fddeb Update hooks.rst 2014-05-19 14:01:26 -04:00
Aziz Khoury
a62fe8d4e2 Update hooks.rst 2014-05-19 14:00:29 -04:00
Barış Soner Uşaklı
75d018a35f Merge pull request #1541 from akhoury/master
filter:register.build now returns what it was passed, in order.
2014-05-19 12:38:53 -04:00
Aziz Khoury
8d6a8dc928 filter:register.build now returns what it was passed, in order. fixes #1540, we seriously need to consider standarizing the hooks arguments, maybe some ideas here #1527 2014-05-19 12:29:52 -04:00
barisusakli
5cf9b0a3bd fix feed crash 2014-05-18 16:21:34 -04:00
barisusakli
e869a6a15a composer refactor 2014-05-18 15:09:58 -04:00
Julian Lam
2e49fe9f50 fixed meta property to name, for keywords 2014-05-18 12:09:47 -04:00
Julian Lam
58b6a2e9ea Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-05-17 22:21:50 -04:00
Julian Lam
e9252ca745 fixing language code for viet and thai 2014-05-17 22:21:43 -04:00
barisusakli
472e6b5206 privilege cleanup 2014-05-17 18:59:34 -04:00
barisusakli
ff2bad635c infinite scroll refactor 2014-05-17 17:55:55 -04:00
Julian Lam
e43ebb0423 Merge pull request #1533 from akhoury/master
captcha support
2014-05-17 16:01:44 -04:00
Julian Lam
6ec36a00ad Merge branch 'master' of github.com:chiehwen/NodeBB into chiehwen-master 2014-05-17 15:19:07 -04:00
Julian Lam
dfe34cafb8 latest translations for slovak 2014-05-17 15:17:31 -04:00
Chieh-Wen Yang
d56b05bd90 I have translated to zh_TW. 2014-05-18 00:57:00 +08:00
Barış Soner Uşaklı
485c908510 Update README.md 2014-05-16 17:27:27 -04:00
Julian Lam
5f89293301 upgrade script for #1282 2014-05-16 16:48:26 -04:00
Julian Lam
b1534b7798 removing allowGuestPosting logic in NodeBB 2014-05-16 16:29:43 -04:00
Julian Lam
3474cdc5ea added new privilege "find", added guest meta group, closed #1282 2014-05-16 15:47:04 -04:00
Julian Lam
c297e2f2f8 ephemeral groups - guests 2014-05-16 15:10:06 -04:00
Julian Lam
118723e185 force update translations. 2014-05-16 14:38:51 -04:00
barisusakli
629648bc7d closes #1535 2014-05-16 13:28:38 -04:00
Aziz Khoury
0e0f66ba9e minor cleanups. 2014-05-16 09:39:46 -04:00
Aziz Khoury
230b4a0952 now really fix topic/1503 2014-05-16 01:55:13 -04:00
Aziz Khoury
c7734937fb added a bunch of useful utils functions 2014-05-16 01:38:47 -04:00
Aziz Khoury
611fd380eb fixes topic/1503 2014-05-16 01:38:20 -04:00
Aziz Khoury
d3a11f7ad8 Merge remote-tracking branch 'upstream/master' 2014-05-16 00:12:14 -04:00
Julian Lam
81bf5e4ad2 updated package.json back to tildes... 2014-05-15 23:37:07 -04:00
barisusakli
b1aae05a08 closes #1518 2014-05-15 20:49:47 -04:00
psychobunny
033364a2a9 move code from footer.js into admin.js 2014-05-15 17:16:24 -04:00
Julian Lam
33601af7cd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-05-15 16:33:50 -04:00
Julian Lam
7dffc2a2e9 moving chat timestamp to top of message, not end 2014-05-15 16:33:36 -04:00
Julian Lam
f63b9af86c missed a backtick 2014-05-15 16:20:58 -04:00
Julian Lam
b2b3723fd5 updated instructions for upgrading nodebb 2014-05-15 16:17:25 -04:00
barisusakli
29420d6f82 fixed indents 2014-05-15 10:49:53 -04:00
barisusakli
bb34834742 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-05-15 10:38:52 -04:00
barisusakli
3e86bdb38f more work on #1518
still needs more work, category is next
2014-05-15 10:38:02 -04:00
Julian Lam
45926b308c added korean language files to NodeBB, thanks @g6123! 2014-05-15 09:43:14 -04:00
유성매직
e600bee52b added Korean translation 2014-05-15 22:22:04 +09:00
barisusakli
822cf56af1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-05-15 07:48:46 -04:00
barisusakli
292e4bbdd6 fixed post privilege privilege 2014-05-15 07:48:21 -04:00
Aziz Khoury
bab88893f1 changing 'filter:register.check' hook signature to provide req, res and data 2014-05-15 03:10:15 -04:00
Aziz Khoury
aff3c9558a hook error print to console in dev env 2014-05-15 03:08:24 -04:00
Aziz Khoury
61a5d4768a global var 2014-05-15 03:07:38 -04:00
Aziz Khoury
086013829b added 'filter:register.build' hook to augment register template data 2014-05-15 03:06:47 -04:00
psychobunny
9040813b0d closes #1530 2014-05-14 19:00:05 -04:00
psychobunny
3b00417d99 added colorPicker to branding inputs 2014-05-14 18:51:06 -04:00
psychobunny
4cf6ebda7b updated enableColorPicker to accept either a jQ obj or a string; updated it to be able to initialize several inputs at once 2014-05-14 18:50:50 -04:00
psychobunny
29137299c2 added public/src/admin.js; moved enableColorPicker into admin.enableColorPicker 2014-05-14 18:46:11 -04:00
psychobunny
e2312c8330 branding settings on ajaxify fixed 2014-05-14 18:30:25 -04:00
psychobunny
a5a2e6f04e update BS brand colors in ACP 2014-05-14 18:05:28 -04:00
barisusakli
4234057821 first pass for #1518
this only handles postTools privileges, topic and category will follow
2014-05-14 17:53:27 -04:00
psychobunny
ec5cdd178a added function to update branding colors 2014-05-14 17:15:22 -04:00
psychobunny
70b5f9addc some regex to scour the CSS and figure out the branding colors 2014-05-14 17:07:31 -04:00
psychobunny
d734f9f230 removed unused faq.rst 2014-05-14 15:33:32 -04:00
psychobunny
a48403dd22 updated faq 2014-05-14 15:33:31 -04:00
barisusakli
f29dda4b92 fixed 1 more 2014-05-14 14:59:35 -04:00
barisusakli
3643fbc212 fixes 2 privilege issues 2014-05-14 14:56:46 -04:00
Julian Lam
52cb62960f added reset code to disable ONE plugin, updated FAQ 2014-05-14 11:20:23 -04:00
Julian Lam
cd9abcde74 updated package deps in 0.4.x branch so it doesn't pull theme versions that are too new
Conflicts:
	package.json
2014-05-14 00:30:10 -04:00
Julian Lam
66225237a0 view_deleted fix for privs 2014-05-13 21:22:06 -04:00
Julian Lam
34b522f36d missed a bunch of "editable" checks 2014-05-13 21:21:24 -04:00
barisusakli
ac65655384 fixed missing return 2014-05-13 21:13:54 -04:00
Julian Lam
6604a29f74 upgrade script for new privilege system 2014-05-13 19:03:20 -04:00
Julian Lam
b5d4e62e70 fixed bug in privileges system, thanks TravisCI! 2014-05-13 18:18:08 -04:00
Julian Lam
759775ecbe Merge remote-tracking branch 'origin/master' 2014-05-13 18:00:01 -04:00
Julian Lam
87cb1699fd arbitrarily increasing lavender's minver too 2014-05-13 17:59:42 -04:00
Julian Lam
2d20478b8d updated vanilla version req. 2014-05-13 17:59:07 -04:00
Julian Lam
5b3318608e updated text copy -- closed #933 2014-05-13 17:58:01 -04:00
Julian Lam
87f4566e06 more fixed to privs, and ACP modal 2014-05-13 17:06:58 -04:00
Julian Lam
d54ecea506 more privilege changes 2014-05-13 17:06:58 -04:00
Julian Lam
7c8b442dcd more updates to privileges revamp 2014-05-13 17:06:58 -04:00
Julian Lam
72ca0d6d40 got privilege selection working for users and groups 2014-05-13 17:06:58 -04:00
Julian Lam
186943ced1 removing old html in js 2014-05-13 17:06:58 -04:00
Julian Lam
7fe0ab6022 migrated views in js into partials 2014-05-13 17:06:58 -04:00
barisusakli
4f11ac9664 fixed missing comma 2014-05-13 16:45:37 -04:00
barisusakli
da72924187 removed duplication 2014-05-13 16:44:44 -04:00
Julian Lam
0e20350ca7 0.4.3 2014-05-13 16:40:19 -04:00
Julian Lam
ea6576c6f3 latest translations and fallbacks 2014-05-13 16:39:56 -04:00
psychobunny
97d256c372 cleanup 2014-05-13 12:09:21 -04:00
barisusakli
c5d9a68b4b closes #1445 2014-05-12 18:42:13 -04:00
barisusakli
fc00586f0e 0 disables flags for ban 2014-05-12 14:53:53 -04:00
barisusakli
c7744d7a64 closes #1483 2014-05-12 14:51:39 -04:00
psychobunny
9efc341772 updated docs for alert closefn/clickfn 2014-05-12 13:03:49 -04:00
psychobunny
240932dd80 add cursor: pointer if alert's clickfn is defined 2014-05-12 13:02:48 -04:00
psychobunny
3c7b433e3a linting settings.js 2014-05-12 12:59:34 -04:00
psychobunny
a121ec716a Merge pull request #1517 from frissdiegurke/patch-1
fix call of expandObjBy with undefined
2014-05-12 12:17:15 -04:00
frissdiegurke
b1257f6291 fix call of expandObjBy with undefined 2014-05-12 13:40:19 +02:00
Julian Lam
41c5a90914 latest language strings 2014-05-11 23:08:28 -04:00
barisusakli
2bd15e155f remove listener before adding 2014-05-11 20:31:42 -04:00
barisusakli
1a9ab9d1d2 fixes default gravatar images if they are uploaded locally 2014-05-11 19:39:52 -04:00
barisusakli
78ccca4f63 removed comment 2014-05-11 18:57:23 -04:00
psychobunny
f2a692add7 some linting of settings.js 2014-05-11 16:41:26 -04:00
psychobunny
c3e4c7dea1 using var instead of const for < IE10 compatibility
@frissdiegurke
2014-05-11 16:34:21 -04:00
psychobunny
2b4da7ebcd Merge pull request #1514 from frissdiegurke/master
added number-type to settings framework. persist expanded object on serv...
2014-05-11 16:30:57 -04:00
barisusakli
d311995c16 closes #1516 2014-05-11 14:06:15 -04:00
FrissDieGurke
f618a9405e added settings number-field to docs 2014-05-11 18:58:01 +02:00
Julian Lam
e64c1bfec3 closed #1453 2014-05-11 11:45:20 -04:00
Julian Lam
bab140c396 added pexpire and pexpireAt methods for redis and mongo. Added emoticons for leveldb (as per existing implementation by @psychobunny LOL) 2014-05-11 10:31:32 -04:00
Julian Lam
4e0ccbf0c6 fixed #1515 2014-05-10 23:56:45 -04:00
Julian Lam
65dd79c84e socket logic for #1149 -- handling of help tab in ACP 2014-05-10 23:43:15 -04:00
barisusakli
f65998f4c2 fixes guest name on home 2014-05-10 18:41:31 -04:00
psychobunny
2649e6a385 use secure image instead 2014-05-10 16:24:44 -04:00
psychobunny
f7fe0aa680 moved documentation out of alerts 2014-05-10 16:16:56 -04:00
psychobunny
74aabb9c60 modules documentation - alerts 2014-05-10 16:16:35 -04:00
psychobunny
db27a30005 better alert for ban message 2014-05-10 16:01:58 -04:00
barisusakli
d0be73a4d4 closes #1503 2014-05-10 15:48:09 -04:00
FrissDieGurke
ab2c0cfa9f added number-type to settings framework. persist expanded object on server-side sync if changed 2014-05-10 19:49:50 +02:00
barisusakli
8ee866fc9d closes #1513 2014-05-09 17:57:39 -04:00
barisusakli
4c28de659c closes #1504 2014-05-09 17:46:10 -04:00
barisusakli
274acc8eec moved base_templates_path to load config #1511 2014-05-09 13:47:33 -04:00
psychobunny
643dd74e43 initially hide the account setting menus (prevents the brief flashing of the buttons)
5589e1e148
2014-05-09 12:56:51 -04:00
psychobunny
99b34d5990 allow translator variables to not require a space, see #1512 2014-05-09 12:47:42 -04:00
Julian Lam
025db831f4 Update heroku.rst 2014-05-09 12:01:31 -04:00
Julian Lam
a5537cb8ae Update heroku.rst 2014-05-09 12:01:04 -04:00
barisusakli
43bbc00be8 closes #1512
spaces are required
2014-05-09 11:50:53 -04:00
Julian Lam
f876ba91b8 Update heroku.rst 2014-05-09 11:50:46 -04:00
barisusakli
d304bab4f1 dont change height if sizing horizontally #1508 2014-05-09 11:41:41 -04:00
barisusakli
c2fb4700de fixes infinite scroll on account pages 2014-05-08 22:44:34 -04:00
Julian Lam
2dd2d7a269 defaulting daily digest frequency to null -- digests should be opt IN, not OUT. Bad idea on my part... re: #1499 2014-05-08 20:54:00 -04:00
barisusakli
66abd20647 moved add commas to process page 2014-05-08 19:17:35 -04:00
psychobunny
e22e0c7503 Merge pull request #1506 from BitBangersCode/master
Fix Settings Framework example to display proper object path
2014-05-08 14:40:05 -04:00
psychobunny
2ba2ef5320 closes #1498 2014-05-08 14:38:46 -04:00
Schamper
d1079c00bc Fix Settings Framework example to display proper object path 2014-05-08 20:37:10 +02:00
psychobunny
a0fcdfe629 closes #1502 2014-05-08 14:27:46 -04:00
psychobunny
10716c37d3 closes #1376 2014-05-08 14:16:40 -04:00
barisusakli
7280567d21 closes #1505 2014-05-08 13:24:34 -04:00
barisusakli
ed57edde3b fixed undefined next 2014-05-08 01:03:07 -04:00
Julian Lam
4f5b3cc934 changing update script to only directly update vanilla and lavender 2014-05-08 00:50:44 -04:00
barisusakli
933aa5dfcb #1501 2014-05-07 16:11:58 -04:00
barisusakli
efaa1e62c1 added back ttl :) 2014-05-07 14:12:53 -04:00
barisusakli
672bde7066 removed ttl 2014-05-07 13:27:11 -04:00
barisusakli
62d487e0a8 use current user uid for feed generation 2014-05-07 12:46:58 -04:00
barisusakli
f714c713f3 fixes deactivate text on plugin buttons 2014-05-07 12:30:58 -04:00
Julian Lam
b56df975e0 fixed 1495 2014-05-07 11:46:32 -04:00
barisusakli
883978007d closes #1482
removed updateHeader, the header is using template values in from the
api, update menu partial in vanilla theme as well
2014-05-06 18:42:42 -04:00
psychobunny
678f0f436e importing latest templates.js @Schamper 2014-05-06 17:50:06 -04:00
barisusakli
1f7fd51b40 some work for #1482 2014-05-06 17:46:34 -04:00
barisusakli
57f0ee8a38 removed whitespace 2014-05-06 17:28:42 -04:00
barisusakli
7a25f0bb36 fix for #1496 2014-05-06 16:28:35 -04:00
psychobunny
14db999684 closes #1494 2014-05-06 15:51:21 -04:00
psychobunny
f697b5a2b8 addBlockquoteEllipses to newly created posts #1491 2014-05-06 15:09:35 -04:00
psychobunny
3b7d222ec3 prevent duplicate blockquotes #1491 2014-05-06 15:04:10 -04:00
barisusakli
f89afd92b9 fix for plugin page access issue closes #1493 2014-05-06 13:12:19 -04:00
barisusakli
89225c80ca related to #1493 2014-05-06 13:05:31 -04:00
Julian Lam
08cf6bc5e6 fixed #1489 -- made checkReplace error-first, added missing callback, added missing object field to db query 2014-05-06 10:23:39 -04:00
barisusakli
7f6ae6df9f possible fix to active users 2014-05-05 18:17:12 -04:00
psychobunny
b3940cd7cd enabling view cache, since we require server restart on theme changes it doesn't hurt 2014-05-05 16:56:08 -04:00
barisusakli
967b486ce1 closes #1487
ban and delete user admin actions takes an array of uids now.
2014-05-05 16:48:13 -04:00
Julian Lam
590082709f fixed #1488 - emails are processed 100 at a time 2014-05-05 16:25:55 -04:00
psychobunny
dfe010d97d caps 2014-05-05 15:34:38 -04:00
psychobunny
14431f7913 closes #1486 2014-05-05 15:19:37 -04:00
psychobunny
8fc818e07c closes https://github.com/designcreateplay/NodeBB/issues/1473 2014-05-05 13:25:06 -04:00
psychobunny
7033fa7563 closes https://github.com/designcreateplay/NodeBB/issues/1474 2014-05-05 13:17:34 -04:00
psychobunny
38a3ab6365 fixes routes for https://github.com/designcreateplay/NodeBB/issues/1485 2014-05-05 12:59:27 -04:00
psychobunny
a51b357e67 removed deprecated categories.background property 2014-05-05 12:18:53 -04:00
psychobunny
3934f2ec88 collapsible blockquotes, closes #1359 2014-05-05 12:15:17 -04:00
psychobunny
be16f0dae7 Merge pull request #1484 from frissdiegurke/master
Settings Framework docs + slight changes
2014-05-05 10:24:34 -04:00
barisusakli
d272a87c8a cleanup toggleFollow 2014-05-05 09:33:47 -04:00
barisusakli
8afcf44732 gravatars will be generated on demand
changing the setting in ACP will affect all default gravatars now.
2014-05-04 17:27:00 -04:00
Julian Lam
ac9bd0859f fixed #1477 2014-05-04 16:47:21 -04:00
barisusakli
6f40393b99 added err check 2014-05-04 14:33:12 -04:00
FrissDieGurke
c4606e7009 minified settings-framework wrapper-length 2014-05-04 13:08:20 +02:00
FrissDieGurke
cbef92bb62 Added settings-framework documentation 2014-05-04 12:37:49 +02:00
FrissDieGurke
c23df60e1b removed unnecessary method + doc within Settings Framework 2014-05-04 12:34:22 +02:00
barisusakli
aea8d50200 removed console.log 2014-05-03 20:59:38 -04:00
barisusakli
d43d363a7a refactored topics.js
removed ajaxify.register_events using removeListener now
2014-05-03 20:56:26 -04:00
barisusakli
ec399d8b3b moved all account related files to account folder
update nodebb-theme-vanilla too to get the update tpl files
2014-05-03 17:21:07 -04:00
barisusakli
3c96857123 closes #1461
fixed disabled category grey out, added plural move topics string
2014-05-03 00:07:01 -04:00
Julian Lam
436a97129f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-05-02 23:53:37 -04:00
Julian Lam
6f064a4f15 latest translations 2014-05-02 23:53:30 -04:00
Julian Lam
4f127e2001 tr and fr changes 2014-05-02 23:50:10 -04:00
barisusakli
ab15dba0de closes #1472 2014-05-02 18:07:58 -04:00
psychobunny
111898ab0f closes #1467 2014-05-02 16:49:56 -04:00
barisusakli
f3d0d70867 closes #1471 2014-05-02 16:02:26 -04:00
psychobunny
681d9c95ab updating plugin docs 2014-05-02 02:22:10 -04:00
Julian Lam
d112d62a3f updated plugin docs 2014-05-02 02:03:10 -04:00
psychobunny
6f0e749b60 Merge pull request #1462 from frissdiegurke/master
added new settings-system
2014-05-02 01:41:10 -04:00
Barış Soner Uşaklı
1ed9d4a9c9 Merge pull request #1468 from Schamper/patch-1
Add a return statement to the callback
2014-05-01 19:30:18 -04:00
barisusakli
936530dc48 possible fix for #1467 2014-05-01 19:01:19 -04:00
Erik Schamper
849db3b858 Add a return statement to the callback
To prevent a "callback already called".
2014-05-02 00:57:05 +02:00
barisusakli
dea4b78cb9 fixes tooltip for users that go online/offline 2014-05-01 18:30:26 -04:00
psychobunny
fe739aac71 updated hooks docs 2014-05-01 16:22:06 -04:00
psychobunny
531ad4dec1 action:settings.set 2014-05-01 16:22:05 -04:00
Julian Lam
90269ad9b8 fixed bad example code 2014-05-01 15:43:28 -04:00
Julian Lam
f4d5c93b78 0.4.2 2014-05-01 15:26:47 -04:00
Julian Lam
a5410f7ae7 added stub plugins socket file for plugin usage (ping @schamper @frissdiegurke @akhoury @psychobunny @barisusakli) 2014-05-01 15:23:58 -04:00
Julian Lam
970b259e06 fixed #907 2014-05-01 15:06:27 -04:00
psychobunny
3e296a42f7 documenting the new hook 2014-05-01 14:37:46 -04:00
psychobunny
65565e187b simplified the above to action.user.set instead 2014-05-01 14:37:26 -04:00
psychobunny
75baf28530 added action:user.decremented and action:user.incremented hooks 2014-05-01 14:30:53 -04:00
psychobunny
a14ce9d0c6 closes #1352 2014-05-01 14:24:31 -04:00
psychobunny
271843d417 closes #1385 2014-05-01 14:04:27 -04:00
psychobunny
882589acae moved findBootstrapEnvironment into utils 2014-05-01 13:43:07 -04:00
barisusakli
3ecd523799 added jquery ui datepicker 2014-05-01 11:59:28 -04:00
Ole Reglitzki
4da8121827 jsbeautify 2014-05-01 15:12:31 +02:00
Ole Reglitzki
d76ba519d4 added new settings-system 2014-05-01 14:58:12 +02:00
barisusakli
e0a83728d6 closes #1458 2014-04-30 18:02:35 -04:00
barisusakli
63d88957a8 replace self links client side 2014-04-30 17:42:50 -04:00
barisusakli
c8efeb7d7c closes #1400, bunch of other fixes to 404, 403 in accounts 2014-04-30 17:24:53 -04:00
psychobunny
8fa3baf32d closes #1455 2014-04-30 16:00:06 -04:00
psychobunny
4961becd1d Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-30 14:51:10 -04:00
Barış Soner Uşaklı
e5d33a57d9 Update style-guide.rst 2014-04-30 14:50:56 -04:00
psychobunny
809db61b8a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-30 14:50:52 -04:00
psychobunny
48d3e884ea updated nodebb logo to https 2014-04-30 14:50:46 -04:00
barisusakli
af6a40e23c use thumb directly 2014-04-30 14:48:48 -04:00
psychobunny
4b18403fa6 moving controls object into its own module 2014-04-30 14:23:07 -04:00
psychobunny
775e6ec8ce comopser bugfix 2014-04-30 14:23:06 -04:00
psychobunny
090ecaffd1 closes #1444 2014-04-30 14:23:04 -04:00
barisusakli
75824c0d81 dont send notifications for guests 2014-04-30 14:21:52 -04:00
psychobunny
bb12ebac48 closes #1442 2014-04-30 13:42:54 -04:00
barisusakli
b88df6420d check err 2014-04-30 13:37:56 -04:00
psychobunny
5538cb22b0 Update README.md 2014-04-30 13:35:02 -04:00
psychobunny
f72fd302dc Update README.md 2014-04-30 13:33:00 -04:00
psychobunny
1baf2286c2 Update README.md 2014-04-30 13:32:31 -04:00
Julian Lam
b049bd466c added 'config.version' to client-side 2014-04-30 09:12:15 -04:00
Julian Lam
e65896351a checkReplace typo 2014-04-29 21:32:54 -04:00
barisusakli
3552678645 use id as name like others 2014-04-29 14:14:08 -04:00
barisusakli
dde872d6d5 log user ip register 2014-04-29 14:08:05 -04:00
barisusakli
a329fcadaa possibly fixes #1454 2014-04-29 13:54:04 -04:00
barisusakli
fdfd421e1c fixes error during user delete and ban 2014-04-28 22:39:27 -04:00
psychobunny
45195aa59a for https://github.com/designcreateplay/NodeBB/issues/1393 2014-04-28 19:00:29 -04:00
barisusakli
5f7ed289de print stack on db error 2014-04-28 18:55:09 -04:00
psychobunny
8e3f1e66e9 changed the copyright from our usernames to just NodeBB 2014-04-28 17:18:17 -04:00
psychobunny
76d60be60a fixed all of the internal links that were still pointing to the wiki 2014-04-28 17:18:16 -04:00
psychobunny
320909d5fb converting md to rest 2014-04-28 17:18:15 -04:00
psychobunny
1d6623dd1c forgot to port "how to run nodebb" 2014-04-28 17:18:14 -04:00
psychobunny
ca365118d3 converted upgrading steps, also added to backup section (todo: mongo) 2014-04-28 17:18:14 -04:00
psychobunny
35e202a64e converted widgets section over 2014-04-28 17:18:13 -04:00
psychobunny
56da48b222 l2documentation 2014-04-28 17:18:12 -04:00
psychobunny
c41a8872d3 finished help section 2014-04-28 17:18:11 -04:00
psychobunny
245bb6e7b0 some md to rest changes 2014-04-28 17:18:10 -04:00
psychobunny
1e9439b9b4 removing some unused files 2014-04-28 17:18:09 -04:00
psychobunny
f86a0eab64 helping out the nodebb project section 2014-04-28 17:18:08 -04:00
psychobunny
a8ad38816b simplified the ToC tree a little, and got rid of the i8n section 2014-04-28 17:18:08 -04:00
psychobunny
23f39fd13e fixed some internal links 2014-04-28 17:18:07 -04:00
psychobunny
eddf1a6436 fixed ToC 2014-04-28 17:18:06 -04:00
psychobunny
96ddd024b5 creating a new theme 2014-04-28 17:18:05 -04:00
psychobunny
6640b4b899 rewrote the templating docs (never updated that since 0.3x derp) 2014-04-28 17:18:04 -04:00
psychobunny
7e46d3de5e contributing docs 2014-04-28 17:18:03 -04:00
psychobunny
e64ab5fa82 merged help sections into one 2014-04-28 17:18:03 -04:00
psychobunny
66182b881a got rid of the separate resources sections and combined into one developer's resources 2014-04-28 17:18:02 -04:00
psychobunny
68e250ed02 plugin resources section 2014-04-28 17:18:01 -04:00
psychobunny
d4fa056569 removed deprecated documentation in plugins; fixed internal links 2014-04-28 17:18:00 -04:00
psychobunny
f3cc98b2c0 wrapped up hooks section 2014-04-28 17:17:59 -04:00
psychobunny
8bb225d8c0 init plugins documentation 2014-04-28 17:17:58 -04:00
psychobunny
f3fcae0711 contributors section 2014-04-28 17:17:57 -04:00
psychobunny
db31072f91 style guide docs 2014-04-28 17:17:57 -04:00
psychobunny
eae4fa59e3 imgur and s3 docs 2014-04-28 17:17:56 -04:00
psychobunny
be2ed6b7d7 file/image uploading docs 2014-04-28 17:17:55 -04:00
psychobunny
11a64f3789 social network docs 2014-04-28 17:17:54 -04:00
psychobunny
ee63ecbe3e ported varnish docs 2014-04-28 17:17:53 -04:00
psychobunny
7ac3f82c5e ported nginx docs 2014-04-28 17:17:52 -04:00
psychobunny
7e63d61ef0 finished porting apache docs 2014-04-28 17:17:51 -04:00
psychobunny
aada6c3b6e edited makefile to delete the build directory before compiling 2014-04-28 17:17:50 -04:00
psychobunny
be28f7b378 fixing menu 2014-04-28 17:17:49 -04:00
psychobunny
054f534108 proxies init 2014-04-28 17:17:48 -04:00
psychobunny
119da68310 added ToC and more description to intro 2014-04-28 17:17:47 -04:00
psychobunny
c41f983df9 ported level docs 2014-04-28 17:17:46 -04:00
psychobunny
e7fb82dbe3 ported mongo docs 2014-04-28 17:17:45 -04:00
psychobunny
a7a70accad configuring databases, init 2014-04-28 17:17:45 -04:00
psychobunny
0e13c585d6 organized installation guides better 2014-04-28 17:17:44 -04:00
psychobunny
ce4d0b366f ported cloud9 docs 2014-04-28 17:17:43 -04:00
psychobunny
f3695cf2da ported heroku docs 2014-04-28 17:17:42 -04:00
psychobunny
cc106d1251 docs: installing nodebb on the cloud 2014-04-28 17:17:42 -04:00
psychobunny
df6fdf6f09 moved all installation guides into separate files; finished converting installation section to reST 2014-04-28 17:17:41 -04:00
psychobunny
e23750ac49 minor changes to docs 2014-04-28 17:17:40 -04:00
psychobunny
87fee232bc completed the skeleton files for all the docs 2014-04-28 17:17:39 -04:00
psychobunny
6d48acfd37 okay... wrote an index for help and organized stuff. lets do this! 2014-04-28 17:17:38 -04:00
psychobunny
1bea6e4ee5 more documentation, man reST hurts my brain 2014-04-28 17:17:37 -04:00
psychobunny
d84182cb9b .gitignore for sphinx 2014-04-28 17:17:36 -04:00
psychobunny
ca2743eb07 starting porting installation page 2014-04-28 17:17:36 -04:00
psychobunny
39befcb65b docs index page 2014-04-28 17:17:35 -04:00
psychobunny
85312da334 activate sphinx theme 2014-04-28 17:17:34 -04:00
psychobunny
c60da18bd6 sphinx theme 2014-04-28 17:17:34 -04:00
psychobunny
ed51a739ea init sphinx docs 2014-04-28 17:17:33 -04:00
barisusakli
80ef7e5085 closes #1423 2014-04-28 15:54:37 -04:00
psychobunny
1996c8ad49 fixing less imports on windows 2014-04-28 14:44:42 -04:00
Julian Lam
807f81bc9f Merge pull request #1450 from frissdiegurke/patch-1
use nodejs instead of node command if it exists
2014-04-28 07:43:49 -04:00
frissdiegurke
64a1eab980 use nodejs instead of node command if it exists
closes #1449
2014-04-28 11:39:50 +02:00
barisusakli
ee12b4fd3e removed duplication in uploads 2014-04-28 01:52:25 -04:00
barisusakli
8ce3e44d7b closes #1418 2014-04-27 17:40:39 -04:00
barisusakli
53021d31b0 closes #1446 2014-04-27 17:32:24 -04:00
barisusakli
fa8cdce748 closes #1448 2014-04-27 17:17:07 -04:00
barisusakli
1d1d677b56 closes #1422 2014-04-27 16:41:40 -04:00
Julian Lam
a32fd3f6f9 fixed #1222 2014-04-27 13:32:58 -04:00
Julian Lam
8f67252547 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-04-27 12:29:06 -04:00
barisusakli
cd3bb77a7f added reqFromSocket to topic posting
new filter topic.post
2014-04-27 00:47:08 -04:00
barisusakli
efdb511c2c fixed posted_in_ago language key 2014-04-26 16:33:28 -04:00
barisusakli
c9551abc5d closes #1432
ability to select a default gravatar image (default, identicon,
mystery-man, monsterid, wavatar, retro) or upload a custom image to use
as default gravatar image
2014-04-26 15:53:00 -04:00
psychobunny
066b1c0d64 @akhoury and his comments.. :p + jshinting 2014-04-26 04:43:53 -04:00
psychobunny
eac0044dd1 Merge pull request #1443 from akhoury/master
added new hook:  filter:topic.reply
2014-04-26 04:39:48 -04:00
Aziz Khoury
32a5334402 socket.handshake.address may not always be defined, thanks @psychobunny 2014-04-26 04:29:53 -04:00
Aziz Khoury
056b39709f no need for quotes 2014-04-26 03:26:23 -04:00
Aziz Khoury
65ff72b0e3 its 3am 2014-04-26 03:19:56 -04:00
Aziz Khoury
c7bd27fb3f spaces vs tabs ugh 2014-04-26 03:16:07 -04:00
Aziz Khoury
fa7db423c6 adding hook filter:topic.reply for antispam 2014-04-26 03:00:56 -04:00
barisusakli
caa0c45a11 closes #1441 2014-04-25 16:34:34 -04:00
Julian Lam
f8d57aae09 jp config to tx 2014-04-25 08:21:09 -04:00
Julian Lam
4c4689474f Merge pull request #1440 from rjyo/feature/japanese-translation
Add Japanese translation
2014-04-25 08:17:52 -04:00
Rakuraku Jyo
614210f08e Use less characters to describe the same meaning 2014-04-25 16:07:14 +09:00
Rakuraku Jyo
4c9670208b Add Japanese translation 2014-04-25 15:17:21 +09:00
barisusakli
d05920ec78 refactor of thread tools 2014-04-24 20:05:05 -04:00
barisusakli
68fd997efd closes #1419 2014-04-24 18:59:19 -04:00
barisusakli
fa221437dc removed whitespace 2014-04-24 16:32:43 -04:00
barisusakli
7339cb5d61 closes #1434 2014-04-24 16:19:31 -04:00
barisusakli
6f2ea3eafc closes #1439 2014-04-24 15:53:41 -04:00
barisusakli
adf6f34e42 closes #1436 2014-04-24 15:29:05 -04:00
Tung
06632f05e0 Vietnamese translations from Transifex 2014-04-24 08:26:21 -04:00
psychobunny
f9291ced2d fixed plugin activation of unpublished plugins 2014-04-23 23:18:10 -04:00
barisusakli
cf94a71499 closes #1427
flag and chat buttons are hidden on self posts, updated in vanilla and
lavender
2014-04-23 21:47:51 -04:00
barisusakli
3ca45fa061 closes #1433
installed plugins are displayed at the top
2014-04-23 21:23:07 -04:00
Julian Lam
2b9b888aee minor jshinting 2014-04-23 21:20:55 -04:00
Julian Lam
4ca7eaf1fc latest translations 2014-04-23 21:12:32 -04:00
psychobunny
ef03af9614 allow supervisor to watch less files as well 2014-04-23 19:59:55 -04:00
psychobunny
2627ed0fcd fixed filter:admin.scripts.get 2014-04-23 19:30:38 -04:00
psychobunny
0079964d68 fixing start up crash when running with supervisor 2014-04-23 18:31:59 -04:00
Julian Lam
5f5906860e fixed #1406 2014-04-23 16:21:14 -04:00
Julian Lam
46c281db3d Merge pull request #1409 from miksago/formatting-dispatch-table
Composer: Implement formatting bar dispatch table
2014-04-23 15:55:04 -04:00
Julian Lam
a796940064 closed #1421 use --no-daemon flag to... not daemonize. Also, install script can be canceled without throwing errors. 2014-04-23 08:54:31 -04:00
Julian Lam
33bba9b596 Merge pull request #1431 from frissdiegurke/patch-1
added request as dependency. fixes #1430
2014-04-23 08:16:27 -04:00
frissdiegurke
5bb02d62e7 added request as dependency. fixes #1430 2014-04-23 14:04:27 +02:00
barisusakli
a1e6a3616c ability to install/uninstall plugins from ACP 2014-04-22 21:02:58 -04:00
psychobunny
e97a705f5c couple of console.logs 2014-04-22 14:45:55 -04:00
barisusakli
90f5683cc2 read redis host just before connecting 2014-04-22 01:39:57 -04:00
Julian Lam
dd53fb9b6a latest translations 2014-04-21 18:25:38 -04:00
barisusakli
1000df09ff replaced hardcoded english string 2014-04-21 15:15:38 -04:00
barisusakli
2d48f670c7 moved html from language files to templates 2014-04-21 14:54:27 -04:00
barisusakli
3c11030929 closes #1398 2014-04-21 13:29:40 -04:00
Julian Lam
4144abf6e3 added Malay language pack. Tahniah! 2014-04-20 17:54:09 -04:00
Julian Lam
3a32f6161a latest translations 2014-04-20 17:53:16 -04:00
Julian Lam
93b02e8591 latest translations from German 2014-04-20 17:51:41 -04:00
barisusakli
3ed90cda91 added new language string for guests 2014-04-20 17:49:58 -04:00
barisusakli
21e30cc0c7 new language string 2014-04-20 16:27:58 -04:00
barisusakli
844923d538 added guest language string 2014-04-20 15:17:17 -04:00
barisusakli
2ad715ead3 closes #1412 2014-04-20 15:07:53 -04:00
Julian Lam
e86d2d72c6 updated pt_BR 2014-04-20 11:03:51 -04:00
barisusakli
a8a38522c1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-20 01:31:21 -04:00
barisusakli
bca2755c3e possible fix for #1410 2014-04-20 01:31:17 -04:00
Barış Soner Uşaklı
eb0f18c586 Merge pull request #1413 from frissdiegurke/patch-1
fixed wrong calls of getSortedSetRevRangeByScore
2014-04-20 01:26:46 -04:00
frissdiegurke
590604b288 fixed wrong calls of getSortedSetRevRangeByScore 2014-04-20 07:23:19 +02:00
barisusakli
1ed5145738 better check for pinned 2014-04-20 01:18:20 -04:00
barisusakli
1e3577afe5 fixes topics going to the bottom 2014-04-20 00:45:25 -04:00
barisusakli
c64da01080 closes #1410 2014-04-19 20:12:58 -04:00
psychobunny
ad8239aa31 alerts - parse globals before translating 2014-04-19 16:38:14 -04:00
Julian Lam
9a75a55500 removing footer from tx config 2014-04-19 14:34:32 -04:00
barisusakli
8d3f72b5a1 closes #1404 2014-04-19 14:31:46 -04:00
psychobunny
090c4e2aa9 action:ajaxify.contentLoaded - after #content is populated but before fade in animation - append elements to DOM at this stage. 2014-04-19 12:38:34 -04:00
psychobunny
da4113e1f1 Revert "last commit doesn't play well with ajaxify, need a rethink."
This reverts commit f85678e938.
2014-04-19 12:24:45 -04:00
psychobunny
f85678e938 last commit doesn't play well with ajaxify, need a rethink. 2014-04-19 12:15:17 -04:00
psychobunny
1f9bdd840f allow for the possibility of custom post-header or pre-footer templating 2014-04-19 11:56:39 -04:00
psychobunny
af54d9fa64 if translator.addTranslation is called before translator is done loading, the loading property is never set, which crashes translator 2014-04-19 10:52:53 -04:00
Micheil Smith
ae9f675b80 Composer: Use formatting dispatch table for inserting uploads and pictures 2014-04-19 15:14:23 +01:00
Micheil Smith
bf7de0d051 Composer: Switch to using a dispatch table for buttons
Note: for now, it looks a little messy, but once I merge wrapSelectionInTextareaWith and insertIntoTextarea, it won't be. Promise.
2014-04-19 15:13:57 +01:00
psychobunny
7b453edb2d don't crash if language file not found
@barisusakli seems like something needs footer.json, maybe it's a plugin
if its not crashing for you
2014-04-19 10:01:01 -04:00
psychobunny
7fb5db76d3 updated copyright year 2014-04-19 09:50:36 -04:00
psychobunny
016ea8dc32 Merge pull request #1408 from xbenjii/master
Alert typo
2014-04-19 08:36:03 -04:00
xbenjii
e1ad061fdc Fixed typo 2014-04-19 12:02:33 +01:00
Julian Lam
82fd8d79a0 turkish updates 2014-04-19 02:17:41 -04:00
barisusakli
254267e577 removed 2 titles 2014-04-18 17:52:11 -04:00
barisusakli
d431c94ed8 added variable to replying to string 2014-04-18 17:49:39 -04:00
barisusakli
9d61a1bae3 fixed translation string 2014-04-18 16:22:16 -04:00
barisusakli
6cac3c176e removed onlined from users 2014-04-18 15:37:55 -04:00
barisusakli
255115745f new language keys closes #1403 2014-04-18 15:13:55 -04:00
psychobunny
0a727a4af9 use ajaxify.refresh() to revert changes 2014-04-18 13:22:07 -04:00
psychobunny
f3993aca4d closes #1397 2014-04-18 13:20:50 -04:00
barisusakli
6a1fa82b8b closes #1402 2014-04-18 13:14:38 -04:00
Julian Lam
758a7f109e missing comma -- fixed #1401 2014-04-18 12:57:26 -04:00
Julian Lam
28bad893e5 Revert "removed until #1401 is fixed"
This reverts commit 87fc70d90d.
2014-04-18 12:57:16 -04:00
Julian Lam
8934ac1a2d added try..catch to server parsing of translations, in case a file has a syntax error -- #1401 2014-04-18 12:55:11 -04:00
barisusakli
b4dc2eebe9 removed one of the timeouts in user search 2014-04-18 12:46:50 -04:00
Julian Lam
770bf2bc44 fixed minver warning, so that nodebb doesn't complain that your version is too NEW for a plugin, heh 2014-04-18 12:43:32 -04:00
barisusakli
87fc70d90d removed until #1401 is fixed 2014-04-18 02:14:42 -04:00
Julian Lam
7aa785b205 fixed problem with nodebb always restarting when SIGTERM'd -- @frissdiegurke 2014-04-17 22:35:57 -04:00
barisusakli
ef342b9d40 added two new strings for #1399 2014-04-17 22:12:04 -04:00
barisusakli
e12beccc09 closes #1371
adds a dropdown to category view to move/pin/lock/delete multiple topics
2014-04-17 20:07:27 -04:00
psychobunny
45e9b53f10 button to revert changes in categories admin 2014-04-17 14:39:20 -04:00
psychobunny
a5e304cc0a inline editing of admin/categories description & name 2014-04-17 14:25:07 -04:00
psychobunny
6f1a795f0e upload_url shouldn't use path.join 2014-04-17 13:22:03 -04:00
psychobunny
51a7d163be fixes #1396 2014-04-17 13:12:01 -04:00
Julian Lam
5b38c3b9ee fixed #1395 2014-04-17 13:04:46 -04:00
Julian Lam
d95398f808 more graceful handling of missing pidfile, #1395 2014-04-17 12:09:42 -04:00
Julian Lam
20d1723e84 added success and error to transifex, latest translations 2014-04-17 10:51:39 -04:00
Julian Lam
a73588c764 Lithuanian translations 2014-04-17 10:42:19 -04:00
Julian Lam
c03099ce90 fixed wrong capitalization -- thanks @akhoury 2014-04-16 21:59:02 -04:00
psychobunny
bd59134cf0 closes #1391 2014-04-16 21:05:14 -04:00
psychobunny
0be414dab9 add registered-only checkbox option to widgets 2014-04-16 21:02:25 -04:00
Julian Lam
126260a027 added cache-buster to template xhr urls -- closed #1392 2014-04-16 20:19:26 -04:00
barisusakli
7c00bce63c faster checkAndReplace
still need a better solution for this uniqueId business but this is
better than before.
2014-04-16 18:07:45 -04:00
Julian Lam
8aea4ad7fa latest translations 2014-04-16 17:43:04 -04:00
psychobunny
7487a92953 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-04-16 17:42:47 -04:00
psychobunny
ef52d47f41 importing latest templates.js 2014-04-16 17:42:43 -04:00
Julian Lam
c9f82d26ff Merge branch 'issue-1249' 2014-04-16 17:39:31 -04:00
Julian Lam
dc051b9060 final pass #1249 2014-04-16 17:38:34 -04:00
barisusakli
e7a415246e closes #1390 2014-04-16 17:33:48 -04:00
Julian Lam
15bf804fa7 daily digest settings in User Settings 2014-04-16 16:47:51 -04:00
Julian Lam
20a3c1612c increased CI timer to 10s 2014-04-16 16:13:48 -04:00
Julian Lam
7c08831aaf Merge remote-tracking branch 'origin/master' into issue-1249 2014-04-16 16:10:11 -04:00
barisusakli
92db112367 reverted previous commit 2014-04-16 15:51:05 -04:00
barisusakli
f0428f5f1f removed double post notification #1386 2014-04-16 15:46:50 -04:00
barisusakli
f9897daad1 all notifications are translated now closes #1388 2014-04-16 15:31:51 -04:00
Julian Lam
e00f49ae8c restored test coverage... lol 2014-04-16 15:22:39 -04:00
Julian Lam
84a34933fe fixed #1351 -- ACP will tell user that they need to restart, if they need to restart 2014-04-16 15:11:00 -04:00
Julian Lam
8cb2b9b97a fixed #1351 -- themes and plugins no longer auto-restart the server 2014-04-16 14:46:14 -04:00
barisusakli
9dbe479d11 closes #1389 2014-04-16 14:43:25 -04:00
barisusakli
01555cbb5c return privileges in category 2014-04-16 14:30:36 -04:00
psychobunny
5b8fcbe27e fixed post error message 2014-04-16 13:12:26 -04:00
Julian Lam
c3a4bcb116 first pass #1249 -- this causes emails to be sent if you have not been to the site in over 24 hours. 2014-04-15 21:45:36 -04:00
Julian Lam
d027355ae9 bundling dbsearch with nodebb 2014-04-15 20:46:50 -04:00
barisusakli
63dfc38dea topic changes to match the new post-bar partial 2014-04-15 16:41:13 -04:00
barisusakli
f9572cc5c7 fixes chat messages 2014-04-15 14:39:13 -04:00
psychobunny
a6c84ac1a8 don't reset the global footer (copyright) when changing themes - they should all be compatible anyways 2014-04-15 14:26:39 -04:00
psychobunny
f895ae6ce4 updated to latest compressed notifications 2014-04-15 13:59:29 -04:00
Julian Lam
35c87a17bb removed attribution file -- now found in https://github.com/julianlam/nodebb-plugin-soundpack-default 2014-04-15 13:57:38 -04:00
Julian Lam
889c90673d windows compat for sounds -- #clevercode 2014-04-15 13:37:33 -04:00
barisusakli
85b96bb2d7 removed reds from nodebb core 2014-04-15 12:54:04 -04:00
barisusakli
04488a9a14 closes #1139 2014-04-15 12:48:32 -04:00
psychobunny
549f87132d fixes for dual database; moved dependency definitions into the database object 2014-04-15 12:40:30 -04:00
psychobunny
79d5142693 fixed leveldb installation; console.log 2014-04-15 12:23:17 -04:00
Julian Lam
5782a382be hardcoding connect-redis version 2014-04-15 12:14:46 -04:00
Julian Lam
4f7810090a first pass #1384 2014-04-15 12:14:46 -04:00
Julian Lam
cbca9a4faf adding soundpack to list of default-activated plugins 2014-04-15 12:14:46 -04:00
psychobunny
7a823283e4 fixed my derp 2014-04-15 12:02:36 -04:00
psychobunny
0851102800 newline 2014-04-15 02:48:34 -04:00
psychobunny
cac69c3d63 use valid json 2014-04-15 02:45:09 -04:00
psychobunny
a8801feabe cleanup 2014-04-15 02:42:40 -04:00
psychobunny
da665853e4 bugfixes 2014-04-15 02:40:18 -04:00
psychobunny
78dea8ea40 don't attempt to require a directory 2014-04-15 02:33:48 -04:00
psychobunny
5ffeb3319b socket.io admin/groups 2014-04-15 02:33:31 -04:00
psychobunny
aaa2dbe757 removed unused topics; fixed require 2014-04-15 02:28:49 -04:00
psychobunny
9e24ccc976 socket.io admin/categories 2014-04-15 02:27:58 -04:00
psychobunny
2fc6bfaa72 socket.io admin/user 2014-04-15 02:25:42 -04:00
psychobunny
3f22027007 avoid doing nconf.get over and over again on the same key 2014-04-15 02:16:03 -04:00
psychobunny
3c0c3a9649 renaming install function properly 2014-04-15 02:02:03 -04:00
Julian Lam
4c9ea62c0d resolved #1372 -- username clashes will now cause a random # to be appended to the username 2014-04-15 00:17:42 -04:00
psychobunny
f892a6793a mongo/redis - don't show passwords when typing in CLI 2014-04-14 20:33:08 -04:00
barisusakli
d832a6f805 closes #1381 2014-04-14 18:04:17 -04:00
psychobunny
3c711d72fb regex - no need to escape special characters inside [] 2014-04-14 17:42:47 -04:00
psychobunny
e5486db1ae Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality
Conflicts:
	src/database.js
2014-04-14 17:36:10 -04:00
barisusakli
3ea49a8f90 if language or default language is not set use en 2014-04-14 17:17:02 -04:00
psychobunny
268be5f35c fixed LevelDB helpers 2014-04-14 17:14:09 -04:00
psychobunny
71d33c0a79 fixed mongo helpers 2014-04-14 17:09:03 -04:00
barisusakli
3e60451ce4 closes #1013
lets user change languages,
2014-04-14 15:58:19 -04:00
psychobunny
98b112bb36 use_port only accepts string but saves as boolean, accept both now
previously, if you re-feed your config back in, it breaks
2014-04-14 15:28:41 -04:00
psychobunny
8496bdcff6 fixed automated setup bug 2014-04-14 15:26:42 -04:00
psychobunny
8a1f6eb43e forgot to export helpers as well for secondary db 2014-04-14 15:15:21 -04:00
psychobunny
290e348851 move database helpers into their own files 2014-04-14 15:09:57 -04:00
psychobunny
ae1ecb490f whitespace 2014-04-14 15:06:25 -04:00
psychobunny
7df7df09dd moved database specific questions into install/databases.js 2014-04-14 15:03:11 -04:00
psychobunny
75f19262ef no need for comments detailing what a function does anymore 2014-04-14 14:12:12 -04:00
psychobunny
0a94cf7c95 refactored out giant async.series 2014-04-14 14:10:57 -04:00
psychobunny
be83157de2 install.js minor refactor - moved questions into their own modules; don't need to export installation questions 2014-04-14 13:54:11 -04:00
psychobunny
f3fe79ab60 initialize / shutdown dbs simultaneously 2014-04-14 13:52:14 -04:00
psychobunny
bba3df6802 moving db.close into the parent module 2014-04-14 13:51:45 -04:00
psychobunny
df5f3d185a don't attempt to initialize db until we attempt to initialize 2014-04-14 13:41:33 -04:00
psychobunny
d5b5dd6fa5 hide secondary_database option behind "advanced" setup flag 2014-04-14 13:29:21 -04:00
psychobunny
ffe9afc3c4 configure secondary db modules 2014-04-14 13:09:54 -04:00
psychobunny
98270bf500 linting 2014-04-14 12:54:11 -04:00
psychobunny
8f71a4ebfe moved installation defaults into install/data/defaults.json 2014-04-14 12:53:03 -04:00
psychobunny
901a64ae14 got optional secondary_database questions working 2014-04-14 12:48:59 -04:00
psychobunny
4353adb914 forgot to add levelQuestions here 2014-04-14 11:45:16 -04:00
psychobunny
74674c8494 Merge remote-tracking branch 'origin/master' into secondary_database
Conflicts:
	src/database/level/main.js
2014-04-14 11:43:54 -04:00
psychobunny
5950b162b9 reverting attempt 2014-04-14 11:39:13 -04:00
barisusakli
beb7313138 added err to next 2014-04-13 22:32:51 -04:00
barisusakli
9125292b0e removed get and mget 2014-04-13 22:24:21 -04:00
barisusakli
8aa4f053e8 converted translator.get to translator.translate 2014-04-13 22:16:43 -04:00
barisusakli
fb43282a9c removed for in loop 2014-04-13 22:04:08 -04:00
Julian Lam
ef4972f66b added sounds folder to gitignore 2014-04-13 21:34:58 -04:00
Julian Lam
d69b0953a2 latest translations 2014-04-13 21:09:49 -04:00
Julian Lam
78538ddb28 added American English to languages 2014-04-13 18:40:57 -04:00
barisusakli
557426c1c9 translator refactor
no longer loads all language files on startup
2014-04-13 16:24:12 -04:00
barisusakli
90540f64cf removed some unused translator requires 2014-04-13 15:05:17 -04:00
barisusakli
fc8e97448c load sounds on demand, refactored sounds 2014-04-12 19:19:57 -04:00
Julian Lam
5e279e067f Merge branch 'plugin-sounds' 2014-04-12 18:36:38 -04:00
Julian Lam
df8728c785 allowing plugins to define new sounds -- woot.
Also moving the core sounds into a separate package, soundpack-default
2014-04-12 18:36:23 -04:00
Julian Lam
c9a2724bfd allowing plugins to define new sounds -- woot.
Also moving the core sounds into a separate package, soundpack-default
2014-04-12 18:33:52 -04:00
barisusakli
f8a6ab5cf4 if no icon is selected for a category icon will be empty string 2014-04-12 17:36:52 -04:00
Julian Lam
29ec14efa0 fixed #1365 2014-04-12 17:05:22 -04:00
psychobunny
49bbbe3682 secondary_database attempt 2014-04-11 17:35:43 -04:00
psychobunny
4d429aa6d6 linting install.js 2014-04-11 17:19:40 -04:00
barisusakli
a091e06fe3 more work for #1368 2014-04-11 17:01:27 -04:00
barisusakli
06dddccf8e more refactor 2014-04-11 15:53:57 -04:00
psychobunny
4877e4a9d1 fixed allQuestions property 2014-04-11 15:50:06 -04:00
psychobunny
a7582e2cca organized level helpers ala mongo driver 2014-04-11 15:47:49 -04:00
barisusakli
252e757185 some more language strings and account.js refactor 2014-04-11 15:44:57 -04:00
psychobunny
46b6a93e98 organizing mongo driver 2014-04-11 15:44:53 -04:00
psychobunny
9ad7ce9ca8 organizing redis driver 2014-04-11 15:29:01 -04:00
psychobunny
2ba767b499 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Conflicts:
	tests/database.js
2014-04-11 15:26:42 -04:00
psychobunny
e09b156d13 removing unnecessary return 2014-04-11 15:25:20 -04:00
psychobunny
e442fed40a fixed getSortedSetRevRangeByScore test 2014-04-11 15:22:37 -04:00
Julian Lam
b12b2f13ea closed #1375 2014-04-11 13:24:44 -04:00
barisusakli
828fd6b978 fixed sortedSetRevRangeByScore test 2014-04-11 12:49:57 -04:00
psychobunny
c28308ee97 added instructions for adding a test database for Level DB #1373 2014-04-11 12:45:22 -04:00
psychobunny
c86635b4ce making changes for compatibility with 9d405812cb 2014-04-11 02:32:43 -04:00
psychobunny
136542f8dd Merge remote-tracking branch 'origin/master' into LevelDB
Conflicts:
	tests/database.js
2014-04-11 02:27:15 -04:00
psychobunny
f5716de06e forgot to use the passed in fn 2014-04-11 02:24:11 -04:00
psychobunny
2acdcd9ba2 more cleanup 2014-04-11 02:13:08 -04:00
psychobunny
4d65a51ede LevelDB - organization 2014-04-11 02:04:12 -04:00
psychobunny
5bac03a37b removed newline 2014-04-11 01:41:56 -04:00
psychobunny
cbec5cd3a1 cleanup 2014-04-11 01:41:01 -04:00
psychobunny
e5674dd5cc not all DB's use a hostname 2014-04-11 01:38:47 -04:00
psychobunny
c506a2ce1d LevelDB installation questions 2014-04-11 01:38:28 -04:00
psychobunny
4892fc81a2 added to database tests 2014-04-11 01:38:09 -04:00
psychobunny
21cb2c384e woo, NodeBB actually works on LevelDB 2014-04-11 01:37:39 -04:00
barisusakli
7545d55b22 jshint and refactor accountedit 2014-04-10 22:01:00 -04:00
barisusakli
1e3b88a7f0 passing array straight to redis 2014-04-10 21:13:46 -04:00
barisusakli
9d405812cb changed sortedSetRangeByScore 2014-04-10 20:59:17 -04:00
Micheil Smith
8da45b72a9 Composer: Rework formatting bar logic 2014-04-10 22:32:34 +01:00
Micheil Smith
78e1e4fbac Composer: simplify code with early returns 2014-04-10 22:31:55 +01:00
Julian Lam
74ff579412 added startTimer so that repeated errors on startup don't cause the loader to go into an infinite loop 2014-04-10 17:08:34 -04:00
Barış Soner Uşaklı
b28b837d72 fixed error.json 2014-04-10 16:41:45 -04:00
Micheil Smith
9dc0a4b115 Admin/Groups: Pass radix argument to parseInt 2014-04-10 20:56:53 +01:00
Micheil Smith
3e82cab398 Add missing new lines at end of files. 2014-04-10 20:56:53 +01:00
Micheil Smith
66d1f2505f Composer: Pass radix argument to parseInt 2014-04-10 20:56:53 +01:00
Micheil Smith
85cab3aec8 Composer: Escape special characters in regex 2014-04-10 20:56:52 +01:00
Micheil Smith
e860b0dd4c Composer: Remove unused variables 2014-04-10 20:56:52 +01:00
Micheil Smith
6e4639496e Improve readability of a selector 2014-04-10 20:56:52 +01:00
Micheil Smith
11b6794946 Refactor connection logic
Aiming to be flatter, with less deep nesting. Still more to go here.
2014-04-10 20:56:52 +01:00
Micheil Smith
0bbd29ac42 Reduce DOM queries for Search elements 2014-04-10 20:56:52 +01:00
Micheil Smith
01013f5c9d Refactor plugin logic.
This relies more heavily on `async` and also makes the loading process more asynchronous. It does remove one warning in the case that a plugin is enabled but not installed.
2014-04-10 20:56:51 +01:00
Micheil Smith
5f6d5cd9a5 Reduce duplication in src/categoryTools.js 2014-04-10 20:56:51 +01:00
Micheil Smith
2c2e5de911 Add missing 'global' variable declaration 2014-04-10 20:06:25 +01:00
barisusakli
14d0081fdf replace 2 error messages with keys 2014-04-10 12:47:48 -04:00
psychobunny
129019777f move work on LevelDB 2014-04-10 00:36:28 -04:00
psychobunny
e79284e75f LevelDB init 2014-04-09 23:22:43 -04:00
barisusakli
a345302454 really fixed test 2014-04-09 22:34:42 -04:00
barisusakli
b731d6af3b fixed topic test 2014-04-09 22:30:02 -04:00
barisusakli
1f77df794a added lots of error keys 2014-04-09 22:26:23 -04:00
barisusakli
0ac58dbee6 more error strings 2014-04-09 21:56:30 -04:00
barisusakli
fdeaf3a16e user.js error keys 2014-04-09 21:44:00 -04:00
barisusakli
eaf4be4979 posts.js error keys 2014-04-09 21:40:39 -04:00
barisusakli
b07efb0085 modules.js error keys 2014-04-09 21:36:57 -04:00
barisusakli
7b992e7a20 meta.js error language keys 2014-04-09 21:27:20 -04:00
barisusakli
197e61a5d0 admin js language keys 2014-04-09 21:26:37 -04:00
barisusakli
d366be7967 added error key 2014-04-09 21:22:37 -04:00
barisusakli
95972209f4 favourite changes
favourites.js no longer makes socket calls, moved that code into
socket.io/posts.js. it also makes a single socket call when you downvote
a post that you previously upvoted.
2014-04-09 20:55:53 -04:00
Julian Lam
e7f16e2b17 latest translations 2014-04-09 20:34:06 -04:00
barisusakli
296d5127c9 update to use error messages 2014-04-09 16:51:10 -04:00
barisusakli
34b73e15e6 dont add dupes to widgetLocations
this prevents widgets from being executed multiple times
2014-04-09 16:35:51 -04:00
barisusakli
d61e632c59 closes #1366 2014-04-09 15:49:36 -04:00
barisusakli
3dc1b87f01 removed reply from not logged in error message 2014-04-09 15:43:27 -04:00
barisusakli
a75baef450 removed socket emits for post errors 2014-04-09 15:39:30 -04:00
Julian Lam
d1a64798b9 removing use of slugs in groups... pending having more time 2014-04-09 14:46:18 -04:00
Julian Lam
bd2a1a3efa Revert "reverting groups.js to 4701eb1cee1a35b7f059f4362773bd9d67b7370c"
This reverts commit d8df9ab3ed.
2014-04-09 14:37:16 -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
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
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
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
barisusakli
ac88b5fc25 fixing user deletion, missing cb 2014-04-01 17:00:24 -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
Julian Lam
01f2e7dccd 0.3.2 2014-02-14 15:25:18 -05:00
979 changed files with 45248 additions and 31413 deletions

6
.gitignore vendored
View File

@@ -20,3 +20,9 @@ feeds/recent.rss
# winston?
error.log
events.log
pidfile
# templates
/public/templates
/public/sounds

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

View File

@@ -8,18 +8,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/category.json
trans.ko = public/language/ko/category.json
trans.lt = public/language/lt/category.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/category.json
trans.zh_CN = public/language/zh_CN/category.json
trans.zh_TW = public/language/zh_TW/category.json
type = KEYVALUEJSON
@@ -31,18 +45,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/login.json
trans.ko = public/language/ko/login.json
trans.lt = public/language/lt/login.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/login.json
trans.zh_CN = public/language/zh_CN/login.json
trans.zh_TW = public/language/zh_TW/login.json
type = KEYVALUEJSON
@@ -53,18 +81,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/recent.json
trans.ko = public/language/ko/recent.json
trans.lt = public/language/lt/recent.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/recent.json
trans.zh_CN = public/language/zh_CN/recent.json
trans.zh_TW = public/language/zh_TW/recent.json
type = KEYVALUEJSON
@@ -75,62 +117,68 @@ 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_US = public/language/en_US/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.ja = public/language/ja/unread.json
trans.ko = public/language/ko/unread.json
trans.lt = public/language/lt/unread.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/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.es = public/language/es/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.pt_BR = public/language/pt_BR/footer.json
trans.ru = public/language/ru/footer.json
trans.sk = public/language/sk/footer.json
trans.sv = public/language/sv/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_US = public/language/en_US/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.ja = public/language/ja/modules.json
trans.ko = public/language/ko/modules.json
trans.lt = public/language/lt/modules.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/modules.json
trans.zh_CN = public/language/zh_CN/modules.json
trans.zh_TW = public/language/zh_TW/modules.json
type = KEYVALUEJSON
@@ -141,18 +189,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/register.json
trans.ko = public/language/ko/register.json
trans.lt = public/language/lt/register.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/register.json
trans.zh_CN = public/language/zh_CN/register.json
trans.zh_TW = public/language/zh_TW/register.json
type = KEYVALUEJSON
@@ -163,18 +225,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/user.json
trans.ko = public/language/ko/user.json
trans.lt = public/language/lt/user.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/user.json
trans.zh_CN = public/language/zh_CN/user.json
trans.zh_TW = public/language/zh_TW/user.json
type = KEYVALUEJSON
@@ -185,18 +261,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/global.json
trans.ko = public/language/ko/global.json
trans.lt = public/language/lt/global.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/global.json
trans.zh_CN = public/language/zh_CN/global.json
trans.zh_TW = public/language/zh_TW/global.json
type = KEYVALUEJSON
@@ -207,18 +297,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/notifications.json
trans.ko = public/language/ko/notifications.json
trans.lt = public/language/lt/notifications.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/notifications.json
trans.zh_CN = public/language/zh_CN/notifications.json
trans.zh_TW = public/language/zh_TW/notifications.json
type = KEYVALUEJSON
@@ -229,18 +333,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/reset_password.json
trans.ko = public/language/ko/reset_password.json
trans.lt = public/language/lt/reset_password.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/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
@@ -251,18 +369,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/users.json
trans.ko = public/language/ko/users.json
trans.lt = public/language/lt/users.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/users.json
trans.zh_CN = public/language/zh_CN/users.json
trans.zh_TW = public/language/zh_TW/users.json
type = KEYVALUEJSON
@@ -273,18 +405,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/language.json
trans.ko = public/language/ko/language.json
trans.lt = public/language/lt/language.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/language.json
trans.zh_CN = public/language/zh_CN/language.json
trans.zh_TW = public/language/zh_TW/language.json
type = KEYVALUEJSON
@@ -295,18 +441,32 @@ 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_US = public/language/en_US/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.ja = public/language/ja/pages.json
trans.ko = public/language/ko/pages.json
trans.lt = public/language/lt/pages.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/pages.json
trans.zh_CN = public/language/zh_CN/pages.json
trans.zh_TW = public/language/zh_TW/pages.json
type = KEYVALUEJSON
@@ -317,19 +477,248 @@ 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_US = public/language/en_US/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.ja = public/language/ja/topic.json
trans.ko = public/language/ko/topic.json
trans.lt = public/language/lt/topic.json
trans.ms = public/language/ms/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.ro = public/language/ro/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.vi = public/language/vi/topic.json
trans.zh_CN = public/language/zh_CN/topic.json
trans.zh_TW = public/language/zh_TW/topic.json
type = KEYVALUEJSON
[nodebb.success]
source_file = public/language/en_GB/success.json
source_lang = en_GB
trans.ar = public/language/ar/success.json
trans.cs = public/language/cs/success.json
trans.de = public/language/de/success.json
trans.en_US = public/language/en_US/success.json
trans.en@pirate = public/language/en@pirate/success.json
trans.es = public/language/es/success.json
trans.et = public/language/et/success.json
trans.fa_IR = public/language/fa_IR/success.json
trans.fi = public/language/fi/success.json
trans.fr = public/language/fr/success.json
trans.he = public/language/he/success.json
trans.hu = public/language/hu/success.json
trans.it = public/language/it/success.json
trans.ja = public/language/ja/success.json
trans.ko = public/language/ko/success.json
trans.lt = public/language/lt/success.json
trans.ms = public/language/ms/success.json
trans.nb = public/language/nb/success.json
trans.nl = public/language/nl/success.json
trans.pl = public/language/pl/success.json
trans.pt_BR = public/language/pt_BR/success.json
trans.ru = public/language/ru/success.json
trans.ro = public/language/ro/success.json
trans.sc = public/language/sc/success.json
trans.sk = public/language/sk/success.json
trans.sv = public/language/sv/success.json
trans.th = public/language/th/success.json
trans.tr = public/language/tr/success.json
trans.vi = public/language/vi/success.json
trans.zh_CN = public/language/zh_CN/success.json
trans.zh_TW = public/language/zh_TW/success.json
type = KEYVALUEJSON
[nodebb.error]
source_file = public/language/en_GB/error.json
source_lang = en_GB
trans.ar = public/language/ar/error.json
trans.cs = public/language/cs/error.json
trans.de = public/language/de/error.json
trans.en_US = public/language/en_US/error.json
trans.en@pirate = public/language/en@pirate/error.json
trans.es = public/language/es/error.json
trans.et = public/language/et/error.json
trans.fa_IR = public/language/fa_IR/error.json
trans.fi = public/language/fi/error.json
trans.fr = public/language/fr/error.json
trans.he = public/language/he/error.json
trans.hu = public/language/hu/error.json
trans.it = public/language/it/error.json
trans.ja = public/language/ja/error.json
trans.ko = public/language/ko/error.json
trans.lt = public/language/lt/error.json
trans.ms = public/language/ms/error.json
trans.nb = public/language/nb/error.json
trans.nl = public/language/nl/error.json
trans.pl = public/language/pl/error.json
trans.pt_BR = public/language/pt_BR/error.json
trans.ru = public/language/ru/error.json
trans.ro = public/language/ro/error.json
trans.sc = public/language/sc/error.json
trans.sk = public/language/sk/error.json
trans.sv = public/language/sv/error.json
trans.th = public/language/th/error.json
trans.tr = public/language/tr/error.json
trans.vi = public/language/vi/error.json
trans.zh_CN = public/language/zh_CN/error.json
trans.zh_TW = public/language/zh_TW/error.json
type = KEYVALUEJSON
[nodebb.tags]
source_file = public/language/en_GB/tags.json
source_lang = en_GB
trans.ar = public/language/ar/tags.json
trans.cs = public/language/cs/tags.json
trans.de = public/language/de/tags.json
trans.en_US = public/language/en_US/tags.json
trans.en@pirate = public/language/en@pirate/tags.json
trans.es = public/language/es/tags.json
trans.et = public/language/et/tags.json
trans.fa_IR = public/language/fa_IR/tags.json
trans.fi = public/language/fi/tags.json
trans.fr = public/language/fr/tags.json
trans.he = public/language/he/tags.json
trans.hu = public/language/hu/tags.json
trans.it = public/language/it/tags.json
trans.ja = public/language/ja/tags.json
trans.ko = public/language/ko/tags.json
trans.lt = public/language/lt/tags.json
trans.ms = public/language/ms/tags.json
trans.nb = public/language/nb/tags.json
trans.nl = public/language/nl/tags.json
trans.pl = public/language/pl/tags.json
trans.pt_BR = public/language/pt_BR/tags.json
trans.ru = public/language/ru/tags.json
trans.ro = public/language/ro/tags.json
trans.sc = public/language/sc/tags.json
trans.sk = public/language/sk/tags.json
trans.sv = public/language/sv/tags.json
trans.th = public/language/th/tags.json
trans.tr = public/language/tr/tags.json
trans.vi = public/language/vi/tags.json
trans.zh_CN = public/language/zh_CN/tags.json
trans.zh_TW = public/language/zh_TW/tags.json
type = KEYVALUEJSON
[nodebb.email]
source_file = public/language/en_GB/email.json
source_lang = en_GB
trans.ar = public/language/ar/email.json
trans.cs = public/language/cs/email.json
trans.de = public/language/de/email.json
trans.en_US = public/language/en_US/email.json
trans.en@pirate = public/language/en@pirate/email.json
trans.es = public/language/es/email.json
trans.et = public/language/et/email.json
trans.fa_IR = public/language/fa_IR/email.json
trans.fi = public/language/fi/email.json
trans.fr = public/language/fr/email.json
trans.he = public/language/he/email.json
trans.hu = public/language/hu/email.json
trans.it = public/language/it/email.json
trans.ja = public/language/ja/email.json
trans.ko = public/language/ko/email.json
trans.lt = public/language/lt/email.json
trans.ms = public/language/ms/email.json
trans.nb = public/language/nb/email.json
trans.nl = public/language/nl/email.json
trans.pl = public/language/pl/email.json
trans.pt_BR = public/language/pt_BR/email.json
trans.ru = public/language/ru/email.json
trans.ro = public/language/ro/email.json
trans.sc = public/language/sc/email.json
trans.sk = public/language/sk/email.json
trans.sv = public/language/sv/email.json
trans.th = public/language/th/email.json
trans.tr = public/language/tr/email.json
trans.vi = public/language/vi/email.json
trans.zh_CN = public/language/zh_CN/email.json
trans.zh_TW = public/language/zh_TW/email.json
type = KEYVALUEJSON
[nodebb.search]
source_file = public/language/en_GB/search.json
source_lang = en_GB
trans.ar = public/language/ar/search.json
trans.cs = public/language/cs/search.json
trans.de = public/language/de/search.json
trans.en_US = public/language/en_US/search.json
trans.en@pirate = public/language/en@pirate/search.json
trans.es = public/language/es/search.json
trans.et = public/language/et/search.json
trans.fa_IR = public/language/fa_IR/search.json
trans.fi = public/language/fi/search.json
trans.fr = public/language/fr/search.json
trans.he = public/language/he/search.json
trans.hu = public/language/hu/search.json
trans.it = public/language/it/search.json
trans.ja = public/language/ja/search.json
trans.ko = public/language/ko/search.json
trans.lt = public/language/lt/search.json
trans.ms = public/language/ms/search.json
trans.nb = public/language/nb/search.json
trans.nl = public/language/nl/search.json
trans.pl = public/language/pl/search.json
trans.pt_BR = public/language/pt_BR/search.json
trans.ru = public/language/ru/search.json
trans.ro = public/language/ro/search.json
trans.sc = public/language/sc/search.json
trans.sk = public/language/sk/search.json
trans.sv = public/language/sv/search.json
trans.th = public/language/th/search.json
trans.tr = public/language/tr/search.json
trans.vi = public/language/vi/search.json
trans.zh_CN = public/language/zh_CN/search.json
trans.zh_TW = public/language/zh_TW/search.json
type = KEYVALUEJSON
[nodebb.groups]
source_file = public/language/en_GB/groups.json
source_lang = en_GB
trans.ar = public/language/ar/groups.json
trans.cs = public/language/cs/groups.json
trans.de = public/language/de/groups.json
trans.en_US = public/language/en_US/groups.json
trans.en@pirate = public/language/en@pirate/groups.json
trans.es = public/language/es/groups.json
trans.et = public/language/et/groups.json
trans.fa_IR = public/language/fa_IR/groups.json
trans.fi = public/language/fi/groups.json
trans.fr = public/language/fr/groups.json
trans.he = public/language/he/groups.json
trans.hu = public/language/hu/groups.json
trans.it = public/language/it/groups.json
trans.ja = public/language/ja/groups.json
trans.ko = public/language/ko/groups.json
trans.lt = public/language/lt/groups.json
trans.ms = public/language/ms/groups.json
trans.nb = public/language/nb/groups.json
trans.nl = public/language/nl/groups.json
trans.pl = public/language/pl/groups.json
trans.pt_BR = public/language/pt_BR/groups.json
trans.ru = public/language/ru/groups.json
trans.ro = public/language/ro/groups.json
trans.sc = public/language/sc/groups.json
trans.sk = public/language/sk/groups.json
trans.sv = public/language/sv/groups.json
trans.th = public/language/th/groups.json
trans.tr = public/language/tr/groups.json
trans.vi = public/language/vi/groups.json
trans.zh_CN = public/language/zh_CN/groups.json
trans.zh_TW = public/language/zh_TW/groups.json
type = KEYVALUEJSON

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,72 +1,48 @@
# <img alt="NodeBB" src="http://i.imgur.com/3yj1n6N.png" />
# <img alt="NodeBB" src="http://i.imgur.com/mYxPPtB.png" />
[![Build Status](https://travis-ci.org/NodeBB/NodeBB.svg?branch=master)](https://travis-ci.org/NodeBB/NodeBB)
[![Dependency Status](https://david-dm.org/nodebb/nodebb.svg)](https://david-dm.org/nodebb/nodebb)
[![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
[![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
**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.
* [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
* [Documentation](http://docs.nodebb.org) - includes setup instructions 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")
* [Follow us 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")
* [Help translate NodeBB](https://www.transifex.com/projects/p/nodebb/)
## Screenshots
## 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)
[<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/8OLssij.png" />](http://i.imgur.com/8OLssij.png)&nbsp;[<img src="http://i.imgur.com/JKOc0LZ.png"/>](http://i.imgur.com/JKOc0LZ.png)
Credit: [Convoe](http://www.convoe.com), [Kano](http://www.kano.me), [Manchester United Forum](http://manutdforums.com/).
## How can I follow along/contribute?
* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/designcreateplay/NodeBB/wiki/Version-History-%26-Roadmap)
* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
* 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.
* If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.
* 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 the following software to be installed:
* A version of Node.js at least 0.8 or greater
* Redis, version 2.6 or greater **or** MongoDB, version 2.4 or greater
* A version of Node.js at least 0.10 or greater
* Redis, version 2.6 or greater **or** MongoDB, version 2.6 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:
# apt-get install git nodejs redis-server build-essential imagemagick
If you want to use MongoDB instead of Redis install it from http://www.mongodb.org/downloads and remove 'redis-server' from the above command. [MongoDB-Setup](https://github.com/designcreateplay/NodeBB/wiki/Installing-NodeBB-With-MongoDB)
**If your package manager only installed a version of Node.js that is less than 0.8 (e.g. Ubuntu 12.10, 13.04):**
# add-apt-repository ppa:chris-lea/node.js
# apt-get update && apt-get dist-upgrade
Next, clone this repository:
$ 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:
$ ./nodebb 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.
$ ./nodebb start
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).
[Please refer to platform-specific installation documentation](http://docs.nodebb.org/en/latest/installing/os.html)
## Securing NodeBB
@@ -81,4 +57,8 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
## Upgrading NodeBB
Detailed upgrade instructions are listed in [Upgrading NodeBB](https://github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB)
Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/en/latest/upgrading/index.html)
## License
NodeBB is licensed under the **GNU General Public License v3 (GPL-3)** (http://www.gnu.org/copyleft/gpl.html)

230
app.js
View File

@@ -1,6 +1,7 @@
/*
NodeBB - A forum powered by node in development by designcreateplay
Copyright (C) 2013 DesignCreatePlay Inc.
NodeBB - A better forum platform for the modern web
https://github.com/NodeBB/NodeBB/
Copyright (C) 2013-2014 NodeBB Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,6 +19,7 @@
"use strict";
/*global require, global, process*/
var nconf = require('nconf');
nconf.argv().env();
@@ -39,7 +41,7 @@ winston.add(winston.transports.Console, {
});
winston.add(winston.transports.File, {
filename: 'error.log',
filename: 'logs/error.log',
level: 'error'
});
@@ -57,95 +59,106 @@ if(os.platform() === 'linux') {
}
// Log GNU copyright info along with server info
winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013-2014 NodeBB 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('');
// Alternate configuration file support
var configFile = __dirname + '/config.json',
var configFile = path.join(__dirname, '/config.json'),
configExists;
if (nconf.get('config')) {
configFile = path.join(__dirname, nconf.get('config'));
configFile = path.resolve(__dirname, nconf.get('config'));
}
configExists = fs.existsSync(configFile);
if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && configExists) {
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('help') */{
} else if (nconf.get('reset')) {
reset();
} else {
displayHelp();
};
}
function start() {
function loadConfig() {
nconf.file({
file: __dirname + '/config.json'
file: configFile
});
nconf.defaults({
themes_path: path.join(__dirname, 'node_modules')
base_dir: __dirname,
themes_path: path.join(__dirname, 'node_modules'),
upload_url: '/uploads/',
views_dir: path.join(__dirname, 'public/templates')
});
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('upload_url', path.join(path.sep, nconf.get('relative_path'), 'uploads', path.sep));
nconf.set('base_dir', __dirname);
// Ensure themes_path is a full filepath
nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
}
function start() {
loadConfig();
winston.info('Time: ' + new Date());
winston.info('Initializing NodeBB v' + pkg.version);
winston.info('* using ' + nconf.get('database') +' store at ' + nconf.get(nconf.get('database') + ':host') + ':' + nconf.get(nconf.get('database') + ':port'));
winston.info('* using configuration stored in: ' + configFile);
var host = nconf.get(nconf.get('database') + ':host'),
storeLocation = host ? 'at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : '') : '';
winston.info('* using ' + nconf.get('database') +' store ' + storeLocation);
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) {
if (err) {
winston.error(err.stack);
process.exit();
}
var meta = require('./src/meta');
meta.configs.init(function () {
var templates = require('./public/src/templates'),
translator = require('./public/src/translator'),
var templates = require('templates.js'),
webserver = require('./src/webserver'),
sockets = require('./src/socket.io'),
plugins = require('./src/plugins'),
notifications = require('./src/notifications'),
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();
var customTemplates = meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : false;
utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
templates.init(tplsToLoad, customTemplates);
});
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
plugins.ready(function() {
templates.ready(webserver.init);
webserver.init();
});
notifications.init();
process.on('SIGTERM', shutdown);
process.on('SIGINT', shutdown);
process.on('SIGHUP', restart);
process.on('uncaughtException', function(err) {
winston.error(err.message);
console.log(err.stack);
meta.js.killMinifier();
shutdown(1);
});
} 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')
winston.warn(' node app --no-check-schema');
process.exit();
}
});
@@ -154,16 +167,14 @@ function start() {
}
function setup() {
loadConfig();
if (nconf.get('setup')) {
winston.info('NodeBB Setup Triggered via Command Line');
} else {
winston.warn('Configuration not found, starting NodeBB setup');
}
nconf.file({
file: __dirname + '/config.json'
});
var install = require('./src/install');
winston.info('Welcome to NodeBB!');
@@ -182,19 +193,143 @@ function setup() {
}
function upgrade() {
nconf.file({
file: __dirname + '/config.json'
});
var meta = require('./src/meta');
loadConfig();
require('./src/database').init(function(err) {
meta.configs.init(function () {
if (err) {
winston.error(err.stack);
process.exit();
}
require('./src/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('plugin')) {
resetPlugin(nconf.get('plugin'));
} 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 {
winston.warn('[reset] Nothing reset.');
}
});
}
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 resetPlugin(pluginId) {
var db = require('./src/database');
db.setRemove('plugins:active', pluginId, function(err, result) {
if (err || result !== 1) {
winston.error('[reset] Could not disable plugin: ' + pluginId);
if (err) {
winston.error('[reset] Encountered error: ' + err.message);
} else {
winston.info('[reset] Perhaps it has already been disabled?');
}
} else {
winston.info('[reset] Plugin `' + pluginId + '` disabled');
}
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(code || 0);
}
function restart() {
if (process.send) {
winston.info('[app] Restarting...');
process.send({
action: 'restart'
});
} else {
winston.error('[app] Could not restart server. Shutting down.');
shutdown(1);
}
}
function displayHelp() {
winston.info('Usage: node app [options] [arguments]');
winston.info(' [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
@@ -202,6 +337,7 @@ function displayHelp() {
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(' --upgrade upgrade NodeBB, first read: https://docs.nodebb.org/en/latest/upgrading/');
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,4 +1,4 @@
[
[
{
"name": "Announcements",
"description": "Announcements regarding our community",

View File

@@ -0,0 +1,78 @@
[
{
"field": "title",
"value": "NodeBB"
},
{
"field": "showSiteTitle",
"value": "1"
},
{
"field": "postDelay",
"value": 10
},
{
"field": "minimumPostLength",
"value": 8
},
{
"field": "allowGuestSearching",
"value": 0
},
{
"field": "allowTopicsThumbnail",
"value": 0
},
{
"field": "allowRegistration",
"value": 1
},
{
"field": "allowLocalLogin",
"value": 1
},
{
"field": "allowFileUploads",
"value": 0
},
{
"field": "maximumFileSize",
"value": 2048
},
{
"field": "minimumTitleLength",
"value": 3
},
{
"field": "maximumTitleLength",
"value": 255
},
{
"field": "minimumUsernameLength",
"value": 2
},
{
"field": "maximumUsernameLength",
"value": 16
},
{
"field": "minimumPasswordLength",
"value": 6
},
{
"field": "maximumSignatureLength",
"value": 255
},
{
"field": "maximumProfileImageSize",
"value": 256
},
{
"field": "chatMessagesToDisplay",
"value": 50
},
{
"field": "requireEmailConfirmation",
"value": 0
}
]

114
install/databases.js Normal file
View File

@@ -0,0 +1,114 @@
"use strict";
var async = require('async'),
prompt = require('prompt'),
nconf = require('nconf'),
winston = require('winston'),
questions = {};
function success(err, config, callback) {
if (!config) {
return callback(new Error('aborted'));
}
var database = (config.redis || config.mongo || config.level) ? config.secondary_database : config.database;
function dbQuestionsSuccess(err, databaseConfig) {
if (!databaseConfig) {
return callback(new Error('aborted'));
}
// Translate redis properties into redis object
if(database === 'redis') {
config.redis = {
host: databaseConfig['redis:host'],
port: databaseConfig['redis:port'],
password: databaseConfig['redis:password'],
database: databaseConfig['redis:database']
};
if (config.redis.host.slice(0, 1) === '/') {
delete config.redis.port;
}
} else if (database === 'mongo') {
config.mongo = {
host: databaseConfig['mongo:host'],
port: databaseConfig['mongo:port'],
username: databaseConfig['mongo:username'],
password: databaseConfig['mongo:password'],
database: databaseConfig['mongo:database']
};
} else if (database === 'level') {
config.level = {
database: databaseConfig['level:database']
};
} else {
return callback(new Error('unknown database : ' + database));
}
var allQuestions = questions.redis.concat(questions.mongo.concat(questions.level));
for(var x=0;x<allQuestions.length;x++) {
delete config[allQuestions[x].name];
}
callback(err, config);
}
if(database === 'redis') {
if (config['redis:host'] && config['redis:port']) {
dbQuestionsSuccess(null, config);
} else {
prompt.get(questions.redis, dbQuestionsSuccess);
}
} else if(database === 'mongo') {
if (config['mongo:host'] && config['mongo:port']) {
dbQuestionsSuccess(null, config);
} else {
prompt.get(questions.mongo, dbQuestionsSuccess);
}
} else if(database === 'level') {
if (config['level:database']) {
dbQuestionsSuccess(null, config);
} else {
prompt.get(questions.level, dbQuestionsSuccess);
}
} else {
return callback(new Error('unknown database : ' + database));
}
}
function getSecondaryDatabaseModules(config, next) {
prompt.get({
"name": "secondary_db_modules",
"description": "Which database modules should " + config.secondary_database + " store?",
"default": nconf.get('secondary_db_modules') || "hash, list, sets, sorted"
}, function(err, db) {
config.secondary_db_modules = db.secondary_db_modules;
success(err, config, next);
});
}
module.exports = function(err, config, databases, callback) {
var allowedDBs = Object.keys(databases);
allowedDBs.forEach(function(db) {
questions[db] = require('./../src/database/' + db).questions;
});
async.waterfall([
function(next) {
process.stdout.write('\n');
winston.info('Now configuring ' + config.database + ' database:');
success(err, config, next);
},
function(config, next) {
if (config.secondary_database && allowedDBs.indexOf(config.secondary_database) !== -1) {
winston.info('Now configuring ' + config.secondary_database + ' database:');
getSecondaryDatabaseModules(config, next);
} else {
next(err, config);
}
}
], callback);
};

99
loader.js Normal file
View File

@@ -0,0 +1,99 @@
"use strict";
var nconf = require('nconf'),
fs = require('fs'),
pidFilePath = __dirname + '/pidfile',
output = fs.openSync(__dirname + '/logs/output.log', 'a'),
start = function() {
var fork = require('child_process').fork,
nbb_start = function() {
if (timesStarted > 3) {
console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.');
return nbb_stop();
}
timesStarted++;
if (startTimer) {
clearTimeout(startTimer);
}
startTimer = setTimeout(resetTimer, 1000*10);
nbb = fork('./app', process.argv.slice(2), {
env: process.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() {
if (startTimer) {
clearTimeout(startTimer);
}
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.removeAllListeners('exit').on('exit', function() {
nbb_start();
});
nbb.kill();
},
resetTimer = function() {
clearTimeout(startTimer);
timesStarted = 0;
},
timesStarted = 0,
startTimer;
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('daemon') !== false) {
// Check for a still-active NodeBB process
if (fs.existsSync(pidFilePath)) {
try {
var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
process.kill(pid, 0);
process.exit();
} catch (e) {
fs.unlinkSync(pidFilePath);
}
}
// Daemonize and record new pid
require('daemon')({
stdout: output
});
fs.writeFile(__dirname + '/pidfile', process.pid);
start();
} else {
start();
}

1
logs/.gitignore vendored Normal file
View File

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

74
minifier.js Normal file
View File

@@ -0,0 +1,74 @@
"use strict";
var uglifyjs = require('uglify-js'),
less = require('less'),
async = require('async'),
fs = require('fs'),
path = require('path'),
crypto = require('crypto'),
Minifier = {
js: {},
css: {}
};
/* Javascript */
Minifier.js.minify = function (scripts, minify, callback) {
var options = {};
scripts = scripts.filter(function(file) {
return fs.existsSync(file);
});
if (!minify) {
options.sourceMapURL = '/nodebb.min.js.map';
options.outSourceMap = 'nodebb.min.js.map';
options.mangle = false;
options.compress = false;
options.prefix = 1;
}
try {
var minified = uglifyjs.minify(scripts, options),
hasher = crypto.createHash('md5'),
hash;
// Calculate js hash
hasher.update(minified.code, 'utf-8');
hash = hasher.digest('hex');
process.send({
type: 'hash',
payload: hash.slice(0, 8)
});
callback({
js: minified.code,
map: minified.map
});
} catch(err) {
process.send({
type: 'error',
payload: err
});
}
};
process.on('message', function(payload) {
switch(payload.action) {
case 'js':
Minifier.js.minify(payload.scripts, payload.minify, function(data) {
process.stdout.write(data.js);
process.send({
type: 'end',
payload: 'script'
});
process.stderr.write(data.map);
process.send({
type: 'end',
payload: 'mapping'
});
});
break;
}
});

View File

@@ -5,6 +5,7 @@
(function(module) {
'use strict';
/*global before*/
var utils = require('./../public/src/utils.js'),
path = require('path'),
@@ -14,6 +15,12 @@
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'),
@@ -26,17 +33,21 @@
"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' +
' "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' +
'"test_database": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "27017",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
" or (level):\n" +
'"test_database": {' + '\n' +
' "database": "/path/to/database"' + '\n' +
'}\n'+
"==========================================================="
);
@@ -55,23 +66,31 @@
nconf.set(dbType, testDbConfig);
db = require('../src/database');
before(function(done) {
var db = require('../src/database'),
meta = require('../src/meta');
before(function(done) {
db.init(function(err) {
//Clean up
db.flushdb(function(err) {
if(err){
if(err) {
winston.error(err);
throw new Error(err);
} else {
winston.info('test_database flushed');
done();
}
//TODO: data seeding, if needed at all
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();
});
});
});
});

123
nodebb
View File

@@ -4,64 +4,127 @@
# $1 action
# $2 subaction
node="$(which nodejs 2>/dev/null)";
if [ $? -gt 0 ];
then node="$(which node)";
fi
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)
node app "$@"
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)
pidExists;
if [ 0 -eq $? ];
then
echo "NodeBB is already stopped.";
else
echo "Stopping NodeBB. Goodbye!";
kill $(cat pidfile);
fi
;;
reload|restart)
pidExists;
if [ 0 -eq $? ];
then
echo "NodeBB could not be restarted, as a running instance could not be found.";
else
echo "Restarting NodeBB.";
kill -1 $(cat pidfile);
fi
;;
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 app --upgrade
# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
# ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
npm i nodebb-theme-vanilla nodebb-theme-lavender nodebb-widget-essentials
"$node" app --upgrade
touch package.json
echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
;;
setup)
node app --setup
"$node" app --setup "$@"
;;
reset)
"$node" app --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 app "$@"
echo "More Information: https://docs.nodebb.org/en/latest/running/index.html"
NODE_ENV=development "$node" loader --no-daemon "$@"
;;
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 --extensions 'node|js|tpl' -- app "$@"
echo "More Information: https://docs.nodebb.org/en/latest/running/index.html"
NODE_ENV=development supervisor -q --ignore public/templates --extensions 'node|js|tpl|less' -- app "$@"
;;
# language)
# case "$2" in
# check)
# node app --language="check"
# ;;
# *)
# echo "Language Settings"
# echo $"Usage: $0 language {check}"
# echo ''
# column -s ' ' -t <<< '
# check Compare language files against the /en directory
# '
# ;;
# esac
# ;;
*)
echo "Welcome to NodeBB"
echo $"Usage: $0 {start|dev|watch|language}"
echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
echo ''
column -s ' ' -t <<< '
start Start NodeBB in production mode
dev Start NodeBB in development mode
watch Start NodeBB in development mode and watch for changes
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

2196
npm-shrinkwrap.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -2,73 +2,74 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
"version": "0.3.1",
"version": "0.5.0",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
"url": "https://github.com/designcreateplay/NodeBB/"
"url": "https://github.com/NodeBB/NodeBB/"
},
"main": "app.js",
"scripts": {
"test": "mocha ./tests"
"start": "./nodebb start",
"stop": "./nodebb stop",
"test": "mocha ./tests -t 10000"
},
"dependencies": {
"socket.io": "~0.9.16",
"express": "3.2.0",
"express-namespace": "~0.1.1",
"emailjs": "0.3.4",
"cookie": "0.0.6",
"passport": "0.1.17",
"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",
"async": "~0.2.8",
"node-imagemagick": "0.1.8",
"async": "~0.9.0",
"bcryptjs": "~2.0.1",
"connect-flash": "^0.1.1",
"cron": "~1.0.4",
"daemon": "~1.1.0",
"express": "4.6.1",
"cookie-parser": "^1.0.1",
"body-parser": "^1.0.1",
"serve-favicon": "^2.0.1",
"express-session": "^1.0.2",
"csurf": "^1.1.0",
"compression": "^1.0.1",
"connect-multiparty": "^1.0.1",
"morgan": "^1.0.0",
"gm": "1.16.0",
"gravatar": "1.0.6",
"less": "~1.7.3",
"mkdirp": "~0.5.0",
"nconf": "~0.6.7",
"sitemap": "~0.7.1",
"request": "~2.25.0",
"reds": "~0.2.4",
"winston": "~0.7.2",
"rss": "~0.2.0",
"nodebb-plugin-dbsearch": "0.0.13",
"nodebb-plugin-markdown": "~0.5.0",
"nodebb-plugin-mentions": "~0.5.0",
"nodebb-plugin-soundpack-default": "~0.1.1",
"nodebb-theme-lavender": "~0.0.74",
"nodebb-theme-vanilla": "~0.0.111",
"nodebb-widget-essentials": "~0.1.0",
"npm": "^1.4.6",
"passport": "~0.2.0",
"passport-local": "1.0.0",
"prompt": "~0.2.11",
"uglify-js": "~2.4.0",
"validator": "~1.5.1",
"nodebb-plugin-mentions": "~0.3",
"nodebb-plugin-markdown": "~0.3",
"nodebb-theme-vanilla": "~0.0.13",
"nodebb-theme-cerulean": "~0.0.12",
"nodebb-theme-lavender": "~0.0",
"cron": "~1.0.1",
"semver": "~2.2.1",
"string": "~1.7.0",
"xregexp": "~2.0.0",
"request": "~2.38.0",
"rimraf": "~2.2.6",
"rss": "~0.3.2",
"semver": "~2.3.1",
"sitemap": "~0.7.3",
"socket.io": "~0.9.16",
"socket.io-wildcard": "~0.1.1",
"bcryptjs": "~0.7.10"
},
"optionalDependencies": {
"redis": "0.8.3",
"mongodb": "~1.3.19",
"connect-redis": "1.4.5",
"connect-mongo": "0.4.0",
"hiredis": "~0.1.15",
"nodebb-plugin-sso-facebook": "~0.1.0",
"nodebb-plugin-sso-twitter": "~0.1.0",
"nodebb-plugin-sso-google": "~0.1.0"
"string": "~1.9.0",
"uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
"underscore": "~1.6.0",
"validator": "~3.16.1",
"winston": "~0.7.2",
"xregexp": "~2.0.0",
"templates.js": "0.0.13"
},
"devDependencies": {
"mocha": "~1.13.0"
},
"bugs": {
"url": "https://github.com/designcreateplay/NodeBB/issues"
"url": "https://github.com/NodeBB/NodeBB/issues"
},
"engines": {
"node": ">=0.8"
"node": ">=0.10"
},
"contributors": [
"maintainers": [
{
"name": "Andrew Rodrigues",
"email": "andrew@designcreateplay.com",
@@ -83,22 +84,6 @@
"name": "Barış Soner Uşaklı",
"email": "baris@designcreateplay.com",
"url": "https://github.com/barisusakli"
},
{
"name": "Andrew Darqui",
"url": "https://github.com/adarqui"
},
{
"name": "Damian Bushong",
"url": "https://github.com/damianb"
},
{
"name": "Matt Smith",
"url": "https://github.com/soimafreak"
},
{
"name": "Quinton Marchi",
"url": "https://github.com/iamcardinal"
}
]
}

View File

@@ -1,14 +1,7 @@
{
"new_topic_button": "موضوع جديد",
"no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
"sidebar.recent_replies": "الردود مؤخرا",
"sidebar.active_participants": "المشاركون النشطة",
"sidebar.moderators": "المشرفين",
"posts": "مشاركات",
"views": "مشاهدات",
"posted": "نشر",
"browsing": "يتصفح",
"no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر موضوع؟<br />",
"browsing": "تصفح",
"no_replies": "لم يرد أحد",
"replied": "رد",
"last_edited_by": "تغيرت أخيراً عبر"
"share_this_category": "انشر هذه الفئة"
}

View File

@@ -0,0 +1,20 @@
{
"password-reset-requested": "Password Reset Requested - %1!",
"welcome-to": "Welcome to %1",
"greeting_no_name": "Hello",
"greeting_with_name": "Hello %1",
"welcome.text1": "Thank you for registering with %1!",
"welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
"welcome.cta": "Click here to confirm your email address",
"reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
"reset.text2": "To continue with the password reset, please click on the following link:",
"reset.cta": "Click here to reset your password",
"digest.notifications": "You have some unread notifications from %1:",
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
"digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
"closing": "Thanks!"
}

View File

@@ -0,0 +1,56 @@
{
"invalid-data": "بيانات غير صالحة",
"not-logged-in": "لم تقم بتسجيل الدخول",
"account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account! Please login or register!",
"invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID",
"invalid-pid": "Invalid Post ID",
"invalid-uid": "Invalid User ID",
"invalid-username": "اسم المستخدم غير مقبول",
"invalid-email": "البريد الاكتروني غير مقبول",
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "كلمة السر غير مقبولة",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "اسم المستخدم ماخوذ",
"email-taken": "البريد الالكتروني ماخوذ",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
"user-banned": "المستخدم محظور",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
"no-group": "Group doesn't exist",
"no-user": "المستخدم لا يوجد",
"no-teaser": "Teaser doesn't exist",
"no-privileges": "You don't have enough privileges for this action.",
"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
"category-disabled": "Category disabled",
"topic-locked": "الموضوع مقفول",
"still-uploading": "الرجاء انتظار الرفع",
"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",
"cant-vote-self-post": "You cannot vote for your own post",
"already-favourited": "You already favourited this post",
"already-unfavourited": "You already unfavourited this post",
"cant-ban-other-admins": "You can't ban other admins!",
"invalid-image-type": "نوع الصورة ممنوع",
"group-name-too-short": "Group name too short",
"group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed",
"post-already-deleted": "Post already deleted",
"post-already-restored": "Post already restored",
"topic-already-deleted": "Topic already deleted",
"topic-already-restored": "Topic already restored",
"topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"upload-error": "مشكلة في الرفع: 1%",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
}

View File

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

View File

@@ -10,14 +10,20 @@
"500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
"register": "تسجيل",
"login": "دخول",
"please_log_in": "Please Log In",
"logout": "تسجيل الخروج",
"logout.title": "تم تسجيل الخروج",
"logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB",
"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",
"pagination.out_of": "%1 out of %2",
"pagination.enter_index": "Enter index",
"header.admin": "مشرف",
"header.recent": "حديث",
"header.unread": "غير مقروء",
"header.tags": "Tags",
"header.popular": "Popular",
"header.users": "المستخدمين",
"header.chats": "Chats",
@@ -27,26 +33,43 @@
"notifications.loading": "تحميل التبليغات",
"chats.loading": "تحميل الدردشات",
"motd.welcome": "مرحبا بكم NodeBB، منصة مناقشة المستقبل",
"motd.get": "NodeBB إحصل على",
"motd.fork": "فرع",
"motd.like": "ود",
"motd.follow": "تابع",
"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.banned.message": "You have just been banned, you will now be logged out.",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"online": "Online",
"users": "Users",
"topics": "Topics",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"reputation": "Reputation",
"read_more": "read more",
"posted_ago_by_guest": "posted %1 by Guest",
"posted_ago_by": "posted %1 by %2",
"posted_ago": "posted %1",
"posted_in_ago_by_guest": "posted in %1 %2 by Guest",
"posted_in_ago_by": "posted in %1 %2 by %3",
"posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
"last_edited_by_ago": "last edited by %1 %2",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Posts",
"online": "Online",
"recentips": "Recently Logged In IPs",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
"offline": "Offline",
"email": "Email",
"language": "Language",
"guest": "Guest",
"guests": "Guests",
"updated.title": "Forum Updated",
"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
}

View File

@@ -0,0 +1,7 @@
{
"view_group": "View Group",
"details.title": "Group Details",
"details.members": "Member List",
"details.has_no_posts": "This group's members have not made any posts.",
"details.latest_posts": "Latest Posts"
}

View File

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

View File

@@ -1,6 +1,18 @@
{
"chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
"chat.placeholder": "اكتب رسالة دردشة هنا، وإضغط ENTER لإرسال",
"chat.placeholder": "Type chat message here, press enter to send",
"chat.send": "أرسل",
"chat.no_active": "لا يوجد لديك دردشات نشطة."
"chat.no_active": "لا يوجد لديك دردشات نشطة.",
"chat.user_typing": "%1 is typing ...",
"chat.user_has_messaged_you": "%1 has messaged you.",
"chat.see_all": "See all Chats",
"chat.no-messages": "Please select a recipient to view chat message history",
"chat.recent-chats": "Recent Chats",
"chat.contacts": "Contacts",
"chat.message-history": "Message History",
"chat.pop-out": "Pop out chat",
"chat.maximize": "Maximize",
"composer.user_said_in": "%1 said in %2:",
"composer.user_said": "%1 said:",
"composer.discard": "Are you sure you wish to discard this post?"
}

View File

@@ -1,10 +1,23 @@
{
"title": "إعلام",
"no_notifs": "You have no notifications",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"back_to_home": "العودة إلى NodeBB",
"back_to_home": "Back to %1",
"outgoing_link": "رابط خارجي",
"outgoing_link_message": "أنت الأن ترحل",
"continue_to": "أكمل إلى",
"return_to": "إرجع إلى"
"outgoing_link_message": "You are now leaving %1.",
"continue_to": "Continue to %1",
"return_to": "Return to %1",
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from <strong>%1</strong>",
"upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
"favourited_your_post": "<strong>%1</strong> has favourited your post.",
"user_flagged_post": "<strong>%1</strong> flagged a post.",
"user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
"email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
"email-confirm-sent": "Confirmation email sent."
}

View File

@@ -1,12 +1,16 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"tags": "Topics tagged under \"%1\"",
"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

@@ -3,5 +3,6 @@
"day": "يوم",
"week": "أسبوع",
"month": "شهر",
"year": "Year",
"no_recent_topics": "There are no recent topics."
}

View File

@@ -8,6 +8,7 @@
"new_password": "كلمة السر الجديدة",
"repeat_password": "تأكيد كلمة السر",
"enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
"enter_email_address": "Enter Email Address",
"password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
"invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
}

View File

@@ -0,0 +1,3 @@
{
"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
}

View File

@@ -0,0 +1,6 @@
{
"success": "Success",
"topic-post": "You have successfully posted.",
"authentication-successful": "Authentication Successful",
"settings-saved": "Settings saved!"
}

View File

@@ -0,0 +1,6 @@
{
"no_tag_topics": "There are no topics with this tag.",
"tags": "Tags",
"enter_tags_here": "Enter tags here. Press enter after each tag.",
"no_tags": "There are no tags yet."
}

View File

@@ -1,16 +1,21 @@
{
"topic": "موضوع",
"topics": "مواضيع",
"topic_id": "Topic ID",
"topic_id_placeholder": "Enter topic ID",
"no_topics_found": "لا توجد مواضيع !",
"no_posts_found": "No posts found!",
"post_is_deleted": "This post is deleted!",
"profile": "ملف",
"posted_by": "Posted by",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
"chat": "دردشة",
"notify_me": "تنبه من ردود جديدة في هذا الموضوع",
"quote": "اقتبس",
"reply": "رد",
"edit": "صحح",
"delete": "حذف",
"purge": "Purge",
"restore": "Restore",
"move": "انقل",
"fork": "فرع",
"banned": "محظور",
@@ -18,8 +23,19 @@
"share": "شارك",
"tools": "أدوات",
"flag": "Flag",
"locked": "Locked",
"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.message": "You will now be receiving notifications when somebody posts to this 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": "علق الموضوع",
@@ -27,37 +43,53 @@
"thread_tools.lock": "قفل الموضوع",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.move": "نقل الموضوع",
"thread_tools.move_all": "Move All",
"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?",
"thread_tools.purge": "Purge Topic",
"thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
"topic_move_success": "This topic has been successfully moved to %1",
"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_purge_confirm": "Are you sure you want to purge 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_topics": "Move Topics",
"move_post": "نقل الرد",
"post_moved": "Post moved!",
"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.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic"
"composer.replying_to": "Replying to %1",
"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",
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
"users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
"most_votes": "Most votes"
}

View File

@@ -1,6 +1,9 @@
{
"title": "Unread",
"no_unread_topics": "ليس هناك أي موضوع غير مقروء",
"mark_all_read": "إجعل كل المواضيع مقرؤة",
"load_more": "حمل المزيد"
"load_more": "حمل المزيد",
"mark_as_read": "Mark as Read",
"selected": "Selected",
"all": "All",
"topics_marked_as_read.success": "Topics marked as read!"
}

View File

@@ -3,6 +3,7 @@
"offline": "ليس موجود حالياً",
"username": "إسم المستخدم",
"email": "البريد الإلكتروني",
"confirm_email": "Confirm Email",
"fullname": "الاسم الكامل",
"website": "الموقع الإلكتروني",
"location": "موقع",
@@ -12,28 +13,53 @@
"profile": "Profile",
"profile_views": "مشاهد الملف",
"reputation": "سمعة",
"posts": "ردود",
"favourites": "Favourites",
"followers": "أتباع",
"following": "يتبع",
"signature": "توقيع",
"gravatar": "Gravatar",
"birthday": "عيد ميلاد",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"profile_update_success": "Profile has been updated successfully!",
"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 do not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "تأكيد كلمة السر",
"password": "كلمة السر",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
"upload_picture": "تحميل الصورة",
"upload_a_picture": "تحميل صورة",
"image_spec": "تستطيع تحميل سوى PNG، JPG، GIF تحت 256KB.",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Settings",
"show_email": "أظهر بريدي الإلكتروني",
"digest_label": "Subscribe to Digest",
"digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
"digest_off": "Off",
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
"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": "مخفي"
"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.",
"browsing": "Browsing Settings",
"open_links_in_new_tab": "Open outgoing links in new tab?"
}

View File

@@ -2,8 +2,9 @@
"latest_users": "أحدث المستخدمين",
"top_posters": "أكثر المشتركين",
"most_reputation": "أعلى سمعة",
"online": "موجودين حالياً",
"search": "بحث",
"enter_username": "أدخل اسم مستخدم للبحث",
"load_more": "حمل المزيد"
"load_more": "حمل المزيد",
"user-not-found": "User not found!",
"users-found-search-took": "%1 user(s) found! Search took %2 ms."
}

View File

@@ -1,14 +1,7 @@
{
"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í!",
"sidebar.recent_replies": "Poslední příspěvky",
"sidebar.active_participants": "Aktivní účastníci",
"sidebar.moderators": "Moderátoři",
"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,20 @@
{
"password-reset-requested": "Password Reset Requested - %1!",
"welcome-to": "Welcome to %1",
"greeting_no_name": "Hello",
"greeting_with_name": "Hello %1",
"welcome.text1": "Thank you for registering with %1!",
"welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
"welcome.cta": "Click here to confirm your email address",
"reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
"reset.text2": "To continue with the password reset, please click on the following link:",
"reset.cta": "Click here to reset your password",
"digest.notifications": "You have some unread notifications from %1:",
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
"digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
"closing": "Thanks!"
}

View File

@@ -0,0 +1,56 @@
{
"invalid-data": "Invalid Data",
"not-logged-in": "You don't seem to be logged in.",
"account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account! Please login or register!",
"invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID",
"invalid-pid": "Invalid Post ID",
"invalid-uid": "Invalid User ID",
"invalid-username": "Invalid Username",
"invalid-email": "Invalid Email",
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
"user-banned": "User banned",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
"no-group": "Group doesn't exist",
"no-user": "User doesn't exist",
"no-teaser": "Teaser doesn't exist",
"no-privileges": "You don't have enough privileges for this action.",
"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
"category-disabled": "Category disabled",
"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",
"cant-vote-self-post": "You cannot vote for your own post",
"already-favourited": "You already favourited this post",
"already-unfavourited": "You already unfavourited this post",
"cant-ban-other-admins": "You can't ban other admins!",
"invalid-image-type": "Invalid image type",
"group-name-too-short": "Group name too short",
"group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed",
"post-already-deleted": "Post already deleted",
"post-already-restored": "Post already restored",
"topic-already-deleted": "Topic already deleted",
"topic-already-restored": "Topic already restored",
"topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
}

View File

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

View File

@@ -10,14 +10,20 @@
"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",
"logout.title": "Odhlásili jsme Vás.",
"logout.message": "Úspěšně jsme Vás odhlásili z fóra.",
"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",
"pagination.out_of": "%1 out of %2",
"pagination.enter_index": "Enter index",
"header.admin": "Administrace",
"header.recent": "Aktuality",
"header.unread": "Nepřečtené",
"header.tags": "Tags",
"header.popular": "Populární",
"header.users": "Uživatelé",
"header.chats": "Chats",
@@ -27,26 +33,43 @@
"notifications.loading": "Načítání upozornění",
"chats.loading": "Načítání grafů",
"motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
"motd.get": "Získat NodeBB",
"motd.fork": "Fork",
"motd.like": "To se mi líbí",
"motd.follow": "Sledovat",
"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.banned.message": "You have just been banned, you will now be logged out.",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"online": "Online",
"users": "Users",
"topics": "Topics",
"posts": "Příspěvky",
"views": "Zobrazení",
"posted": "odesláno",
"in": "v",
"reputation": "Reputation",
"read_more": "read more",
"posted_ago_by_guest": "posted %1 by Guest",
"posted_ago_by": "posted %1 by %2",
"posted_ago": "posted %1",
"posted_in_ago_by_guest": "posted in %1 %2 by Guest",
"posted_in_ago_by": "posted in %1 %2 by %3",
"posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
"last_edited_by_ago": "last edited by %1 %2",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Nedávné příspěvky",
"online": "Online",
"recentips": "Recently Logged In IPs",
"away": "Pryč",
"dnd": "Nerušit",
"invisible": "Neviditelný",
"offline": "Offline"
"offline": "Offline",
"email": "Email",
"language": "Language",
"guest": "Guest",
"guests": "Guests",
"updated.title": "Forum Updated",
"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
}

View File

@@ -0,0 +1,7 @@
{
"view_group": "View Group",
"details.title": "Group Details",
"details.members": "Member List",
"details.has_no_posts": "This group's members have not made any posts.",
"details.latest_posts": "Latest Posts"
}

View File

@@ -1,10 +1,9 @@
{
"login": "Přihlásit se",
"username": "Uživatelské jméno",
"password": "Heslo",
"username": "Username / Email",
"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ě!"
"login_successful": "Přihlášení proběhlo úspěšně!",
"dont_have_account": "Don't have an account?"
}

View File

@@ -1,6 +1,18 @@
{
"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.placeholder": "Type chat message here, press enter to send",
"chat.send": "Odeslat",
"chat.no_active": "Nemáte žádné aktivní konverzace."
"chat.no_active": "Nemáte žádné aktivní konverzace.",
"chat.user_typing": "%1 is typing ...",
"chat.user_has_messaged_you": "%1 has messaged you.",
"chat.see_all": "See all Chats",
"chat.no-messages": "Please select a recipient to view chat message history",
"chat.recent-chats": "Recent Chats",
"chat.contacts": "Contacts",
"chat.message-history": "Message History",
"chat.pop-out": "Pop out chat",
"chat.maximize": "Maximize",
"composer.user_said_in": "%1 said in %2:",
"composer.user_said": "%1 said:",
"composer.discard": "Are you sure you wish to discard this post?"
}

View File

@@ -1,10 +1,23 @@
{
"title": "Upozornění",
"no_notifs": "You have no notifications",
"no_notifs": "You have no new notifications",
"see_all": "See all Notifications",
"back_to_home": "Zpět na úvodní stránku",
"back_to_home": "Back to %1",
"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 "
"outgoing_link_message": "You are now leaving %1.",
"continue_to": "Continue to %1",
"return_to": "Return to %1",
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from <strong>%1</strong>",
"upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
"favourited_your_post": "<strong>%1</strong> has favourited your post.",
"user_flagged_post": "<strong>%1</strong> flagged a post.",
"user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
"email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
"email-confirm-sent": "Confirmation email sent."
}

View File

@@ -1,12 +1,16 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"tags": "Topics tagged under \"%1\"",
"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

@@ -3,5 +3,6 @@
"day": "Den",
"week": "Týden",
"month": "Měsíc",
"year": "Year",
"no_recent_topics": "There are no recent topics."
}

View File

@@ -8,6 +8,7 @@
"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,3 @@
{
"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
}

View File

@@ -0,0 +1,6 @@
{
"success": "Success",
"topic-post": "You have successfully posted.",
"authentication-successful": "Authentication Successful",
"settings-saved": "Settings saved!"
}

View File

@@ -0,0 +1,6 @@
{
"no_tag_topics": "There are no topics with this tag.",
"tags": "Tags",
"enter_tags_here": "Enter tags here. Press enter after each tag.",
"no_tags": "There are no tags yet."
}

View File

@@ -1,16 +1,21 @@
{
"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!",
"post_is_deleted": "This post is deleted!",
"profile": "Profil",
"posted_by": "Odeslal",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Sledovat toto téma",
"quote": "Citovat",
"reply": "Odpovědět",
"edit": "Upravit",
"delete": "Smazat",
"purge": "Purge",
"restore": "Restore",
"move": "Přesunout",
"fork": "Rozdělit",
"banned": "banned",
@@ -18,8 +23,19 @@
"share": "Sdílet",
"tools": "Nástroje",
"flag": "Flag",
"locked": "Locked",
"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.message": "You will now be receiving notifications when somebody posts to this 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",
@@ -27,37 +43,53 @@
"thread_tools.lock": "Lock Topic",
"thread_tools.unlock": "Unlock Topic",
"thread_tools.move": "Move Topic",
"thread_tools.move_all": "Move All",
"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?",
"thread_tools.purge": "Purge Topic",
"thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
"topic_move_success": "This topic has been successfully moved to %1",
"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_purge_confirm": "Are you sure you want to purge 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_topics": "Move Topics",
"move_post": "Přesunout příspěvek",
"post_moved": "Post moved!",
"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.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic"
"composer.replying_to": "Replying to %1",
"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",
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
"users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
"most_votes": "Most votes"
}

View File

@@ -1,6 +1,9 @@
{
"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ší"
"load_more": "Načíst další",
"mark_as_read": "Mark as Read",
"selected": "Selected",
"all": "All",
"topics_marked_as_read.success": "Topics marked as read!"
}

View File

@@ -3,6 +3,7 @@
"offline": "Offline",
"username": "Uživatelské jméno",
"email": "Email",
"confirm_email": "Confirm Email",
"fullname": "Jméno a příjmení",
"website": "Webové stránky",
"location": "Poloha",
@@ -12,28 +13,53 @@
"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",
"profile_update_success": "Profile has been updated successfully!",
"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 do not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "Potvrzení hesla",
"password": "Heslo",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
"upload_picture": "Nahrát obrázek",
"upload_a_picture": "Nahrát obrázek",
"image_spec": "Můžete nahrávat poze obrázky ve formátu PNG, JPG, nebo GIF o velikosti menší než 256kb.",
"image_spec": "You may only upload PNG, JPG, or GIF files",
"max": "max.",
"settings": "Nastavení",
"show_email": "Zobrazovat můj email v profilu",
"digest_label": "Subscribe to Digest",
"digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
"digest_off": "Off",
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
"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ý"
"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.",
"browsing": "Browsing Settings",
"open_links_in_new_tab": "Open outgoing links in new tab?"
}

View File

@@ -2,8 +2,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ší"
"load_more": "Načíst další",
"user-not-found": "User not found!",
"users-found-search-took": "%1 user(s) found! Search took %2 ms."
}

View File

@@ -1,14 +1,7 @@
{
"new_topic_button": "Neues Thema",
"no_topics": "<strong>Es gibt noch keine Threads in dieser Kategorie.</strong><br />Warum beginnst du nicht den ersten?",
"sidebar.recent_replies": "Neuste Antworten",
"sidebar.active_participants": "Aktive Teilnehmer",
"sidebar.moderators": "Moderatoren",
"posts": "Posts",
"views": "Aufrufe",
"posted": "Geposted",
"browsing": "Sieht zu",
"no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
"browsing": "Aktiv",
"no_replies": "Niemand hat geantwortet",
"replied": "geantwortet",
"last_edited_by": "zuletzt editiert durch"
"share_this_category": "Teile diese Kategorie"
}

View File

@@ -0,0 +1,20 @@
{
"password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
"welcome-to": "Willkommen zu %1",
"greeting_no_name": "Hallo",
"greeting_with_name": "Hallo %1",
"welcome.text1": "Vielen Dank für die Registrierung mit %1!",
"welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
"welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
"reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
"reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
"reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
"digest.notifications": "Du hast einige ungelesene Benachrichtigungen vom %1:",
"digest.latest_topics": "Aktuellste Themen vom %1",
"digest.cta": "Klicke hier, um %1 zu besuchen",
"digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
"digest.unsub.cta": "Klicke hier, um diese Einstellungen zu ändern",
"digest.daily.no_topics": "Es gab heute keine aktiven Themen",
"test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
"closing": "Danke!"
}

View File

@@ -0,0 +1,56 @@
{
"invalid-data": "Daten ungültig",
"not-logged-in": "Du bist nicht angemeldet.",
"account-locked": "Dein Account wurde vorübergehend gesperrt.",
"search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registrieren dich!",
"invalid-cid": "Ungültige Kategorie-ID",
"invalid-tid": "Ungültige Themen-ID",
"invalid-pid": "Ungültige Beitrags-ID",
"invalid-uid": "Ungültige Benutzer-ID",
"invalid-username": "Ungültiger Benutzername",
"invalid-email": "Ungültige E-Mail-Adresse",
"invalid-title": "Ungültiger Titel",
"invalid-user-data": "Ungültige Benutzerdaten",
"invalid-password": "Ungültiges Passwort",
"invalid-pagination-value": "Die Nummerierung ist ungültig",
"username-taken": "Der Benutzername ist bereits vergeben",
"email-taken": "Die E-Mail-Adresse ist bereits vergeben",
"email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.",
"username-too-short": "Benutzername ist zu kurz",
"user-banned": "Der Benutzer ist gesperrt",
"no-category": "Die Kategorie existiert nicht",
"no-topic": "Das Thema existiert nicht",
"no-post": "Der Beitrag existiert nicht",
"no-group": "Die Gruppe existiert nicht",
"no-user": "Der Benutzer existiert nicht",
"no-teaser": "Kurztext existiert nicht",
"no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
"no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.",
"category-disabled": "Kategorie ist deaktiviert",
"topic-locked": "Thema ist gesperrt",
"still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
"content-too-short": "Der Beitrag muss mindestens %1 Zeichen enthalten.",
"title-too-short": "Der Titel muss mindestens %1 Zeichen enthalten.",
"title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
"too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen.",
"file-too-big": "Die maximale Dateigröße beträgt %1 kbs",
"cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.",
"already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
"already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
"cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
"invalid-image-type": "Ungültiger Bildtyp",
"group-name-too-short": "Gruppenname zu kurz",
"group-already-exists": "Gruppe existiert bereits",
"group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
"post-already-deleted": "Beitrag wurde bereits gelöscht",
"post-already-restored": "Der Beitrag wurde bereits wiederhergestellt",
"topic-already-deleted": "Das Thema wurde bereits gelöscht",
"topic-already-restored": "Das Thema wurde bereits wiederhergestellt",
"topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert",
"invalid-file": "Datei ungültig",
"uploads-are-disabled": "Uploads sind deaktiviert",
"upload-error": "Upload-Fehler: %1",
"signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!",
"cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
"not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten."
}

View File

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

View File

@@ -2,35 +2,37 @@
"home": "Übersicht",
"search": "Suche",
"buttons.close": "Schließen",
"403.title": "Zugriff Verweigert",
"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": "Internal error.",
"500.message": "Ooops! Looks like something went wrong!",
"register": "Registrierung",
"404.message": "Die angeforderte 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": "Registrieren",
"login": "Login",
"please_log_in": "Bitte einloggen",
"logout": "Logout",
"logout.title": "Du bist ausgeloggt.",
"logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
"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",
"pagination.out_of": "%1 von %2",
"pagination.enter_index": "Seitenzahl eingeben",
"header.admin": "Admin",
"header.recent": "Aktuell",
"header.unread": "Ungelesen",
"header.tags": "Tags",
"header.popular": "Beliebt",
"header.users": "Benutzer",
"header.chats": "Chats",
"header.notifications": "Benachrichtigungen",
"header.search": "Suche",
"header.profile": "Profil",
"notifications.loading": "Benachrichtigungen laden",
"notifications.loading": "Benachrichtigungen werden geladen",
"chats.loading": "Nachrichten werden geladen",
"motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
"motd.get": "Bekommen NodeBB",
"motd.fork": "Fork",
"motd.like": "Gefällt mir",
"motd.follow": "Folgen",
"previouspage": "Vorherige Seite",
"nextpage": "Nächste Seite",
"alert.success": "Erfolg",
@@ -39,14 +41,35 @@
"alert.banned.message": "Du bist gebannt und wirst nun ausgeloggt.",
"alert.unfollow": "Du folgst %1 nicht länger!",
"alert.follow": "Du folgst nun %1!",
"online": "Online",
"users": "Benutzer",
"topics": "Themen",
"posts": "Beiträge",
"views": "Aufrufe",
"posted": "geposted",
"in": "in",
"reputation": "Reputation",
"read_more": "weiterlesen",
"posted_ago_by_guest": "%1 von einem Gast geschrieben",
"posted_ago_by": "%1 von %2 geschrieben",
"posted_ago": "%1 geschrieben",
"posted_in_ago_by_guest": "verfasst in %1 %2 von einem Gast",
"posted_in_ago_by": "Verfasst in %1 %2 von %3",
"posted_in_ago": "Verfasst in %1 %2",
"replied_ago": "antwortete %1",
"user_posted_ago": "%1 schrieb %2",
"guest_posted_ago": "Gast schrieb %1",
"last_edited_by_ago": "zuletzt editiert von %1 %2",
"norecentposts": "Keine aktuellen Beiträge",
"norecenttopics": "Keine aktuellen Themen",
"recentposts": "Aktuelle Beiträge",
"online": "Online",
"recentips": "Zuletzt eingeloggte IPs",
"away": "Abwesend",
"dnd": "Nicht stören",
"invisible": "Unsichtbar",
"offline": "Offline"
"offline": "Offline",
"email": "E-Mail",
"language": "Sprache",
"guest": "Gast",
"guests": "Gäste",
"updated.title": "Forum aktualisiert",
"updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite neuzuladen."
}

View File

@@ -0,0 +1,7 @@
{
"view_group": "Gruppe betrachten",
"details.title": "Gruppendetails",
"details.members": "Mitgliederliste",
"details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
"details.latest_posts": "Aktuelle Beiträge"
}

View File

@@ -1,10 +1,9 @@
{
"login": "Einloggen",
"username": "Benutzername",
"password": "Passwort",
"username": "Nutzername / E-Mail Adresse",
"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!"
"login_successful": "Du hast dich erfolgreich eingeloggt!",
"dont_have_account": "Sie haben noch kein Konto?"
}

View File

@@ -1,6 +1,18 @@
{
"chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
"chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
"chat.chatting_with": "Mit <span id='chat-with-name'></span> chatten",
"chat.placeholder": "Schreibe hier etwas, und drücke Enter zum Absenden.",
"chat.send": "Senden",
"chat.no_active": "Sie haben keine aktiven Chats."
"chat.no_active": "Du hast keine aktiven Chats.",
"chat.user_typing": "%1 tippt gerade ...",
"chat.user_has_messaged_you": "%1 hat dir geschrieben.",
"chat.see_all": "Alle Chats anzeigen",
"chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.",
"chat.recent-chats": "Aktuelle Chats",
"chat.contacts": "Kontakte",
"chat.message-history": "Nachrichtenverlauf",
"chat.pop-out": "Chat als Pop-out anzeigen",
"chat.maximize": "Maximieren",
"composer.user_said_in": "%1 sagte in %2:",
"composer.user_said": "%1 sagte:",
"composer.discard": "Bist du sicher, dass du diesen Post verwerfen möchtest?"
}

View File

@@ -1,10 +1,23 @@
{
"title": "Benachrichtigungen",
"no_notifs": "You have no notifications",
"see_all": "See all Notifications",
"back_to_home": "Zurück zur Startseite",
"no_notifs": "Du hast keine neuen Benachrichtigungen",
"see_all": "Alle Benachrichtigungen ansehen",
"back_to_home": "Zurück zu %1",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun",
"continue_to": "Gehe weiter zu",
"return_to": "Kehre zurück zu"
"outgoing_link_message": "Du verlässt nun %1.",
"continue_to": "Fortfahren zu %1",
"return_to": "Kehre zurück zu %1",
"new_notification": "Neue Benachrichtigung",
"you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.",
"new_message_from": "Neue Nachricht von <strong>%1</strong>",
"upvoted_your_post": "<strong>%1</strong> hat deinen Beitrag positiv bewertet.",
"favourited_your_post": "<strong>%1</strong> favorisiert deinen Beitrag.",
"user_flagged_post": "<strong>%1</strong> hat einen Beitrag markiert.",
"user_posted_to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
"user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
"email-confirmed": "E-Mail bestätigt",
"email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.",
"email-confirm-error": "Es ist ein Fehler aufgetreten ...",
"email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.",
"email-confirm-sent": "Bestätigungs-E-Mail gesendet."
}

View File

@@ -1,12 +1,16 @@
{
"home": "Home",
"unread": "Unread 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.favourites": "%1's Favourite Posts",
"user.settings": "User Settings"
"unread": "Ungelesene Themen",
"popular": "Beliebte Themen",
"recent": "Neueste Themen",
"users": "Registrierte User",
"notifications": "Benachrichtigungen",
"tags": "Topics tagged under \"%1\"",
"user.edit": "Bearbeite \"%1\"",
"user.following": "Nutzer, die %1 folgt",
"user.followers": "Nutzer, die %1 folgen",
"user.posts": "Beiträge von %1",
"user.topics": "Themen von %1",
"user.favourites": "Von %1 favorisierte Beiträge",
"user.settings": "Benutzer-Einstellungen"
}

View File

@@ -3,5 +3,6 @@
"day": "Tag",
"week": "Woche",
"month": "Monat",
"no_recent_topics": "There are no recent topics."
"year": "Jahr",
"no_recent_topics": "Es gibt keine aktuellen Themen."
}

View File

@@ -1,8 +1,8 @@
{
"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.",
"help.username_restrictions": "Einen einmaligen Benutzernamen. %1-%2 Zeichen. Andere Benutzer können dich mit @<span id='yourUsername'>Benutzername</span> anschreiben.",
"help.minimum_password_length": "Dein Passwort muss mindestens %1 Zeichen lang sein.",
"email_address": "E-Mail",
"email_address_placeholder": "E-Mail Adresse hier eingeben",
"username": "Benutzername",

View File

@@ -8,6 +8,7 @@
"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.",
"password_reset_sent": "Passwortzrücksetzung beantragt.",
"enter_email_address": "E-Mail Adresse eingeben",
"password_reset_sent": "Passwortzurücksetzung beantragt.",
"invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
}

View File

@@ -0,0 +1,3 @@
{
"results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)"
}

View File

@@ -0,0 +1,6 @@
{
"success": "Fertig",
"topic-post": "Beitrag erfolgreich erstellt.",
"authentication-successful": "Authentifizierung erfolgreich!",
"settings-saved": "Einstellungen gespeichert!"
}

View File

@@ -0,0 +1,6 @@
{
"no_tag_topics": "Es gibt keine Themen mit diesem Tag.",
"tags": "Tags",
"enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.",
"no_tags": "Es gibt bisher keine Tags."
}

View File

@@ -1,63 +1,95 @@
{
"topic": "Thema",
"topics": "Themen",
"no_topics_found": "Keine passende Themen gefunden.",
"no_posts_found": "No posts found!",
"topic_id": "Topic ID",
"topic_id_placeholder": "Topic ID eingeben",
"no_topics_found": "Keine passenden Themen gefunden.",
"no_posts_found": "Keine Beiträge gefunden!",
"post_is_deleted": "Dieser Beitrag wurde gelöscht!",
"profile": "Profil",
"posted_by": "Geposted von",
"posted_by": "Geschrieben von %1",
"posted_by_guest": "Verfasst von einem Gast",
"chat": "Chat",
"notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.",
"notify_me": "Erhalte eine Benachrichtigung bei neuen Antworten zu diesem Thema.",
"quote": "zitieren",
"reply": "antworten",
"edit": "bearbeiten",
"delete": "löschen",
"move": "Verschieben",
"purge": "bereinigen",
"restore": "Wiederherstellen",
"move": "verschieben",
"fork": "Aufspalten",
"banned": "gesperrt",
"link": "Link",
"share": "Teilen",
"tools": "Tools",
"flag": "Markieren",
"locked": "Gesperrt",
"bookmark_instructions": "Klicke hier um zur letzten Position zurückzukehren oder schließe zum Abbrechen.",
"flag_title": "Diesen Beitrag zur Moderation markieren",
"deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
"thread_tools.title": "Thread Tools",
"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 es sehen.",
"following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
"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": "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.restore": "Restore Topic",
"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.move_all": "Alle 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?",
"thread_tools.purge": "Thema bereinigen",
"thread_tools.purge_confirm": "Sind Sie sicher, dass Sie dieses Thema bereinigen möchten?",
"topic_move_success": "Thema wurde erfolgreich zu %1 verschoben.",
"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_purge_confirm": "Sind Sie sicher, das Sie diesen Beitrag bereinigen möchten?",
"load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "verschieben",
"confirm_move": "Verschieben",
"confirm_fork": "Aufspalten",
"favourite": "Favorit",
"favourite": "Favorisieren",
"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": "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": "Lade Mehr Posts",
"loading_more_posts": "Lade mehr Beiträge",
"move_topic": "Thema verschieben",
"move_topics": "Themen verschieben",
"move_post": "Beitrag verschieben",
"post_moved": "Beitrag wurde verschoben!",
"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_topic_instruction": "Klicke auf die Beiträge, 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": "Enter your topic title here...",
"composer.write": "Write",
"composer.preview": "Preview",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to",
"composer.new_topic": "New Topic"
"composer.title_placeholder": "Hier den Titel des Themas eingeben...",
"composer.discard": "Verwerfen",
"composer.submit": "Absenden",
"composer.replying_to": "Antworte auf %1",
"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",
"more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste",
"more_users": "%1 weitere(r) Nutzer",
"more_guests": "%1 weitere Gäste",
"users_and_others": "%1 and %2 others",
"sort_by": "Sortieren nach",
"oldest_to_newest": "Älteste zuerst",
"newest_to_oldest": "Neuster zuerst",
"most_votes": "Die meisten Stimmen"
}

View File

@@ -1,6 +1,9 @@
{
"title": "Ungelesen",
"no_unread_topics": "Es gibt keine ungelesenen Themen.",
"mark_all_read": "alle als gelesen markieren",
"load_more": "mehr laden"
"load_more": "mehr laden",
"mark_as_read": "Als gelesen markieren",
"selected": "Ausgewählte",
"all": "Alle",
"topics_marked_as_read.success": "Themen als gelesen markiert!"
}

View File

@@ -3,37 +3,63 @@
"offline": "offline",
"username": "Nutzername",
"email": "E-Mail",
"confirm_email": "E-Mail bestätigen",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
"age": "Alter",
"joined": "Beigetreten",
"lastonline": "Zuletzt online",
"profile": "Profile",
"profile": "Profil",
"profile_views": "Profilaufrufe",
"reputation": "Reputation",
"posts": "Posts",
"favourites": "Favoriten",
"followers": "Follower",
"followers": "Folger",
"following": "Folgt",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Geburtstag",
"change_picture": "Ändere Profilbild",
"chat": "Chat",
"follow": "Folgen",
"unfollow": "Nicht mehr folgen",
"profile_update_success": "Profil erfolgreich aktualisiert!",
"change_picture": "Profilbild ändern",
"edit": "Ändern",
"uploaded_picture": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen",
"change_password": "Ändere Passwort",
"current_password": "Aktuelles Passwort",
"change_password": "Passwort ändern",
"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": "Passwörter müssen übereinstimmen!",
"change_password_error_privileges": "Deine Berechtigungen reichen nicht aus, um dieses Passwort zu ändern.",
"change_password_success": "Ihr Passwort wurde aktualisiert!",
"confirm_password": "Passwort wiederholen",
"password": "Passwort",
"username_taken_workaround": "Der gewünschte Benutzername ist bereits vergeben, deshalb haben wir ihn ein wenig verändert. Du bist jetzt unter dem Namen <strong>%1</strong> bekannt.",
"upload_picture": "Bild hochladen",
"upload_a_picture": "Ein Bild hochladen",
"image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb 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.",
"digest_label": "Auszug abonnieren",
"digest_description": "Abonniere E-Mail-Benachrichtigungen für dieses Forum (neue Benachrichtigungen und Themen) nach einem festen Zeitplan.",
"digest_off": "Aus",
"digest_daily": "Täglich",
"digest_weekly": "Wöchentlich",
"digest_monthly": "Monatlich",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden.",
"has_no_posts": "This user didn't post anything yet.",
"follows_no_one": "Dieser User folgt noch niemandem :(",
"has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
"has_no_topics": "Dieser Nutzer hat noch keine Themen gepostet.",
"email_hidden": "E-Mail Adresse versteckt",
"hidden": "versteckt"
"hidden": "versteckt",
"paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verwenden.",
"topics_per_page": "Themen pro Seite",
"posts_per_page": "Beiträge pro Seite",
"notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.",
"browsing": "Browser Einstellungen",
"open_links_in_new_tab": "Externe Links in neuem Tab öffnen?"
}

View File

@@ -1,9 +1,10 @@
{
"latest_users": "neuste Benutzer",
"top_posters": "meiste Beiträge",
"most_reputation": "höhstes Ansehen",
"online": "Online",
"most_reputation": "höchstes Ansehen",
"search": "Suchen",
"enter_username": "Benutzer durchsuchen",
"load_more": "mehr laden"
"load_more": "mehr laden",
"user-not-found": "Benutzer nicht gefunden!",
"users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms."
}

View File

@@ -0,0 +1,7 @@
{
"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?",
"browsing": "browsin'",
"no_replies": "No one has replied to ye message",
"share_this_category": "Share this category"
}

View File

@@ -0,0 +1,20 @@
{
"password-reset-requested": "Password Reset Requested - %1!",
"welcome-to": "Welcome to %1",
"greeting_no_name": "Hello",
"greeting_with_name": "Hello %1",
"welcome.text1": "Thank you for registering with %1!",
"welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
"welcome.cta": "Click here to confirm your email address",
"reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
"reset.text2": "To continue with the password reset, please click on the following link:",
"reset.cta": "Click here to reset your password",
"digest.notifications": "You have some unread notifications from %1:",
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
"digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
"closing": "Thanks!"
}

View File

@@ -0,0 +1,56 @@
{
"invalid-data": "Invalid Data",
"not-logged-in": "You don't seem to be logged in.",
"account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account! Please login or register!",
"invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID",
"invalid-pid": "Invalid Post ID",
"invalid-uid": "Invalid User ID",
"invalid-username": "Invalid Username",
"invalid-email": "Invalid Email",
"invalid-title": "Invalid title!",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
"user-banned": "User banned",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
"no-group": "Group doesn't exist",
"no-user": "User doesn't exist",
"no-teaser": "Teaser doesn't exist",
"no-privileges": "You don't have enough privileges for this action.",
"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
"category-disabled": "Category disabled",
"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",
"cant-vote-self-post": "You cannot vote for your own post",
"already-favourited": "You already favourited this post",
"already-unfavourited": "You already unfavourited this post",
"cant-ban-other-admins": "You can't ban other admins!",
"invalid-image-type": "Invalid image type",
"group-name-too-short": "Group name too short",
"group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed",
"post-already-deleted": "Post already deleted",
"post-already-restored": "Post already restored",
"topic-already-deleted": "Topic already deleted",
"topic-already-restored": "Topic already restored",
"topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"upload-error": "Upload Error : %1",
"signature-too-long": "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
}

View File

@@ -0,0 +1,75 @@
{
"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 Back",
"you_have_successfully_logged_in": "Ye have successfully logged in",
"save_changes": "Save yer Changes",
"close": "Shoot down",
"pagination": "Pagination",
"pagination.out_of": "%1 out of %2",
"pagination.enter_index": "Enter index",
"header.admin": "Captains only",
"header.recent": "Recent",
"header.unread": "Undiscovered",
"header.tags": "Tags",
"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": "You have just been banned, you will now be logged out.",
"alert.unfollow": "Ye be no longer stalkin' %1!",
"alert.follow": "Ye be stalkin' %1",
"online": "Available",
"users": "Users",
"topics": "Topics",
"posts": "Messages",
"views": "Views",
"reputation": "Reputation",
"read_more": "read more",
"posted_ago_by_guest": "posted %1 by Guest",
"posted_ago_by": "posted %1 by %2",
"posted_ago": "posted %1",
"posted_in_ago_by_guest": "posted in %1 %2 by Guest",
"posted_in_ago_by": "posted in %1 %2 by %3",
"posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
"last_edited_by_ago": "last edited by %1 %2",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Messages",
"recentips": "Recently Logged In IPs",
"away": "Out to sea",
"dnd": "Do not Disturb",
"invisible": "Magic usin'",
"offline": "Dead",
"email": "Email",
"language": "Language",
"guest": "Guest",
"guests": "Guests",
"updated.title": "Forum Updated",
"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
}

View File

@@ -0,0 +1,7 @@
{
"view_group": "View Group",
"details.title": "Group Details",
"details.members": "Member List",
"details.has_no_posts": "This group's members have not made any posts.",
"details.latest_posts": "Latest Posts"
}

View File

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

View File

@@ -0,0 +1,9 @@
{
"username": "Yer handle or email",
"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!",
"dont_have_account": "Don't have an account?"
}

View File

@@ -0,0 +1,18 @@
{
"chat.chatting_with": "Letters from <span id=\"chat-with-name\"></span>",
"chat.placeholder": "Type chat message here, press enter to send",
"chat.send": "Send Parrot",
"chat.no_active": "Ye be a lonely sailor.",
"chat.user_typing": "%1 is typing ...",
"chat.user_has_messaged_you": "%1 has messaged you.",
"chat.see_all": "See all Chats",
"chat.no-messages": "Please select a recipient to view chat message history",
"chat.recent-chats": "Recent Chats",
"chat.contacts": "Contacts",
"chat.message-history": "Message History",
"chat.pop-out": "Pop out chat",
"chat.maximize": "Maximize",
"composer.user_said_in": "%1 said in %2:",
"composer.user_said": "%1 said:",
"composer.discard": "Are you sure you wish to discard this post?"
}

View File

@@ -0,0 +1,23 @@
{
"title": "Notifications",
"no_notifs": "You have no new notifications",
"see_all": "Spy wit' ye eye all ye notifications",
"back_to_home": "Back to %1",
"outgoing_link": "Go offshore",
"outgoing_link_message": "You are now leaving %1.",
"continue_to": "Continue to %1",
"return_to": "Return to %1",
"new_notification": "New Notification",
"you_have_unread_notifications": "You have unread notifications.",
"new_message_from": "New message from <strong>%1</strong>",
"upvoted_your_post": "<strong>%1</strong> has upvoted your post.",
"favourited_your_post": "<strong>%1</strong> has favourited your post.",
"user_flagged_post": "<strong>%1</strong> flagged a post.",
"user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
"email-confirm-error": "An error occurred...",
"email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.",
"email-confirm-sent": "Confirmation email sent."
}

View File

@@ -0,0 +1,16 @@
{
"home": "Home",
"unread": "Unread Topics",
"popular": "Popular Topics",
"recent": "Recent Topics",
"users": "Registered Users",
"notifications": "Notifications",
"tags": "Topics tagged under \"%1\"",
"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,8 @@
{
"title": "Recent",
"day": "Day",
"week": "Week",
"month": "Month",
"year": "Year",
"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,3 @@
{
"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)"
}

View File

@@ -0,0 +1,6 @@
{
"success": "Success",
"topic-post": "You have successfully posted.",
"authentication-successful": "Authentication Successful",
"settings-saved": "Settings saved!"
}

View File

@@ -0,0 +1,6 @@
{
"no_tag_topics": "There are no topics with this tag.",
"tags": "Tags",
"enter_tags_here": "Enter tags here. Press enter after each tag.",
"no_tags": "There are no tags yet."
}

View File

@@ -0,0 +1,95 @@
{
"topic": "Topic",
"topic_id": "Topic ID",
"topic_id_placeholder": "Enter topic ID",
"no_topics_found": "No topics found!",
"no_posts_found": "No posts found!",
"post_is_deleted": "This post is deleted!",
"profile": "Profile",
"posted_by": "Posted by %1",
"posted_by_guest": "Posted by Guest",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"purge": "Purge",
"restore": "Restore",
"move": "Move",
"fork": "Fork",
"banned": "banned",
"link": "Link",
"share": "Share",
"tools": "Tools",
"flag": "Flag",
"locked": "Locked",
"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.message": "You will now be receiving notifications when somebody posts to this 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.move_all": "Move All",
"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?",
"thread_tools.purge": "Purge Topic",
"thread_tools.purge_confirm": "Are you sure you want to purge this thread?",
"topic_move_success": "This topic has been successfully moved to %1",
"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_purge_confirm": "Are you sure you want to purge 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.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_topics": "Move Topics",
"move_post": "Move Post",
"post_moved": "Post moved!",
"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!",
"composer.title_placeholder": "Enter your topic title here...",
"composer.discard": "Discard",
"composer.submit": "Submit",
"composer.replying_to": "Replying to %1",
"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",
"more_users_and_guests": "%1 more user(s) and %2 guest(s)",
"more_users": "%1 more user(s)",
"more_guests": "%1 more guest(s)",
"users_and_others": "%1 and %2 others",
"sort_by": "Sort by",
"oldest_to_newest": "Oldest to Newest",
"newest_to_oldest": "Newest to Oldest",
"most_votes": "Most votes"
}

View File

@@ -0,0 +1,9 @@
{
"title": "Unread",
"no_unread_topics": "There be no unread topics.",
"load_more": "Giv'er more",
"mark_as_read": "Mark as Read",
"selected": "Selected",
"all": "All",
"topics_marked_as_read.success": "Topics marked as read!"
}

View File

@@ -0,0 +1,65 @@
{
"banned": "Blackmarked",
"offline": "Asleep at the wheel",
"username": "User Name",
"email": "Email",
"confirm_email": "Confirm Email",
"fullname": "Full Name",
"website": "Website",
"location": "Location",
"age": "Age",
"joined": "Joined",
"lastonline": "Last Online",
"profile": "Profile",
"profile_views": "Profile views",
"reputation": "Reputation",
"favourites": "Favourites",
"followers": "Followers",
"following": "Following",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Birthday",
"chat": "Chat",
"follow": "Follow",
"unfollow": "Unfollow",
"profile_update_success": "Profile has been updated successfully!",
"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 do not have the rights to change this password.",
"change_password_success": "Your password is updated!",
"confirm_password": "Confirm Password",
"password": "Password",
"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
"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",
"digest_label": "Subscribe to Digest",
"digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
"digest_off": "Off",
"digest_daily": "Daily",
"digest_weekly": "Weekly",
"digest_monthly": "Monthly",
"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.",
"browsing": "Browsing Settings",
"open_links_in_new_tab": "Open outgoing links in new tab?"
}

View File

@@ -0,0 +1,10 @@
{
"latest_users": "Land lubbers",
"top_posters": "Top mateys",
"most_reputation": "Most Reputation",
"search": "Search",
"enter_username": "Gimme y'er handle",
"load_more": "Load More",
"user-not-found": "User not found!",
"users-found-search-took": "%1 user(s) found! Search took %2 ms."
}

View File

@@ -1,14 +1,9 @@
{
"new_topic_button": "New Topic",
"no_topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",
"sidebar.recent_replies": "Recent Replies",
"sidebar.active_participants": "Active Participants",
"sidebar.moderators": "Moderators",
"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,26 @@
{
"password-reset-requested": "Password Reset Requested - %1!",
"welcome-to": "Welcome to %1",
"greeting_no_name": "Hello",
"greeting_with_name": "Hello %1",
"welcome.text1": "Thank you for registering with %1!",
"welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
"welcome.cta": "Click here to confirm your email address",
"reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
"reset.text2": "To continue with the password reset, please click on the following link:",
"reset.cta": "Click here to reset your password",
"digest.notifications": "You have some unread notifications from %1:",
"digest.latest_topics": "Latest topics from %1",
"digest.cta": "Click here to visit %1",
"digest.unsub.info": "This digest was sent to you due to your subscription settings.",
"digest.unsub.cta": "Click here to alter those settings",
"digest.daily.no_topics": "There have been no active topics in the past day",
"test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
"closing": "Thanks!"
}

View File

@@ -0,0 +1,79 @@
{
"invalid-data": "Invalid Data",
"not-logged-in": "You don't seem to be logged in.",
"account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account! Please login or register!",
"invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID",
"invalid-pid": "Invalid Post ID",
"invalid-uid": "Invalid User ID",
"invalid-username": "Invalid Username",
"invalid-email": "Invalid Email",
"invalid-title": "Invalid title",
"invalid-user-data": "Invalid User Data",
"invalid-password": "Invalid Password",
"invalid-pagination-value": "Invalid pagination value",
"username-taken": "Username taken",
"email-taken": "Email taken",
"email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.",
"username-too-short": "Username too short",
"user-banned": "User banned",
"no-category": "Category doesn't exist",
"no-topic": "Topic doesn't exist",
"no-post": "Post doesn't exist",
"no-group": "Group doesn't exist",
"no-user": "User doesn't exist",
"no-teaser": "Teaser doesn't exist",
"no-privileges": "You don't have enough privileges for this action.",
"no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
"category-disabled": "Category disabled",
"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.",
"invalid-title": "Invalid title!",
"too-many-posts": "You can only post every %1 seconds.",
"file-too-big": "Maximum allowed file size is %1 kbs",
"cant-vote-self-post": "You cannot vote for your own post",
"already-favourited": "You already favourited this post",
"already-unfavourited": "You already unfavourited this post",
"cant-ban-other-admins": "You can't ban other admins!",
"invalid-image-type": "Invalid image type",
"group-name-too-short": "Group name too short",
"group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed",
"post-already-deleted": "Post already deleted",
"post-already-restored": "Post already restored",
"topic-already-deleted": "Topic already deleted",
"topic-already-restored": "Topic already restored",
"topic-thumbnails-are-disabled": "Topic thumbnails are disabled.",
"invalid-file": "Invalid File",
"uploads-are-disabled": "Uploads are disabled",
"upload-error": "Upload Error : %1",
"signature-too-long" : "Signature can't be longer than %1 characters!",
"cant-chat-with-yourself": "You can't chat with yourself!",
"not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post"
}

View File

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

View File

@@ -11,17 +11,25 @@
"register": "Register",
"login": "Login",
"please_log_in": "Please Log In",
"logout": "Logout",
"logout.title": "You are now logged out.",
"logout.message": "You have successfully logged out of NodeBB",
"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",
"pagination.out_of": "%1 out of %2",
"pagination.enter_index": "Enter index",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.tags": "Tags",
"header.popular": "Popular",
"header.users": "Users",
"header.chats": "Chats",
@@ -33,10 +41,6 @@
"chats.loading": "Loading Chats",
"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
"motd.get": "Get NodeBB",
"motd.fork": "Fork",
"motd.like": "Like",
"motd.follow": "Follow",
"previouspage": "Previous Page",
"nextpage": "Next Page",
@@ -45,18 +49,37 @@
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.banned.message": "You have just been banned, you will now be logged out.",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"online": "Online",
"users": "Users",
"topics": "Topics",
"posts": "Posts",
"views": "Views",
"reputation": "Reputation",
"posted": "posted",
"in": "in",
"read_more": "read more",
"posted_ago_by_guest": "posted %1 by Guest",
"posted_ago_by": "posted %1 by %2",
"posted_ago": "posted %1",
"posted_in_ago_by_guest": "posted in %1 %2 by Guest",
"posted_in_ago_by": "posted in %1 %2 by %3",
"posted_in_ago": "posted in %1 %2",
"replied_ago": "replied %1",
"user_posted_ago": "%1 posted %2",
"guest_posted_ago": "Guest posted %1",
"last_edited_by_ago": "last edited by %1 %2",
"norecentposts": "No Recent Posts",
"norecenttopics": "No Recent Topics",
"recentposts": "Recent Posts",
"recentips": "Recently Logged In IPs",
"online": "Online",
"away": "Away",
@@ -64,5 +87,12 @@
"invisible": "Invisible",
"offline": "Offline",
"privacy": "Privacy"
"email": "Email",
"language": "Language",
"guest": "Guest",
"guests": "Guests",
"updated.title": "Forum Updated",
"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page."
}

View File

@@ -0,0 +1,8 @@
{
"view_group": "View Group",
"details.title": "Group Details",
"details.members": "Member List",
"details.has_no_posts": "This group's members have not made any posts.",
"details.latest_posts": "Latest Posts"
}

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