Compare commits

..

1289 Commits

Author SHA1 Message Date
Julian Lam
15728e90f6 okay, ACTUALLY adding those language strings. 2014-02-03 22:33:59 -05:00
Julian Lam
2b9106b5ce properly added Turkish, Norwegian, and Hungarian 2014-02-03 21:54:41 -05:00
Julian Lam
db00b01c4a updates to pt_BR 2014-02-03 21:41:43 -05:00
Julian Lam
bd4bce0e3f removing stuff that shouldn't have been committed 2014-02-03 21:40:35 -05:00
Julian Lam
a3cf42c072 Hungarian, Norwegian Bokmål, Turkish :) 2014-02-03 20:51:56 -05:00
Julian Lam
25b48c43eb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-03 20:41:58 -05:00
Julian Lam
f7d1738a8e typechecking plugin loading 2014-02-03 20:41:42 -05:00
Baris Soner Usakli
de56107c2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-03 19:24:37 -05:00
Baris Soner Usakli
c7195290c8 added infinite load to user favourites page 2014-02-03 19:24:27 -05:00
Julian Lam
8ad8a60987 0.3.1 2014-02-03 18:15:38 -05:00
Baris Soner Usakli
d53480015b removed dupe route 2014-02-03 16:16:39 -05:00
Baris Soner Usakli
e8dd8db010 helper function to create routes 2014-02-03 15:18:06 -05:00
Baris Soner Usakli
5bed729682 closes #935 2014-02-03 13:23:57 -05:00
Baris Soner Usakli
d0592412e6 added status to template 2014-02-03 12:54:16 -05:00
Baris Soner Usakli
c2652f908a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 15:43:36 -05:00
Baris Soner Usakli
8bba4889d2 moving deleted topics wont cause topic count to go negative 2014-02-02 15:43:33 -05:00
psychobunny
a53c35f071 added back 'body' trigger - to be deprecated in 0.4x 2014-02-02 15:11:33 -05:00
psychobunny
3955ca560f changed hook triggers to window from body 2014-02-02 15:10:44 -05:00
Baris Soner Usakli
3d61a1b15b use map instead of eachSeries 2014-02-02 15:02:27 -05:00
Baris Soner Usakli
6bd79a2fa0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:51:26 -05:00
psychobunny
4abeed3802 client side hooks - action:connected, action:reconnected, action:disconnected 2014-02-02 14:51:16 -05:00
Baris Soner Usakli
60b13cd2f7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:51:10 -05:00
Baris Soner Usakli
d788ad7cdf return offine status if user isnt online 2014-02-02 14:51:02 -05:00
psychobunny
609821029b app.isAdmin available client-side 2014-02-02 14:47:49 -05:00
psychobunny
1c1c5da8f2 isAdmin in header 2014-02-02 14:38:09 -05:00
Baris Soner Usakli
214b74abc9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-02 14:25:38 -05:00
Baris Soner Usakli
148438f7a0 closes #928, closes #930 2014-02-02 14:25:35 -05:00
psychobunny
3f0f2bc956 console.log 2014-02-02 13:53:50 -05:00
psychobunny
ecc1c315cc closes #927 2014-02-02 13:53:23 -05:00
Julian Lam
d1eba104d2 minor tweak to var names 2014-02-02 13:36:47 -05:00
Julian Lam
3d40cb095f Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-02 13:03:02 -05:00
Julian Lam
79af442306 resolved #926 2014-02-02 13:02:52 -05:00
Baris Soner Usakli
0afd4ffdda app.js cleanup 2014-02-02 01:38:46 -05:00
Baris Soner Usakli
94ae80010b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-01 23:14:50 -05:00
Baris Soner Usakli
ca06a24df2 only logged in users can flag 2014-02-01 23:14:44 -05:00
Julian Lam
a942f4086c new german translations, yay! 2014-02-01 22:46:28 -05:00
Julian Lam
53285d70a9 just sneaking tabIndent into NodeBB core -- nothing to see here... 2014-02-01 22:38:52 -05:00
Julian Lam
29de88456b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-02-01 14:59:51 -05:00
Julian Lam
8ac7ccb4f8 calling auth immediately after client connection (apparently, not doing so throws errors on install?) 2014-02-01 14:59:45 -05:00
Baris Soner Usakli
825c568bc1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-02-01 13:41:39 -05:00
Baris Soner Usakli
15479a31c2 unread fix 2014-02-01 13:41:32 -05:00
Julian Lam
d9feaf6abc new tx strings with fallback (+ french translations) 2014-02-01 00:16:25 -05:00
Barış Soner Uşaklı
0517a63068 Update README.md 2014-01-31 23:56:18 -05:00
Baris Soner Usakli
5aa80619c8 default image for anon users 2014-01-31 23:27:54 -05:00
Baris Soner Usakli
0a8db4e4a7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 23:04:09 -05:00
Baris Soner Usakli
23f3111173 fixes alert close 2014-01-31 23:04:01 -05:00
Julian Lam
3c55672f62 seconds != milliseconds *facepalm* 2014-01-31 22:59:49 -05:00
Julian Lam
cb5baec4eb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 22:52:17 -05:00
Julian Lam
d7b44789fc updating stati to use sibling classes 2014-01-31 22:52:11 -05:00
Baris Soner Usakli
cb6116c6cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 22:26:05 -05:00
Baris Soner Usakli
db309ce8a1 closes #661 2014-01-31 22:25:59 -05:00
Julian Lam
c0ec0b2800 casing 2014-01-31 22:20:38 -05:00
Baris Soner Usakli
2cdddd2637 closes #925 2014-01-31 21:27:11 -05:00
Baris Soner Usakli
9e22b7c8fd focus composer text area after drag resize 2014-01-31 21:16:51 -05:00
Baris Soner Usakli
63a3bfd51d after drag focus input in chat, closes #924 2014-01-31 21:13:56 -05:00
Baris Soner Usakli
6c2a74bd38 if user status is offline dont show them in room browsing text 2014-01-31 20:19:59 -05:00
Baris Soner Usakli
27f0c0c910 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 18:17:20 -05:00
Baris Soner Usakli
1eb7ff9ff3 closes #923 2014-01-31 18:17:13 -05:00
Julian Lam
2e407b1f78 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 16:42:56 -05:00
Julian Lam
30f90fee31 running npm install for all plugins and themes as well, because npm (N) 2014-01-31 16:42:34 -05:00
Baris Soner Usakli
384834328c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 16:21:48 -05:00
Baris Soner Usakli
c2746b3bb1 minor tweaks to status 2014-01-31 16:21:41 -05:00
Julian Lam
252af4e8cc fixing bug where new installs exposed the administrators group. 2014-01-31 16:04:33 -05:00
Baris Soner Usakli
feaea6dcea Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 15:47:42 -05:00
Baris Soner Usakli
52962a7e9b dont show invisible users in online users page 2014-01-31 15:47:26 -05:00
Julian Lam
b288edfb6b Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 15:27:28 -05:00
Julian Lam
9e8addee81 fixed #859 2014-01-31 15:27:13 -05:00
Baris Soner Usakli
700876fe58 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 15:13:58 -05:00
Baris Soner Usakli
97e0e48b07 closes #714, closes #824 2014-01-31 15:13:52 -05:00
Julian Lam
c9bb65133a Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 13:17:48 -05:00
Julian Lam
37f7d1d08a resolved issue #913 2014-01-31 13:17:28 -05:00
Baris Soner Usakli
1fa88b9475 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 13:01:06 -05:00
Baris Soner Usakli
22bc3e9571 added statuses into dropdown 2014-01-31 13:00:59 -05:00
Julian Lam
7fe5c33048 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 12:27:52 -05:00
Julian Lam
29c6b789a2 tweak to prev commit 2014-01-31 12:25:53 -05:00
Baris Soner Usakli
6fbed193f7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 12:23:05 -05:00
Baris Soner Usakli
aa856e2f5c closes #847 2014-01-31 12:22:59 -05:00
Julian Lam
77cacda0fa Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 12:19:35 -05:00
Julian Lam
748055ac52 hiding development block from ACP if not in dev mode 2014-01-31 12:19:30 -05:00
Baris Soner Usakli
c122492470 added back the template if 2014-01-31 12:11:49 -05:00
Baris Soner Usakli
14b2fd050e Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-31 11:59:42 -05:00
Baris Soner Usakli
bdd4bb0003 closes #920' 2014-01-31 11:59:35 -05:00
Julian Lam
59d1a90820 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-31 11:48:15 -05:00
Julian Lam
1b794f00bd slovak updates 2014-01-31 11:48:05 -05:00
psychobunny
5b3862f58e updated links on ACP home page, part of #461 2014-01-31 11:47:11 -05:00
psychobunny
4647b88071 added optional forum terms of use to ACP, closes #775 2014-01-31 11:38:23 -05:00
Baris Soner Usakli
267e7a3d5b fixed redirect 2014-01-31 11:37:24 -05:00
Baris Soner Usakli
c042d4253b added popular rss feed 2014-01-31 11:16:23 -05:00
psychobunny
347d402f48 closes #752 2014-01-31 11:07:47 -05:00
psychobunny
e91ab5c660 closes #917 2014-01-31 10:56:43 -05:00
Julian Lam
4d23b46916 latest transifex changes 2014-01-31 10:17:21 -05:00
Barış Soner Uşaklı
f95725369a Merge pull request #922 from mattijle/master
err.message is undefined use err instead
2014-01-31 06:57:16 -08:00
Julian Lam
c89bc3b9d5 fixing missing template requirement on /reset 2014-01-31 09:03:06 -05:00
Matti Leppänen
b71607ea7d err.message is undefined use err instead 2014-01-31 15:19:45 +02:00
Julian Lam
bb316bd949 new transifex strings 2014-01-30 21:42:52 -05:00
Julian Lam
eff99ffabe fixed #915 2014-01-30 21:05:59 -05:00
Julian Lam
63437571b8 fixing header favicon to look for type as well 2014-01-30 20:51:14 -05:00
Julian Lam
ec61d62c63 recommit to Transifex formatting 2014-01-30 20:22:25 -05:00
Julian Lam
3f1582e053 Transifex config file 2014-01-30 20:19:57 -05:00
Julian Lam
a137fb76ed Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-30 20:14:33 -05:00
Julian Lam
a940915e48 re-encoding some pt_BR language files in UTF-8 2014-01-30 20:14:01 -05:00
Baris Soner Usakli
ab2b0e6560 fixed direct loading of popular page 2014-01-30 19:52:32 -05:00
Baris Soner Usakli
817546c6cf Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 19:46:32 -05:00
Baris Soner Usakli
a86ddc9934 closes #726 2014-01-30 19:46:25 -05:00
Julian Lam
39842b5ea9 Merge pull request #919 from tedr56/master
Fr translation - Flag
2014-01-30 16:16:55 -08:00
TedVJ
18051435e5 Fr translation - Flag 2014-01-31 01:12:36 +01:00
Baris Soner Usakli
45e2f7f7f5 removed console.log 2014-01-30 17:44:47 -05:00
Baris Soner Usakli
36ae568349 #656 2014-01-30 17:41:54 -05:00
Baris Soner Usakli
e48014ba61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 16:44:45 -05:00
Baris Soner Usakli
0f5b3ae859 added img-responsive to images in chat messages 2014-01-30 16:44:36 -05:00
Julian Lam
55b67ed735 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	src/routes/api.js
2014-01-30 15:40:44 -05:00
Julian Lam
0376e3d574 renamed language directories to ICU standard, upgrade script, no longer promoting english at top of list in languages tab, en now en_GB, encompasses Canadian and English English 2014-01-30 15:39:51 -05:00
Baris Soner Usakli
9fbd5ed596 removed unused function 2014-01-30 15:21:00 -05:00
psychobunny
23c711947b added support for !array.length 2014-01-30 14:33:03 -05:00
psychobunny
0cca8e0bcf closes #783, support for array.length 2014-01-30 14:26:55 -05:00
Baris Soner Usakli
efa45ad907 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 14:04:27 -05:00
Baris Soner Usakli
89e554b333 closes #906 2014-01-30 14:04:20 -05:00
psychobunny
112a9cb532 closes #689 2014-01-30 13:51:28 -05:00
psychobunny
68105c6289 send environment state to client 2014-01-30 13:37:30 -05:00
psychobunny
303a32dce6 closes #855 - app.alert strings are now passed through translator so we can finally start getting rid of the remainder of hardcoded strings 2014-01-30 13:31:05 -05:00
Baris Soner Usakli
fa910bac20 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 13:16:52 -05:00
Baris Soner Usakli
1291f31f3c closes #897 2014-01-30 13:16:45 -05:00
psychobunny
c253760737 converted filter:posts.custom_profile_info to accept an array instead of building a string for better themability. closes #886 2014-01-30 13:06:35 -05:00
Baris Soner Usakli
9afef92763 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-30 12:56:02 -05:00
Baris Soner Usakli
8607ea9a84 notifications fix 2014-01-30 12:55:55 -05:00
psychobunny
c673cf84c2 themes able to call upon hooks as well. closes #830 2014-01-30 11:57:55 -05:00
psychobunny
92725ee3df Merge pull request #874 from BitBangersCode/templates-fix
Add custom templates to /api/get_templates_listing
2014-01-30 08:38:16 -08:00
Baris Soner Usakli
a7d9944cc1 icons on register login in mobile menu 2014-01-30 11:33:58 -05:00
psychobunny
24d2ac270c changed notifications code to jq - prevents crashes if notification element does not exist 2014-01-30 11:06:29 -05:00
Julian Lam
d8eec5dd2e fixed missing og:title on category view 2014-01-30 10:12:45 -05:00
Julian Lam
b954668636 browser title, #911 2014-01-30 10:02:19 -05:00
Julian Lam
de751ed623 fixed #900 - api calls hopefully no longer cached 2014-01-30 09:31:53 -05:00
Julian Lam
fb2b54b314 refactored meta and link tag generation to template (yay frontend processing!)
cache busters now always added in template, instead of throughout code
2014-01-30 09:20:43 -05:00
Baris Soner Usakli
1a55f9217d turn off click events to prevent multiple calls' 2014-01-29 20:51:59 -05:00
Baris Soner Usakli
06ca569554 closes #909 2014-01-29 15:49:36 -05:00
Baris Soner Usakli
d0702f663b disable scroll events on ajaxify' 2014-01-29 15:19:54 -05:00
Baris Soner Usakli
3c273f4a66 error checks for missing after 2014-01-29 15:08:14 -05:00
Baris Soner Usakli
6a78221261 closes #903 2014-01-29 15:02:34 -05:00
Julian Lam
fe8156793a Merge branch 'master' of github.com:henrock/NodeBB into henrock-master 2014-01-29 14:41:20 -05:00
Julian Lam
3f876fec80 added ajaxify.start and ajaxify.end client-side hooks 2014-01-29 14:29:45 -05:00
Julian Lam
024cfc17c5 tweak 2014-01-29 12:58:52 -05:00
Julian Lam
95d671281a moved port 80 and 443 warnings to its own conditional 2014-01-29 12:42:33 -05:00
Julian Lam
38ee3fd5a3 don't bother firing hooks received by js unless a listener exists 2014-01-29 12:28:21 -05:00
Henrik Jerlenius
52ee5096af fixed translation on recent replies feed 2014-01-29 12:48:50 +01:00
Henrik Jerlenius
4f4fef3832 fixed another 'Fork' ;) 2014-01-29 12:34:47 +01:00
Henrik Jerlenius
ec72818988 updated all swedish translations 2014-01-29 12:25:54 +01:00
Henrik Jerlenius
8fad39725b updated all swedish translations 2014-01-29 12:23:10 +01:00
Henrik Jerlenius
b3718a1605 changed language info 2014-01-29 08:43:59 +01:00
Henrik Jerlenius
8784961e1e First commit on swedish translation 2014-01-29 08:34:23 +01:00
Julian Lam
133188f14c introducing cache buster to plugin CSS and loaded scripts 2014-01-28 22:06:27 -05:00
Baris Soner Usakli
cccaf642a6 closes #898 2014-01-28 20:10:53 -05:00
Baris Soner Usakli
38886f6b58 making a socket call will set lastonline 2014-01-28 16:14:56 -05:00
Baris Soner Usakli
ed401de169 closes #896 2014-01-27 20:21:14 -05:00
Baris Soner Usakli
5759b1b1a2 closes #857 2014-01-27 19:58:03 -05:00
Baris Soner Usakli
f68b692ce4 closes #863 2014-01-27 17:15:17 -05:00
Baris Soner Usakli
c06320e28b closes #870 2014-01-27 15:41:08 -05:00
Baris Soner Usakli
c0184ba350 blocked 2014-01-27 14:57:25 -05:00
Julian Lam
4e659cfeee Merge pull request #892 from tedr56/master
Fr translation update
2014-01-27 11:07:01 -08:00
Julian Lam
50c4a707e5 removing empty login.js 2014-01-27 13:40:35 -05:00
TedVJ
1cef31e47b Fr translation update 2014-01-27 19:38:43 +01:00
Julian Lam
744b6517bf issue #891 2014-01-27 13:37:31 -05:00
Julian Lam
4ae8824faf tweaks and formatting 2014-01-27 13:04:03 -05:00
Julian Lam
7edf041747 Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master 2014-01-27 12:52:52 -05:00
Julian Lam
db62e10673 upgrade scripts for sso plugins 2014-01-27 12:50:50 -05:00
Julian Lam
f51d525d9c errant semicolon 2014-01-27 12:29:48 -05:00
Julian Lam
d924d01677 timeago fix for brasilian portugueso 2014-01-27 12:28:36 -05:00
Julian Lam
aa81b25fe6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-27 12:20:24 -05:00
Julian Lam
2d72956591 updated language files to match english pages.json 2014-01-27 12:20:11 -05:00
Julian Lam
fac55160fa new translation strings for pages, proper unicode handling in parseFragment 2014-01-27 12:19:25 -05:00
Julian Lam
e69f5fff3b added "pages" translation file to languages 2014-01-27 11:39:00 -05:00
Julian Lam
5482146bc4 simplified a conditional 2014-01-27 11:12:54 -05:00
Julian Lam
208fe454bb Merge pull request #890 from tedr56/master
Fr Translation Update
2014-01-27 08:05:42 -08:00
TedVJ
9a876f7003 Fr Translation Update 2014-01-27 16:21:54 +01:00
Julian Lam
6514504ddd fixed #889 2014-01-27 09:09:55 -05:00
Matti Leppänen
98c4b08f15 Merge remote-tracking branch 'upstream/master' 2014-01-27 16:07:08 +02:00
Leonardo Galani
90352cd858 adding brazilian portuguese language translations 2014-01-27 07:53:04 -05:00
Baris Soner Usakli
71ccd0854d fixes notification header icon 2014-01-27 01:58:16 -05:00
Baris Soner Usakli
f874059fe9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-27 01:48:50 -05:00
Baris Soner Usakli
9cb232c198 added header tooltips 2014-01-27 01:48:43 -05:00
Julian Lam
8e1137b5dd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-26 23:35:11 -05:00
Julian Lam
ef39c128c2 Removing Google Plus integration from core - adios! 2014-01-26 23:34:54 -05:00
Baris Soner Usakli
c18788fbc9 crash fix if topic has no posts, and check confirm obj 2014-01-26 23:20:37 -05:00
Baris Soner Usakli
31a57cf0dd closes #885 2014-01-26 22:36:06 -05:00
Baris Soner Usakli
8e4236a3a9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 22:23:15 -05:00
Baris Soner Usakli
e4d60b7a55 Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master 2014-01-26 22:14:04 -05:00
psychobunny
f8be072b99 chats - isNew flag, and sending in userData.uid now 2014-01-26 22:10:12 -05:00
Baris Soner Usakli
d54e2fba9e closes #810 2014-01-26 21:32:53 -05:00
Matti Leppänen
4f495e2b46 quote gets added to the active composer instead of starting a new one. 2014-01-27 02:51:49 +02:00
Baris Soner Usakli
fb8fbb2372 removed console.log 2014-01-26 18:40:28 -05:00
Baris Soner Usakli
c0e818afc6 closes #854 2014-01-26 18:36:07 -05:00
Baris Soner Usakli
26673d3ada delegated events in admin categories 2014-01-26 17:55:51 -05:00
Julian Lam
7e3c46db61 Removing Twitter SSO - toodles! 2014-01-26 17:42:48 -05:00
Julian Lam
e7eab83d8f removing facebook SSO from core 2014-01-26 17:26:56 -05:00
Baris Soner Usakli
25c4648e2e load 20 in recent 2014-01-26 17:25:18 -05:00
Baris Soner Usakli
8770284661 removed console.log 2014-01-26 17:23:28 -05:00
Baris Soner Usakli
8d0b880e5a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 17:17:49 -05:00
Baris Soner Usakli
25442a89ca closes #878 2014-01-26 17:17:34 -05:00
psychobunny
6ab08e91a2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:52:07 -05:00
psychobunny
45a5b88824 added filter:messaging.parse hook 2014-01-26 16:50:59 -05:00
Baris Soner Usakli
fac2cd9464 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-26 16:23:39 -05:00
Baris Soner Usakli
da626a4035 more fixes 2014-01-26 16:23:37 -05:00
Julian Lam
0c71707fb5 fixed #877 2014-01-26 16:22:50 -05:00
Julian Lam
0869765e2b Merge remote-tracking branch 'origin/master' 2014-01-26 16:01:36 -05:00
Julian Lam
22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool 2014-01-26 15:59:22 -05:00
Baris Soner Usakli
2560704839 recent unread cleanup 2014-01-26 14:56:16 -05:00
Baris Soner Usakli
c6d48f477c fixes recent topic post notification 2014-01-26 14:03:33 -05:00
Julian Lam
96b2a15290 user registration now no longer sends a welcome email if no emailers are present 2014-01-26 13:21:23 -05:00
Julian Lam
d7d4290099 resolved #879 2014-01-26 13:10:39 -05:00
Baris Soner Usakli
14e68bc9e2 dropup for bottom post bar 2014-01-26 01:34:40 -05:00
Baris Soner Usakli
bd0b5f4cdb more error checks in thread move 2014-01-25 22:43:49 -05:00
Baris Soner Usakli
810095d287 fixed infinite loading on categories 2014-01-25 22:30:48 -05:00
Baris Soner Usakli
2988230b07 some more fixes, cant quote and see deleted messages 2014-01-25 22:19:51 -05:00
Julian Lam
5fde1eb3e7 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-25 22:00:13 -05:00
Julian Lam
d42beda3da added page selection if you click on the pipe 2014-01-25 21:44:47 -05:00
Baris Soner Usakli
bf81159558 fixes a pagination bug 2014-01-25 21:35:09 -05:00
Baris Soner Usakli
dcefad1427 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-25 21:26:03 -05:00
Baris Soner Usakli
1afd7ae332 trim pagination numberS 2014-01-25 21:25:56 -05:00
Julian Lam
197b7f2a6c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-25 20:42:37 -05:00
Julian Lam
a240fc81ce fixed #869 2014-01-25 20:42:29 -05:00
Baris Soner Usakli
6628db89af added saerch array 2014-01-25 20:36:55 -05:00
Baris Soner Usakli
b4ea8e58fa removed check for no topics in category, you should be able to go into empty categories 2014-01-25 20:08:02 -05:00
Baris Soner Usakli
6ff11c5243 check for number 2014-01-25 19:57:25 -05:00
Baris Soner Usakli
75f178636b more fixes 2014-01-25 19:50:50 -05:00
Baris Soner Usakli
1084523c92 lots of pagination work, query params, ajaxify to pids 2014-01-25 19:19:25 -05:00
MrWaffle
869f9e0d86 Add custom templates to /api/get_templates_listing 2014-01-25 23:13:51 +01:00
Baris Soner Usakli
8744013013 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-25 16:42:06 -05:00
Baris Soner Usakli
2e786cc4d1 closes #873, removed global translator, templates and server objects 2014-01-25 16:39:27 -05:00
Baris Soner Usakli
393bb7245c closes #866 2014-01-25 12:05:48 -05:00
Baris Soner Usakli
d718eca935 fixes global meta leak, and categories meta require, #873 2014-01-25 01:34:56 -05:00
psychobunny
46e29dfb2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-25 00:05:45 -05:00
psychobunny
d67ae5c2be changing undetected minified JS file warning to info message instead 2014-01-25 00:05:41 -05:00
Baris Soner Usakli
b23960e8d7 fixes to category pagination 2014-01-24 23:05:59 -05:00
Baris Soner Usakli
ef6fd35e85 lots of cleanup, moved pagination to requirejs module 2014-01-24 22:26:11 -05:00
Baris Soner Usakli
aa73a10fc4 added pagination to vanilla topic template 2014-01-24 21:01:28 -05:00
Baris Soner Usakli
0580d0c8a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 20:51:02 -05:00
Baris Soner Usakli
5f0c6e508d some cleanup 2014-01-24 20:50:55 -05:00
Baris Soner Usakli
606367701f pagination on posts 2014-01-24 20:00:56 -05:00
Julian Lam
1cce38cae6 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 19:55:34 -05:00
Julian Lam
d5534cf545 fixing upgrade script on edge builds 2014-01-24 19:55:19 -05:00
psychobunny
0a749023cb fixing if statements inside a @first / @last block 2014-01-24 14:19:24 -05:00
Baris Soner Usakli
8d007e7029 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination 2014-01-24 13:27:45 -05:00
Baris Soner Usakli
cf39c66017 some pagination work 2014-01-24 13:27:36 -05:00
Julian Lam
e09132350d re-adding conditional to hide quote/reply block if no write perm 2014-01-24 13:26:50 -05:00
psychobunny
503e59b12b clean up conditionals only at the very end of parsing 2014-01-24 13:25:33 -05:00
Julian Lam
26848641cd restoring post/quote buttons pending template system fix for IFs 2014-01-24 13:11:30 -05:00
Julian Lam
a3fe390810 reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry! 2014-01-24 13:09:44 -05:00
Julian Lam
be86f84ef8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 12:29:28 -05:00
Julian Lam
ab85ef6b7b fixed issue where back button stopped ajaxifying internally. 2014-01-24 12:29:11 -05:00
Baris Soner Usakli
620ff65cbe Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-24 12:11:29 -05:00
Baris Soner Usakli
7f23f848fe fix for mismatch between favourite count and number of people in favourited seT 2014-01-24 12:11:22 -05:00
Julian Lam
459d5ddccd fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load 2014-01-24 10:09:28 -05:00
Julian Lam
43808c01ec reduced the number of 'ajaxify.go' calls to one, in /src 2014-01-24 10:00:57 -05:00
Julian Lam
b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack. 2014-01-24 09:48:41 -05:00
Julian Lam
ef450edfea Revert "possible fix to #840", please see #867
This reverts commit 1d666bf7f0.
2014-01-24 08:48:40 -05:00
Julian Lam
dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-24 08:18:02 -05:00
Barış Soner Uşaklı
c91ae0c4c4 Update categories.js 2014-01-24 00:42:34 -05:00
Baris Soner Usakli
f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing 2014-01-23 23:31:10 -05:00
Baris Soner Usakli
1d666bf7f0 possible fix to #840 2014-01-23 22:45:11 -05:00
Baris Soner Usakli
3ea7d4d217 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-23 21:35:33 -05:00
Baris Soner Usakli
3793ddc2e8 fixes user tooltips on infinit load 2014-01-23 21:35:25 -05:00
Julian Lam
3fa9e3f31b Merge pull request #862 from akhoury/master
removed use_proxy config, cleaned-up some comments
2014-01-23 18:23:33 -08:00
akhoury
dcc6ec797e removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820 2014-01-23 20:35:53 -05:00
Baris Soner Usakli
b0ef974590 lots of cleanup and refactor 2014-01-23 19:01:30 -05:00
Baris Soner Usakli
f62c82c797 send app to action:app.load 2014-01-23 17:08:33 -05:00
Baris Soner Usakli
6da12d1a39 and for andrew 2014-01-23 16:37:11 -05:00
Baris Soner Usakli
bc1cde38da added getObjectKeys for julian :) 2014-01-23 16:34:54 -05:00
Julian Lam
2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-23 16:20:46 -05:00
Julian Lam
d380f69310 support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden 2014-01-23 16:19:10 -05:00
Baris Soner Usakli
824c5072e8 topics should be marked read correctly if you are already in it 2014-01-23 15:46:39 -05:00
Julian Lam
a0e9e52e70 adding xregexp to ACP header 2014-01-23 15:16:30 -05:00
Baris Soner Usakli
47c32738a6 removed tests from acp 2014-01-23 12:51:54 -05:00
Julian Lam
f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
2014-01-23 08:15:16 -05:00
Matti Leppänen
4cfd970d5f Added Finnish language translation 2014-01-23 13:10:07 +02:00
Aziz Khoury
659817b4f1 Update comment 2014-01-23 01:07:10 -05:00
Aziz Khoury
7e3d8d65f5 Update login.js 2014-01-23 01:04:01 -05:00
Baris Soner Usakli
b717c74a81 closes #856 2014-01-22 23:58:21 -05:00
Baris Soner Usakli
042174290f removed console.log 2014-01-22 20:35:57 -05:00
Baris Soner Usakli
8aebb7f84d Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-22 19:48:01 -05:00
Baris Soner Usakli
b325212182 crash fix for admin verify email, temp fix 2014-01-22 19:47:55 -05:00
Julian Lam
1e99945515 Merge branch 'yangwao-master' 2014-01-22 19:37:06 -05:00
Julian Lam
f0e47e43bc fb and tw strings for traditional chinese 2014-01-22 19:34:06 -05:00
wao
7b150ab407 added Slovak language translation 2014-01-23 00:45:47 +01:00
Baris Soner Usakli
044382047d removed commented out section 2014-01-22 17:29:23 -05:00
Baris Soner Usakli
46fb6377ee fixed topic reply if title was 255, better notif text in unread and recent,removed console.log 2014-01-22 17:23:20 -05:00
Baris Soner Usakli
79803d2b3d Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy 2014-01-22 15:28:09 -05:00
MrWaffle
d63ced8a5c Move to client side 2014-01-22 21:08:43 +01:00
MrWaffle
03d92eb5cd Thought I'd refactor this for you guys 2014-01-22 20:29:37 +01:00
MrWaffle
da317b5a85 async wooo 2014-01-22 20:27:42 +01:00
MrWaffle
c0e2e9d011 Remove log 2014-01-22 20:21:56 +01:00
MrWaffle
69b54337bb Limit to 5 users 2014-01-22 20:21:12 +01:00
Baris Soner Usakli
b945dfc71d closes #843 2014-01-22 14:04:04 -05:00
MrWaffle
b887b76c29 Implement favourite tooltip to show who favourited a post 2014-01-22 19:46:34 +01:00
Baris Soner Usakli
45d2affdfb closes #833 2014-01-22 12:46:37 -05:00
Baris Soner Usakli
baa74958c5 can set image class for categories 2014-01-22 11:46:50 -05:00
Baris Soner Usakli
eac6b23811 closes #841 2014-01-22 11:08:52 -05:00
Barış Soner Uşaklı
c709fae251 Merge pull request #828 from BitBangersCode/admin-group-fix
Admin group fix
2014-01-22 08:03:01 -08:00
Richie Preece
d959aad41f Changed to bcrypt.js 2014-01-21 20:56:12 -07:00
Julian Lam
4c01fc4c0e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 22:30:25 -05:00
Julian Lam
7db231ca54 traditional chinese language pack - 很好? 2014-01-21 22:30:03 -05:00
Baris Soner Usakli
18075b85c7 winston.error 2014-01-21 20:57:02 -05:00
Baris Soner Usakli
e997c63480 return error 2014-01-21 20:47:03 -05:00
Baris Soner Usakli
9393a39452 fixes translation in recent 2014-01-21 19:07:03 -05:00
Julian Lam
74786a32ac 0.3.0 2014-01-21 16:58:06 -05:00
Julian Lam
308110db49 adding lavender to dependencies 2014-01-21 16:57:28 -05:00
psychobunny
3b4f0a8f4e updating motd for incoming theme 2014-01-21 16:51:04 -05:00
Josh
4c211b7110 Fixed tabbing/spacing 2014-01-21 21:15:34 +00:00
Josh Rickers
21f6b10023 fixed indenting 2014-01-21 20:44:41 +00:00
Josh Rickers
f9e6fab3ea Fixed line spacing/tabbing 2014-01-21 20:40:55 +00:00
Julian Lam
53a1474785 second pass for #773, blocked for now 2014-01-21 15:29:34 -05:00
Julian Lam
bafc8caaf5 first pass at #773 2014-01-21 15:17:41 -05:00
Josh Rickers
55b0270b34 Merge branch 'master' into admin-group-fix 2014-01-21 19:59:21 +00:00
Josh Rickers
4c36083354 Added yourid so it can be used in groups.js 2014-01-21 19:39:06 +00:00
Josh Rickers
a91e464787 updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:41 +00:00
Josh Rickers
bac1a5ec3e updated groups to stop you from removing yourself from the admin group 2014-01-21 19:37:01 +00:00
Julian Lam
397861c3cc Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 14:01:38 -05:00
Julian Lam
0020f278a5 stopped using unnecessary regex in user search 2014-01-21 13:59:03 -05:00
Baris Soner Usakli
56c789ed61 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-21 12:35:41 -05:00
Baris Soner Usakli
aa2978976c notif fix 2014-01-21 12:35:34 -05:00
Julian Lam
73d9d6e1d3 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-21 12:33:22 -05:00
Julian Lam
92706a6550 fixed #826 2014-01-21 12:33:11 -05:00
Baris Soner Usakli
74ccfd1e4d moved islatin out too 2014-01-21 12:02:46 -05:00
Baris Soner Usakli
8f8ea4de92 slug fix 2014-01-21 12:01:09 -05:00
Baris Soner Usakli
104ec7de6e last poster is visible, slugify check for latin #777 2014-01-21 11:48:56 -05:00
Baris Soner Usakli
a1149b8f8d notif unread class 2014-01-21 10:38:20 -05:00
Baris Soner Usakli
f107803550 fix 2014-01-21 10:07:24 -05:00
Baris Soner Usakli
039f02456d if user is in the topic when a new post comes in mark the topic read 2014-01-21 10:06:13 -05:00
Baris Soner Usakli
9400e5bcc9 motd 2014-01-21 01:27:39 -05:00
Baris Soner Usakli
4cae491438 last one for the night 2014-01-21 00:47:33 -05:00
Baris Soner Usakli
93534832b9 small 2014-01-21 00:21:59 -05:00
Baris Soner Usakli
9cd2b36c97 minor fix to topic.tpl 2014-01-21 00:16:35 -05:00
Baris Soner Usakli
a0b80e4061 shouldnt be in template 2014-01-20 23:25:27 -05:00
Baris Soner Usakli
ccc62a202b dont go to top on search icon click 2014-01-20 21:41:04 -05:00
Baris Soner Usakli
0a1d45b0b9 default panle 2014-01-20 21:33:13 -05:00
Baris Soner Usakli
56fcae1cb2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:29:22 -05:00
Baris Soner Usakli
7c16a8be31 recent reply fix 2014-01-20 21:29:14 -05:00
Julian Lam
cc236c1f72 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 21:15:55 -05:00
Julian Lam
39d9dd76dc removed preview button from ACP/themes 2014-01-20 21:15:52 -05:00
Baris Soner Usakli
f282dcd677 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 21:00:21 -05:00
Baris Soner Usakli
55d4a5fe3a template fixes closes #825 2014-01-20 21:00:10 -05:00
Julian Lam
affa51856b closed #801 pending explanation 2014-01-20 19:05:19 -05:00
Baris Soner Usakli
12a5b6b4c6 body margin for composer 2014-01-20 16:50:39 -05:00
Aziz Khoury
da647d105b removing couple of console.log 2014-01-20 16:34:12 -05:00
Aziz Khoury
74f23497dc password should be passed to action hook, and it was being ovewritten 2014-01-20 16:29:46 -05:00
Aziz Khoury
4fad334e18 Merge remote-tracking branch 'upstream/master' 2014-01-20 16:21:57 -05:00
Barış Soner Uşaklı
94f38d0622 Merge pull request #822 from BitBangersCode/admin-fix
Confirmation when removing user from a group
2014-01-20 13:18:52 -08:00
Josh
f7a290d0b3 removed function
removed function that did not work
2014-01-20 20:55:53 +00:00
Josh
a86ff15f7b Removed code for yourid
removed code that will give the current user id in a var called yourid
2014-01-20 20:54:19 +00:00
Baris Soner Usakli
030cfbffa4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 15:35:17 -05:00
Baris Soner Usakli
ed1c276739 only drag chat modal from header 2014-01-20 15:35:10 -05:00
Josh
f14ad11dd0 add remove user from group confirmation
Added confirmation request when removing user from a group.
2014-01-20 20:28:46 +00:00
Julian Lam
9c9fadb5a1 upping mentions minver 2014-01-20 14:53:09 -05:00
Julian Lam
663aff4b24 fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL 2014-01-20 13:41:46 -05:00
Aziz Khoury
a13c321de8 added "trust proxy" config option with default to true 2014-01-20 13:23:40 -05:00
Aziz Khoury
ba85ffb292 Merge remote-tracking branch 'upstream/master' 2014-01-20 13:22:16 -05:00
Julian Lam
2654a8e86a added cache buster to ACP theme 2014-01-20 13:22:03 -05:00
Julian Lam
cef54fbf6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 13:17:17 -05:00
Julian Lam
f9e8178d25 fixed timeagago for zh_cn 2014-01-20 13:16:23 -05:00
Baris Soner Usakli
71888adb09 closes #815, closes #816 2014-01-20 12:56:09 -05:00
Aziz Khoury
f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well 2014-01-20 12:41:35 -05:00
Julian Lam
e2960e3ed6 Merge pull request #819 from BitBangersCode/mongo-fix
Add callback to mongo.searchRemove, fixes infinite schema update
2014-01-20 08:28:23 -08:00
MrWaffle
e4d8ddcf1b Add callback to mongo.removeSearch, fixes infinite schema update 2014-01-20 17:21:45 +01:00
Julian Lam
d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
	public/templates/composer.tpl
2014-01-20 11:15:16 -05:00
Julian Lam
e1a9fe9691 Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
	src/webserver.js
2014-01-20 11:08:41 -05:00
Julian Lam
33c84d4684 Merge branch 'akhoury-master' 2014-01-20 11:04:10 -05:00
Julian Lam
95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary 2014-01-20 11:04:06 -05:00
Julian Lam
938b78786e closed #818 - case insensitive user search 2014-01-20 10:55:29 -05:00
Julian Lam
895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master 2014-01-20 10:48:06 -05:00
Julian Lam
cf69b9fcb3 fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap 2014-01-20 10:46:49 -05:00
akhoury
58525bd09c f'in arabs 2014-01-20 01:39:11 -05:00
Baris Soner Usakli
5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:44:16 -05:00
Baris Soner Usakli
84aa1ab527 motd string and class 2014-01-19 22:44:13 -05:00
Julian Lam
2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 22:29:36 -05:00
Julian Lam
ee6ac77f8b new upgrade directive 2014-01-19 22:29:28 -05:00
Julian Lam
b6aa31b245 removed references to Reds user search 2014-01-19 22:11:34 -05:00
Julian Lam
e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins 2014-01-19 22:07:29 -05:00
Baris Soner Usakli
f7aa808fa7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:06:33 -05:00
Baris Soner Usakli
050ab738e4 fixed drop area top 2014-01-19 22:06:25 -05:00
Julian Lam
483ad87c1d first pass 2014-01-19 21:46:39 -05:00
Julian Lam
cfe46f38ee Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:35:23 -05:00
Baris Soner Usakli
d1ccc692ae pull right dropdowns 2014-01-19 18:35:18 -05:00
Julian Lam
0c0ae6560a re: #808 -- removed upgrade directives for v0.2.x branch, and added minSchemaDate check so that if you try to upgrade without doing all upgrades in a previous branch, it will abort. 2014-01-19 18:34:11 -05:00
Baris Soner Usakli
c9f43a60b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 18:18:55 -05:00
Baris Soner Usakli
3d30c0bd87 tmp fix for nested if 2014-01-19 18:18:47 -05:00
Julian Lam
3624717d84 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:02:07 -05:00
Julian Lam
07b286650c adding cache buster to ACP, removing bootstrap css in ACP 2014-01-19 18:02:03 -05:00
Baris Soner Usakli
4273fc4d23 added check for valid field 2014-01-19 18:02:01 -05:00
Baris Soner Usakli
32adbc8c77 close modal on error 2014-01-19 17:49:16 -05:00
Baris Soner Usakli
7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 17:28:15 -05:00
Baris Soner Usakli
189e69284e fixes for post privileges 2014-01-19 17:28:08 -05:00
Julian Lam
0ccb8a77ba Merge pull request #811 from BitBangersCode/alternate_title_fix
Only alternate title when not focused
2014-01-19 14:25:15 -08:00
Julian Lam
e8d6df22cb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 17:18:18 -05:00
Julian Lam
5861630dec - removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
2014-01-19 17:17:40 -05:00
MrWaffle
c1fea52a93 Only alternate title when not focused 2014-01-19 22:38:44 +01:00
Baris Soner Usakli
1980e945da fixed admin page active sockets 2014-01-19 14:42:47 -05:00
Baris Soner Usakli
16a42619b5 closes #809 2014-01-19 14:27:07 -05:00
Baris Soner Usakli
54c05f9027 title is no longer centered in composer 2014-01-19 12:59:45 -05:00
Baris Soner Usakli
9879f645f6 added check for undefined, null empty string 2014-01-18 23:28:13 -05:00
Baris Soner Usakli
bbac361670 fixed crash if empty topic was loaded without ajaxify 2014-01-18 23:18:58 -05:00
Baris Soner Usakli
84cbcc5a97 closes #798 2014-01-18 22:23:25 -05:00
Baris Soner Usakli
8c1c844007 closes #806 2014-01-18 21:57:06 -05:00
Baris Soner Usakli
1dddd77ae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 19:15:17 -05:00
Baris Soner Usakli
72447c9b9c grouped post buttons in dropdowns 2014-01-18 19:15:07 -05:00
psychobunny
025e1293fa removed deprecated cssSrc, replaced with optional bootswatchCSS 2014-01-18 16:13:01 -05:00
psychobunny
df53d836e5 fixed dependency check for cerulean 2014-01-18 16:01:14 -05:00
Baris Soner Usakli
e83e7870ce Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 16:00:12 -05:00
Baris Soner Usakli
d8e14acbbf closes #799 2014-01-18 16:00:05 -05:00
psychobunny
4ef5ffe7fd upped minver of cerulean to 0.0.12 - please upgrade 2014-01-18 15:59:39 -05:00
Baris Soner Usakli
5072b9c8a5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 15:35:58 -05:00
Baris Soner Usakli
959e6e83ea closes #796 2014-01-18 15:35:51 -05:00
psychobunny
1528c70a30 deleted BS css files from core - please update vanilla 2014-01-18 15:12:49 -05:00
psychobunny
6af143900a upped minver of vanilla to 0.0.13 - please update 2014-01-18 15:12:35 -05:00
Dr.Z
43cc975ff7 Add Simplized Chinese.
Just modified the .json in language folder and some .tpl in the
templates folder(except the admin folder). Noted there are a lot of
front-end related code in the .js files, I’ll move on to them.
2014-01-19 01:04:12 +08:00
Julian Lam
0397773b22 Merge pull request #802 from tedr56/master
Fr translation Updates
2014-01-18 06:30:26 -08:00
MrWaffle
5ed77b032e Fix plugin CSS files on Windows 2014-01-18 14:58:20 +01:00
TedVJ
b5ed7b8b72 Fr translation fixes 2014-01-18 14:47:41 +01:00
TedVJ
a2165403a7 Fr translation for fd92d7b02a 2014-01-18 14:33:25 +01:00
Baris Soner Usakli
324bec41c4 chain 2014-01-17 20:10:09 -05:00
Baris Soner Usakli
0db6423c26 closes #792, fixes multiple composers 2014-01-17 19:42:20 -05:00
Baris Soner Usakli
dc27638ca8 sitemap fix 2014-01-17 18:58:38 -05:00
Baris Soner Usakli
c00bd0b8d0 oops fixed 2014-01-17 18:14:00 -05:00
Baris Soner Usakli
22e1b0f22e check result for null 2014-01-17 18:12:56 -05:00
Baris Soner Usakli
e6a9f5a704 error check 2014-01-17 18:11:36 -05:00
Baris Soner Usakli
fd92d7b02a can mark topic unread for all 2014-01-17 17:26:07 -05:00
Baris Soner Usakli
25b50323fa markdown text in composer 2014-01-17 17:07:09 -05:00
Baris Soner Usakli
7752d24b21 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-17 16:30:12 -05:00
Baris Soner Usakli
00c6fc17ac removed console.log 2014-01-17 16:27:17 -05:00
psychobunny
4e5dfbc1c9 find .post-row instead of any li 2014-01-17 16:26:32 -05:00
Baris Soner Usakli
24ceb0f083 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-17 16:16:07 -05:00
Baris Soner Usakli
48eb6a3f22 composer changeS 2014-01-17 16:16:00 -05:00
Julian Lam
123f92ca1e fixed #711 2014-01-17 15:36:10 -05:00
Julian Lam
917dfe74e6 removing console log and removing a bit of code that would cause infinite loader to take 2.5s extra each round :P 2014-01-17 14:52:43 -05:00
Julian Lam
d8c4609ee0 fixed #649 - Once you hit the end, infinite loader will stop for good. If infinite loader is active when the browser hits the bottom, updateHeader will not assume 100%. 2014-01-17 14:47:18 -05:00
Julian Lam
962955f06a fixed bug with search (getTopicsByTids became error-first) 2014-01-17 14:29:46 -05:00
Julian Lam
51abf60b3a Merge branch 'socketAL-fix' 2014-01-17 14:15:56 -05:00
Julian Lam
48c22567c2 fixed #791 2014-01-17 14:13:23 -05:00
Julian Lam
17f98804c6 commented out "remember me" checkbox because it actually does nothing... :x 2014-01-17 14:08:12 -05:00
Baris Soner Usakli
e884ff1f59 modules fixes 2014-01-17 12:55:38 -05:00
Baris Soner Usakli
a34775a6c2 meta fixes 2014-01-17 12:52:04 -05:00
Baris Soner Usakli
c0712583f2 fixed category sockets 2014-01-17 12:49:21 -05:00
Baris Soner Usakli
d72926a5bb Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-17 12:42:26 -05:00
Baris Soner Usakli
a802dc4b68 admin.js socket fixes 2014-01-17 12:42:19 -05:00
Julian Lam
af6eb5359e Merge branch 'master' into socketAL-fix
Conflicts:
	public/language/cs/global.json
	public/language/fr/global.json
	src/routes/api.js
2014-01-17 12:10:49 -05:00
Julian Lam
727ad4b651 added cache buster to nodebb.min.js even if it has not changed 2014-01-17 12:07:33 -05:00
Julian Lam
5e695d3222 fixed incorrect language string used in fb button in default motd 2014-01-17 12:02:12 -05:00
Julian Lam
55c296a229 Merge pull request #790 from tedr56/master
Fr Translation Update
2014-01-17 08:33:15 -08:00
TedVJ
27762c2ab9 Fr Translation update #3 2014-01-17 16:41:04 +01:00
TedVJ
f63ab0faeb Fr Translation update #2 2014-01-17 16:35:32 +01:00
TedVJ
cfbbc238f6 Fr Translation Update 2014-01-17 16:16:51 +01:00
Julian Lam
2b32ede4d8 fixed czech welcome message 2014-01-17 09:09:43 -05:00
Julian Lam
04da0447b5 fixed global:motd.get in es 2014-01-17 08:58:53 -05:00
Julian Lam
45ce0566e7 added translation to default MOTD 2014-01-17 08:58:46 -05:00
Julian Lam
14b31cf4c8 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:58:40 -05:00
Julian Lam
c1c9438220 patching translator to ignore non-js files 2014-01-17 08:58:33 -05:00
Julian Lam
13ae2e9401 fixed global:motd.get in es 2014-01-17 08:54:34 -05:00
Julian Lam
beec96416f added translation to default MOTD 2014-01-17 08:53:23 -05:00
Julian Lam
253913f8d9 hiding fork button on xs/sm devices (default motd) 2014-01-17 08:12:30 -05:00
Julian Lam
7e9d344487 patching translator to ignore non-js files 2014-01-17 08:04:23 -05:00
Baris Soner Usakli
cfaa6556d6 pass err 2014-01-17 00:07:02 -05:00
Baris Soner Usakli
b062af2c4b fixed user pwd reset 2014-01-16 23:46:08 -05:00
Baris Soner Usakli
b7f0c90bf7 more fixes 2014-01-16 22:44:34 -05:00
Baris Soner Usakli
b3816b98a1 more post fixes 2014-01-16 22:06:23 -05:00
Baris Soner Usakli
9e6f7fa960 reset 2014-01-16 21:19:57 -05:00
Baris Soner Usakli
31d353ab0e more fixes 2014-01-16 21:19:29 -05:00
Barış Soner Uşaklı
3a57c3b6d8 removed disabled attrib from reset button 2014-01-16 20:59:01 -05:00
Baris Soner Usakli
8740cc0fc7 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:53:42 -05:00
Baris Soner Usakli
ae76bb3928 lots of err first fixeS 2014-01-16 20:53:32 -05:00
Julian Lam
111776d878 notifications socket callbacks 2014-01-16 20:29:11 -05:00
Julian Lam
e95da77fe8 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 20:14:19 -05:00
Julian Lam
bc48ba874d fixed module.js callback format 2014-01-16 20:14:09 -05:00
Baris Soner Usakli
ced37044ca Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:59:03 -05:00
Baris Soner Usakli
426d3e871f more fixes 2014-01-16 19:58:57 -05:00
Julian Lam
cbb630fd6b fixed categories.js socket callbacks 2014-01-16 19:57:28 -05:00
Julian Lam
8041bee9fd Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 19:10:30 -05:00
Baris Soner Usakli
6da6baa213 more crash fixes to socketS 2014-01-16 18:50:45 -05:00
Baris Soner Usakli
ba8e98520c added data checks to user calls 2014-01-16 18:18:42 -05:00
Baris Soner Usakli
ddb9a4a60e fixed user load more 2014-01-16 18:12:31 -05:00
Baris Soner Usakli
4366c11ec0 users.js fix 2014-01-16 18:10:38 -05:00
Baris Soner Usakli
39b631a3a8 more fixes 2014-01-16 18:06:19 -05:00
Baris Soner Usakli
e061978bd5 more fixes 2014-01-16 17:52:46 -05:00
Baris Soner Usakli
2515ba9455 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 17:32:45 -05:00
Baris Soner Usakli
afe97233aa more fixes 2014-01-16 17:32:33 -05:00
Julian Lam
8b1ed1297b linting 2014-01-16 17:25:14 -05:00
Julian Lam
765402a2a0 fixed ACP online count 2014-01-16 17:22:11 -05:00
Baris Soner Usakli
e5c8caf5ff more fixes 2014-01-16 17:15:00 -05:00
Baris Soner Usakli
1ec21c2bfd metatitle 2014-01-16 17:11:27 -05:00
Baris Soner Usakli
7470c1bbd9 more fixes 2014-01-16 17:07:34 -05:00
Baris Soner Usakli
2893693d17 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:50:48 -05:00
Baris Soner Usakli
0b132cadcf user fixes 2014-01-16 16:50:41 -05:00
Julian Lam
3177fdfa74 partially fixed acp active users 2014-01-16 16:26:47 -05:00
Julian Lam
08f97efcd4 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix 2014-01-16 16:11:30 -05:00
Julian Lam
71f1f7137a fixes 2014-01-16 16:11:23 -05:00
Baris Soner Usakli
220b40ff9c topics.js 2014-01-16 16:10:23 -05:00
Julian Lam
97eff9c8a1 fixing index call and meta.js 2014-01-16 15:57:13 -05:00
Baris Soner Usakli
adf4a5c407 user.js changes 2014-01-16 15:46:37 -05:00
Julian Lam
42d6880ac4 migrating posts to new socketAL format 2014-01-16 15:34:43 -05:00
Julian Lam
35aa06c230 migrating notifications to new socketAL format 2014-01-16 15:31:57 -05:00
Julian Lam
be3284e05e migrating modules.js to new socketAL style 2014-01-16 15:28:21 -05:00
Baris Soner Usakli
8bb24fa034 fixed update header 2014-01-16 15:25:04 -05:00
Julian Lam
2235dbd2a0 migrating meta.js to new socketAL format 2014-01-16 15:19:07 -05:00
Baris Soner Usakli
f6bd52014e fixed conflict 2014-01-16 15:18:13 -05:00
Baris Soner Usakli
accde93fff removed api: from server 2014-01-16 15:17:25 -05:00
Julian Lam
69a9570186 migrated catefories.js to new socketAL format 2014-01-16 15:16:12 -05:00
Julian Lam
c215e61541 fixed up admin.js 2014-01-16 15:13:22 -05:00
Baris Soner Usakli
67799eac95 removed api: from client side socket calls 2014-01-16 15:10:37 -05:00
Julian Lam
4184574164 WIP admin.js socket underping 2014-01-16 15:00:49 -05:00
Baris Soner Usakli
d234dbdca2 first set of changes 2014-01-16 14:57:03 -05:00
Julian Lam
dfd2df99e6 removed "mark all as read" language strings and removed button from notifications page -- fixes #785 2014-01-16 14:25:46 -05:00
Julian Lam
b32887f2ce Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-16 12:35:18 -05:00
Julian Lam
a48a7acd51 fixing issue where after a user changed their username, the new name was not reindexed by Reds 2014-01-16 12:34:48 -05:00
Baris Soner Usakli
8f9f5b2849 added user images to profile button in mobile view 2014-01-16 02:37:55 -05:00
Baris Soner Usakli
72fd78ac26 fixed indent in chat.tpl 2014-01-15 19:22:11 -05:00
Baris Soner Usakli
16aeb2d09d added fb to motd default 2014-01-15 18:58:31 -05:00
Baris Soner Usakli
2d87ba534c can paste images directly from clipboard 2014-01-15 18:44:09 -05:00
Baris Soner Usakli
e671f0343e closes #782 2014-01-15 17:36:06 -05:00
Baris Soner Usakli
e16c3f3f80 added try catch to socket calls 2014-01-15 13:23:53 -05:00
Baris Soner Usakli
b303fdcfd7 removed inline css 2014-01-15 12:58:43 -05:00
MrWaffle
b78dc3eca8 Chat now supports markdown 2014-01-15 18:20:05 +01:00
Baris Soner Usakli
1bf3d33765 prevent clicks on autocomplete to scroll window to the top 2014-01-15 03:22:49 -05:00
Baris Soner Usakli
cd4cb240c8 upload file icon in composer was visible even when uploads were disabled 2014-01-15 02:33:20 -05:00
Baris Soner Usakli
82bc0aec6b Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-14 19:23:33 -05:00
Baris Soner Usakli
c94da47ae8 added profile func, shorter getRecentReplies 2014-01-14 19:23:27 -05:00
Julian Lam
7de540dc74 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 19:01:53 -05:00
Julian Lam
b3f23d41d3 fixed #744 2014-01-14 19:01:12 -05:00
Baris Soner Usakli
466c02a886 removed teaser_text 2014-01-14 19:00:18 -05:00
Baris Soner Usakli
265d1f6331 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-14 18:05:02 -05:00
Baris Soner Usakli
dcf47f558e limit search in db 2014-01-14 18:04:54 -05:00
Julian Lam
facacc65aa Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 17:03:13 -05:00
Julian Lam
442c543d27 fixed #776 2014-01-14 17:02:54 -05:00
psychobunny
8c5a458798 fixed 403 redirect from logged out /admin 2014-01-14 14:33:43 -05:00
psychobunny
98d42b0ade moving social sharing parsing code from server side to client side & cleaned up templates 2014-01-14 14:30:14 -05:00
Baris Soner Usakli
75850bd315 closes #772 2014-01-14 13:10:31 -05:00
Julian Lam
5efc1e5de8 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 12:34:54 -05:00
Julian Lam
d48e749d54 removed confirmation prompt in upgrade option in nodebb executable 2014-01-14 12:34:29 -05:00
psychobunny
6f129d9c68 allow password fields to be saved in ACP 2014-01-14 12:25:27 -05:00
Julian Lam
acc390f6ef added timeago locales, fixed timeago template error in ACP. 2014-01-14 11:13:58 -05:00
Julian Lam
c8a514aa37 updated new timeago path 2014-01-14 11:03:49 -05:00
Julian Lam
0ea09972b4 fixed issue where outgoing links warning page would intercept clicks to the search button in the headerbar (thanks @dove)
- linted some files
2014-01-14 10:31:21 -05:00
Julian Lam
3837841882 removed automatic "visible-xs-inline" on links added by static-page or -42 2014-01-14 10:13:12 -05:00
Julian Lam
a05d2d44e9 fixed cerulean version 2014-01-14 09:31:24 -05:00
Julian Lam
ebcf8eb03b upping cerulean minver 2014-01-14 09:28:44 -05:00
Julian Lam
bc407ee59c fixing topic moving 2014-01-14 09:19:33 -05:00
Julian Lam
a32aee60c2 reversing accidentally committed code to socket.io/index 2014-01-14 08:54:42 -05:00
Julian Lam
0266c5516c Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-14 08:53:25 -05:00
Julian Lam
32470efb22 fixing upgrade script console.log and missing sessionData for topic moving 2014-01-14 08:53:10 -05:00
Baris Soner Usakli
bbcc2312db better redis info parser from node-redis 2014-01-14 08:20:41 -05:00
Baris Soner Usakli
07085f1ff2 fixed sockettopics.post 2014-01-14 07:39:01 -05:00
Baris Soner Usakli
0198024db0 parseInt uid 2014-01-14 07:36:01 -05:00
Baris Soner Usakli
bc835f59d4 mongo getListRange fix 2014-01-13 20:46:43 -05:00
Baris Soner Usakli
a97ee201d8 makes recent unread and category pages a lot faster, added logging when a user changes their username 2014-01-13 18:02:06 -05:00
Baris Soner Usakli
c07bf466b2 added back search limiting 2014-01-13 15:45:50 -05:00
Baris Soner Usakli
3475ed59c8 removed reds from install.js 2014-01-13 15:38:27 -05:00
Baris Soner Usakli
93292e701d added error check to setOnEmpty 2014-01-13 14:28:05 -05:00
Baris Soner Usakli
243cb5af61 fixed mobile search link 2014-01-13 14:19:08 -05:00
Baris Soner Usakli
26274bd75a closes #767 2014-01-13 13:50:33 -05:00
Julian Lam
97cc6cde67 closed #733 - after upgrade script, all users will be in a system "registered users" group 2014-01-13 13:32:49 -05:00
Julian Lam
619fe74fc0 moved groups admin socket calls into admin file instead of standalone groups file 2014-01-13 12:09:13 -05:00
Julian Lam
4453d055ea linted socket/admin.js 2014-01-13 12:05:13 -05:00
Julian Lam
aa689a7a29 fixed active users socket calls in ACP 2014-01-13 12:01:42 -05:00
Julian Lam
3fb44d7693 who needs recursion, bitch?
- enhanced socket abs layer so that a method call of infinite depth is supported (theoretically).
2014-01-13 11:40:08 -05:00
Julian Lam
5db9ff11d5 linting and adding missing require'd dep 2014-01-13 11:23:21 -05:00
Julian Lam
5e538ef051 fixed #710 - added labels to the top bar (update vanilla!)
merged "loading" and "more_posts" in topic i18n data, changed behaviour so that on mobile, only the spinner shows.
2014-01-13 10:47:48 -05:00
Julian Lam
2078fa25f8 added classname to chat dropdown if there are no chats 2014-01-13 10:11:23 -05:00
Julian Lam
b86ae3f7f0 fixed #756 - sequestering Notifications and Chat DOM functions in their module, and not in footer 2014-01-13 10:06:00 -05:00
Julian Lam
e36f92b18e closed #764 2014-01-13 09:50:29 -05:00
Barış Soner Uşaklı
dea43ee008 Merge pull request #763 from bdharrington7/master
added login register selectors to close the nav when clicked
2014-01-12 15:22:07 -08:00
Baris Soner Usakli
6053a8caa5 search icon should be hidden-xs 2014-01-12 18:21:00 -05:00
bdharrington7
bf96903d6e removed submenu for login / register in guest menu options 2014-01-12 15:10:10 -08:00
bdharrington7
e8c7860f12 Merge branch 'master' of https://github.com/bdharrington7/NodeBB 2014-01-12 14:15:14 -08:00
bdharrington7
2b63b2c52a fixed bug that hid the login menu option 2014-01-12 13:45:27 -08:00
bdharrington7
0ad1f1576b Fix: login / register collapses on click, Search unavailable if not allowed 2014-01-12 13:45:27 -08:00
Baris Soner Usakli
5febb3dc23 clicking the pagination block no longer sends page to top 2014-01-12 13:45:27 -08:00
Baris Soner Usakli
a885444740 fixes toggle_mod_tools undefined error 2014-01-12 13:45:27 -08:00
bdharrington7
d60151a6cc excluding .DS_Store 2014-01-12 13:45:26 -08:00
bdharrington7
3ccc11d53c fixed bug that hid the login menu option 2014-01-12 13:36:15 -08:00
bdharrington7
cfda0a93c4 Fix: login / register collapses on click, Search unavailable if not allowed 2014-01-12 13:12:13 -08:00
Baris Soner Usakli
92894277a9 clicking the pagination block no longer sends page to top 2014-01-12 15:52:44 -05:00
Baris Soner Usakli
1580226757 fixes toggle_mod_tools undefined error 2014-01-12 15:37:33 -05:00
bdharrington7
ffa1f1703d Merge branch 'master' of https://github.com/bdharrington7/NodeBB 2014-01-12 12:32:48 -08:00
bdharrington7
99dc989c39 excluding .DS_Store 2014-01-12 12:32:18 -08:00
Julian Lam
8d71098a0f fixed detection for admin client-side scripts 2014-01-12 14:38:54 -05:00
Lumir Mrkva
bd0d09584b added czech translation 2014-01-12 19:24:02 +01:00
Baris Soner Usakli
1e59147d64 closes #760 2014-01-12 00:04:02 -05:00
Julian Lam
3da96faa12 fixed email exists error... weird. 2014-01-11 22:14:20 -05:00
Julian Lam
98e4257939 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-11 22:09:30 -05:00
Julian Lam
eb974ec1d8 fixing user register socket calls 2014-01-11 22:09:23 -05:00
Baris Soner Usakli
30ad852492 closes #758 2014-01-11 17:48:24 -05:00
Baris Soner Usakli
8bc0096b00 dont closed composer if callback isn't called 2014-01-11 16:15:50 -05:00
Baris Soner Usakli
f73c81d6c3 closes #755 2014-01-11 15:33:58 -05:00
Julian Lam
ee963e0c2a moved reconnected socket call to SocketsMeta 2014-01-11 14:03:50 -05:00
Julian Lam
99af660e48 adding missing modules.json files in languages 2014-01-11 14:03:28 -05:00
Julian Lam
6d300e1110 updated chat i18n strings to use new modules.json file, added said files to language dirs 2014-01-11 12:12:04 -05:00
Julian Lam
b61614f87b fixed htmlentities in italian translation 2014-01-11 11:52:43 -05:00
Francesco
fd83769bde added italian language files 2014-01-11 11:44:08 -05:00
Julian Lam
eabe3ada6f upped mentions minver to 0.2 2014-01-11 11:29:05 -05:00
Julian Lam
3264658269 Merge remote-tracking branch 'origin/master' into socketAL 2014-01-11 11:26:52 -05:00
Julian Lam
73cbde4098 removed websockets.js wooo 2014-01-11 11:26:44 -05:00
bdharrington7
e5fc0819b4 excluding .DS_Store 2014-01-10 20:22:17 -08:00
psychobunny
97ec312c72 console.log 2014-01-10 17:08:01 -05:00
psychobunny
05edfdc9c1 templates.js - if custom theme is missing a template, render default template 2014-01-10 17:06:56 -05:00
Julian Lam
067a7a544b Merge remote-tracking branch 'origin/master' into socketAL 2014-01-10 16:09:04 -05:00
Julian Lam
a150691b5e that's the last of it!! :D 2014-01-10 16:00:03 -05:00
Baris Soner Usakli
b8d858ccca Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-10 14:12:04 -05:00
Baris Soner Usakli
ee1ac1b2c3 fixes post move 2014-01-10 14:11:55 -05:00
Julian Lam
a2329980c8 Merge remote-tracking branch 'origin/master' into socketAL 2014-01-10 13:28:11 -05:00
Julian Lam
ea8aa3fff2 admin stuff, removed deprecated install templates, blah blah 2014-01-10 13:27:50 -05:00
Julian Lam
c5d8a5a6b2 thread tools (phew!) -- sessionData is getting larger :P 2014-01-10 10:50:05 -05:00
psychobunny
ef01717562 allow themes to set path to a frameworkCSS so you can include a customized BS or another framework altogether 2014-01-10 03:08:46 -05:00
Julian Lam
8dd8412ae3 so far so good... user, meta, notifications, categories 2014-01-09 22:47:07 -05:00
Julian Lam
5a589c885a Merge remote-tracking branch 'origin/master' into socketAL 2014-01-09 21:27:57 -05:00
Julian Lam
dfa9f203e6 crashing a lot less now, heh 2014-01-09 21:27:50 -05:00
Julian Lam
adb8f80b86 interim commit - removed calls to websockets.js, beginning porting to namespaced files 2014-01-09 20:13:17 -05:00
Baris Soner Usakli
92ca739002 center on load 2014-01-09 20:04:50 -05:00
Baris Soner Usakli
c19d3e8063 closes #738 2014-01-09 19:34:51 -05:00
Baris Soner Usakli
30624d4ad8 tabbified the admin settings page 2014-01-09 17:51:26 -05:00
Baris Soner Usakli
9c60182da4 closes #749 2014-01-09 15:58:31 -05:00
psychobunny
1caaa8c20a re-initialize translator when language is changed in ACP 2014-01-09 14:21:58 -05:00
Julian Lam
c2a1cd94d0 addressing issue for #728 where existing NodeBBs don't have a defaultLang set 2014-01-09 13:42:35 -05:00
Julian Lam
df4c6ca1c8 integrating client side translator into new languages tab in ACP 2014-01-09 13:37:25 -05:00
Julian Lam
cd6af45afb added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
2014-01-09 13:29:41 -05:00
Julian Lam
119079ace5 added missing link, numRecentReplies, and class values to category.create... fixed #754, fixed #751 2014-01-09 11:50:24 -05:00
Baris Soner Usakli
dff10045da removed my console.logs as usual 2014-01-08 22:55:33 -05:00
Baris Soner Usakli
dda4586a2f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 22:54:03 -05:00
Baris Soner Usakli
dabd2f29af closes #747 2014-01-08 22:53:55 -05:00
Julian Lam
029b91a323 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-08 21:50:26 -05:00
Julian Lam
ac04e04016 fixed #719 2014-01-08 21:50:19 -05:00
Baris Soner Usakli
3a6db04be5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 21:47:16 -05:00
Baris Soner Usakli
eb65c5ad1b reindex user name after change, #745 2014-01-08 21:47:09 -05:00
Julian Lam
c2c1632c0e Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-08 21:25:11 -05:00
Julian Lam
2495b5b89b refactored group category permissions, removed getCategoryAccess method call 2014-01-08 21:25:01 -05:00
Baris Soner Usakli
176ac54cdf closes #745 2014-01-08 21:19:32 -05:00
Baris Soner Usakli
e07c848da7 closes #737 2014-01-08 16:30:27 -05:00
Baris Soner Usakli
6b8f7dba4f Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-08 16:11:59 -05:00
Baris Soner Usakli
825e4cca5a closes #744 2014-01-08 16:11:47 -05:00
Julian Lam
ab16b1184d fixing issue where nojs mode of a private category would show the category topics, even if the requesting user was not allowed inside 2014-01-08 15:09:24 -05:00
Julian Lam
127261100e fixed #698 - ajaxify.go will now cancel any active API requests when it is called 2014-01-08 14:53:32 -05:00
Baris Soner Usakli
67f8af7e3e #744 2014-01-08 06:19:22 -05:00
Baris Soner Usakli
d2c0aa9949 fixed auto complete for insertion in the middle, 6am commits FTW 2014-01-08 06:15:48 -05:00
Baris Soner Usakli
0d26b21a2c prevent double res.send/json if error occurs in profile image upload 2014-01-08 02:59:14 -05:00
Baris Soner Usakli
2d384a68d2 oops extra $ 2014-01-08 02:39:50 -05:00
Baris Soner Usakli
414eaea413 username mention auto completes 2014-01-08 02:39:06 -05:00
Baris Soner Usakli
a4ae9c70df closes #742, closes #741 2014-01-07 17:30:29 -05:00
Baris Soner Usakli
6f94acd0f2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-07 15:00:12 -05:00
Baris Soner Usakli
8e6606fb5a move post 2014-01-07 15:00:05 -05:00
psychobunny
cfa4256df5 admin - download emails.csv, thanks to @akhoury for the gist 2014-01-07 14:01:32 -05:00
Baris Soner Usakli
4912b8a893 fixed language regex 2014-01-07 00:14:20 -05:00
Baris Soner Usakli
f75e55aa11 fixed path 2014-01-06 23:45:31 -05:00
Baris Soner Usakli
88305b3350 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-06 23:44:39 -05:00
Baris Soner Usakli
d6333a3969 fixed plugin css files for relative path 2014-01-06 23:44:32 -05:00
Julian Lam
538bb3e871 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-06 19:24:24 -05:00
Julian Lam
649d8af36b updated help doc for executable 2014-01-06 19:24:09 -05:00
Baris Soner Usakli
faf5ea2122 check if we have edit permission on the pids that we want to move 2014-01-06 19:20:01 -05:00
Baris Soner Usakli
291aa872c4 cant fork if not logged in 2014-01-06 19:12:34 -05:00
Baris Soner Usakli
2e575bb2d8 closes #524 2014-01-06 17:37:42 -05:00
psychobunny
7c8c735e05 i8n - if translation not present, use a readable key 2014-01-06 02:49:41 -05:00
psychobunny
b21a202142 my data went on a date and found out we have out of date data 2014-01-06 00:14:33 -05:00
psychobunny
032d46465d closes #551 2014-01-05 23:57:43 -05:00
psychobunny
6f120ff34a closes #732, custom robots.txt 2014-01-05 23:19:52 -05:00
psychobunny
0e5358a701 closes #698 2014-01-05 23:09:28 -05:00
psychobunny
7be16eab06 closes #722 2014-01-05 23:02:19 -05:00
Baris Soner Usakli
58580bd866 closes #716, also moved chat to its own template 2014-01-05 22:09:13 -05:00
Baris Soner Usakli
be316ff602 fixed mongo listRemoveAll 2014-01-05 20:44:06 -05:00
Baris Soner Usakli
dfc8aacbae closes #735, removed create collection calls 2014-01-05 19:08:36 -05:00
Baris Soner Usakli
8c04e8e56c Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-05 18:30:21 -05:00
Baris Soner Usakli
cd6750a38d minor fix 2014-01-05 18:30:14 -05:00
Julian Lam
71681b936f fixed #731 2014-01-05 18:27:13 -05:00
Julian Lam
4923c79496 tweaking upgrade script 2014-01-05 14:17:37 -05:00
Julian Lam
3f0f5a09a0 new upgrade directive to re-slugify usernames again 2014-01-05 14:07:26 -05:00
Julian Lam
f7b7af3004 so xregexp uses double backslashes... 2014-01-05 13:59:02 -05:00
Julian Lam
5a88a5ca60 allow underscores in slugs 2014-01-05 12:55:39 -05:00
Julian Lam
6567819294 commented out "language" directive in executable (didn't do anything anyway), and added "upgrade" directive 2014-01-05 12:15:23 -05:00
Baris Soner Usakli
e69611fa22 if email didnt change dont update and dont log 2014-01-05 01:53:01 -05:00
Baris Soner Usakli
48074ea93b redirect if category is accessed directly 2014-01-05 01:39:33 -05:00
Baris Soner Usakli
4dc8f2c2e1 closes #665 2014-01-05 01:26:23 -05:00
psychobunny
b131dacf39 set external link for categories 2014-01-05 01:16:39 -05:00
Baris Soner Usakli
32f17d5e13 closes #729 2014-01-05 00:39:15 -05:00
Julian Lam
bee3c06a07 clicking 'quote' now shows the quoted username before said quote 2014-01-04 21:41:22 -05:00
Julian Lam
8aa227b052 added note re: third-party emailer pluginses 2014-01-04 21:09:21 -05:00
Julian Lam
eaf25c4a5f removing SMTP settings fields in email settings portion of settings tab in ACP 2014-01-04 21:07:10 -05:00
Julian Lam
f90beca449 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-04 20:09:03 -05:00
Julian Lam
724dcb88c0 added translator integration to emailer 2014-01-04 20:08:59 -05:00
Baris Soner Usakli
e5ec5242c6 added relative_path 2014-01-04 19:35:02 -05:00
Baris Soner Usakli
c3f7faffd3 added relative_path in admin site templaets 2014-01-04 19:30:09 -05:00
Baris Soner Usakli
43a1ce66a1 added relative_path to recent_replies and browsing users 2014-01-04 19:20:59 -05:00
Baris Soner Usakli
9da165c1a7 added relative_path to templates 2014-01-04 19:08:09 -05:00
Baris Soner Usakli
02e550d3ad Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 18:28:01 -05:00
Baris Soner Usakli
680fac0674 added relative_path to header.tpl 2014-01-04 18:27:54 -05:00
psychobunny
ea49295774 some translator methods useful for plugins that wish to support i8n 2014-01-04 18:15:10 -05:00
Baris Soner Usakli
0edb895c2c indent 2014-01-04 18:09:43 -05:00
Baris Soner Usakli
981719dee1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 18:05:22 -05:00
Baris Soner Usakli
1466e68aa1 ssl support 101 2014-01-04 18:05:15 -05:00
Julian Lam
f1412193ef Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-04 18:04:12 -05:00
Julian Lam
b6fdc5595d removed handlebars dependency for emailer, using ANDREWBARS now 2014-01-04 18:03:54 -05:00
psychobunny
fda68bc5dd added templates.setGlobal - allows you to add default template vars that are sent to all tpls upon parsing; added relative_path as global 2014-01-04 17:44:13 -05:00
Baris Soner Usakli
487281cc7a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-04 17:11:04 -05:00
Baris Soner Usakli
751dc73ebe fixes login/register and auth routes in relative path install 2014-01-04 17:10:56 -05:00
psychobunny
7f8836daa4 simplified filter:server.create_routes - routes no longer require you to pass in req, res, name, route (the latter two was a mistake)
tl;dr - just content is all that is required. see
http://www.github.com/psychobunny/nodebb-plugin-static-page for more
info
2014-01-04 17:01:01 -05:00
Julian Lam
5c048ac20a closed #727 2014-01-04 14:24:50 -05:00
Julian Lam
11ed9e8c85 tweaks to emailer, implemented emailer hook for password reset 2014-01-04 11:55:41 -05:00
Julian Lam
0ac9ec6001 Merge remote-tracking branch 'origin/master' into email-revamp 2014-01-04 11:19:23 -05:00
Baris Soner Usakli
ecb64a0aa2 removed extra , 2014-01-04 02:10:37 -05:00
Baris Soner Usakli
8626122679 category active users are stored in a sorted set now 2014-01-04 01:15:41 -05:00
Baris Soner Usakli
8ab539b518 0.2.1 2014-01-04 00:50:23 -05:00
Baris Soner Usakli
9078c2a536 0.2.0 2014-01-04 00:49:10 -05:00
Baris Soner Usakli
fd20e4a400 5% more 2014-01-04 00:41:25 -05:00
Baris Soner Usakli
1a64e40b21 upgrade check 2014-01-04 00:38:43 -05:00
Julian Lam
cbfba4b45b 0.2.1 2014-01-04 00:04:37 -05:00
Baris Soner Usakli
f21a98f37f first pass, #524, #667 2014-01-03 21:33:41 -05:00
psychobunny
0edd6985ec templates.js added support for !@first and !@last conditionals 2014-01-03 21:23:08 -05:00
psychobunny
98a646fa62 changed numRecentTopics to numRecentReplies, that makes more sense now 2014-01-03 20:37:29 -05:00
psychobunny
1d69436b44 fix to getRecentReplies causing count = 0 to return unlimited 2014-01-03 20:36:00 -05:00
psychobunny
d6c7551120 pull # of recent replies based on settings 2014-01-03 20:29:09 -05:00
psychobunny
fb53e89023 upgrade.js - categories.numRecentTopics 2014-01-03 20:20:23 -05:00
psychobunny
d28beaa4dc admin - add "# recent topics to display" to categories 2014-01-03 20:17:55 -05:00
psychobunny
ac06567617 admin - add custom class to categories (forgot to commit this) 2014-01-03 20:14:26 -05:00
Baris Soner Usakli
d0a2c077ff refactored posts.create to use waterfall 2014-01-03 19:32:52 -05:00
psychobunny
ebf07626de use categories.class instead of hardcoded columns 2014-01-03 17:22:37 -05:00
psychobunny
9ef8bb4cdc woops, fail at iteration 2014-01-03 17:22:23 -05:00
psychobunny
bc8a53aadd upgrade.js - adding categories.class and categories.link 2014-01-03 17:09:19 -05:00
psychobunny
03c4a1bc73 remove console.log(file) - no more exploding terminals 2014-01-03 15:59:49 -05:00
Julian Lam
d93163896f Merge pull request #701 from aonz1982/install_automated_setup
Install automated setup
2014-01-02 18:47:38 -08:00
Julian Lam
08bdbc0bcc cleanup of PR - fixed some logic bugs and linted 2014-01-02 21:44:13 -05:00
Julian Lam
35d6a99775 Merge branch 'AdminButton' of github.com:genderup/NodeBB into genderup-AdminButton 2014-01-02 21:34:03 -05:00
Julian Lam
cdb0b4b49e Merge branch 'master' into email-revamp 2014-01-02 18:14:07 -05:00
Julian Lam
e45e86fcc1 fixed width icons in ACP. Also, who uses single quotes in HTML? ARGH 2014-01-02 18:13:46 -05:00
Julian Lam
24944762d7 fixing 'back to nodebb' ext, and revamping email confirm logic 2014-01-02 16:26:56 -05:00
Baris Soner Usakli
9589d340b9 removed console.log 2014-01-02 16:00:24 -05:00
Baris Soner Usakli
91afbf106e removed console.log 2014-01-02 16:00:05 -05:00
Baris Soner Usakli
aff11359ae Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-02 15:59:34 -05:00
Baris Soner Usakli
aff8cef5f3 closes #717 2014-01-02 15:59:25 -05:00
Julian Lam
d6e0625fc8 Merge remote-tracking branch 'origin/master' into email-revamp 2014-01-02 15:21:59 -05:00
Julian Lam
879855744d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-02 15:21:00 -05:00
Julian Lam
b5ab0c9097 updated minvers for markdown and mentions 2014-01-02 15:20:54 -05:00
psychobunny
2c398f81d2 fixed the twitter link to @NodeBB 2014-01-02 15:06:08 -05:00
Baris Soner Usakli
520fcadd3f closes #456 2014-01-02 14:53:27 -05:00
Baris Soner Usakli
e8eb9f91b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-02 14:26:30 -05:00
Baris Soner Usakli
8bfb338eee #712 2014-01-02 14:26:08 -05:00
Julian Lam
bbb655abdd Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-02 02:17:55 -05:00
Julian Lam
095e5527e3 upping markdown minver 2014-01-02 02:17:47 -05:00
Barış Soner Uşaklı
4eb8c34855 Merge pull request #715 from cmastudios/age
Calculate age based on days instead of years
2014-01-01 18:35:47 -08:00
cmastudios
e3185b9560 Calculate age based on days instead of years
Calculating the age based on the year only caused issues in the display of the age because it was off. Example: Person who was born in march of 1999 is displayed as 15 instead of 14 after the turn of the year.
2014-01-01 19:46:11 -05:00
Julian Lam
449adfae59 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-01 15:31:32 -05:00
Julian Lam
714e61b137 upping markdown minver 2014-01-01 15:31:27 -05:00
Baris Soner Usakli
d0e4689907 removed extra event in websocket.js 2014-01-01 14:44:15 -05:00
Baris Soner Usakli
1996e64c9b if imgur client id is not set but local file uploads are enabled use that 2014-01-01 14:38:12 -05:00
Baris Soner Usakli
e2fb617cc0 thread delete restore fix 2014-01-01 14:15:53 -05:00
Baris Soner Usakli
fd88aff195 mongo string fix 2014-01-01 14:11:12 -05:00
Julian Lam
f7a1cca861 properly fixed #713 2013-12-31 20:53:24 -05:00
Julian Lam
e3fb996a80 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 20:28:37 -05:00
Julian Lam
fe53037e53 hopefully fixing #713 2013-12-31 20:28:31 -05:00
Baris Soner Usakli
438f90d859 expire functionality in dbal 2013-12-31 19:08:38 -05:00
Julian Lam
339ed4e47b implemented emailer for welcome email (though the email confirmation system is horribly broken) 2013-12-31 18:00:10 -05:00
Julian Lam
5a527de287 fixed debug output when plugin method is not found 2013-12-31 17:19:37 -05:00
Julian Lam
3ff550914f Merge remote-tracking branch 'origin/master' into email-revamp
Conflicts:
	package.json
2013-12-31 17:15:38 -05:00
Baris Soner Usakli
742c8fb43c closes #712 2013-12-31 17:14:27 -05:00
Baris Soner Usakli
d43f3cebc6 closes #707, closes #686 2013-12-31 17:01:51 -05:00
Julian Lam
9d452241ad Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 14:46:33 -05:00
Julian Lam
c19a51e1b6 tweaking slugify code to not remove numbers 2013-12-31 14:46:28 -05:00
Baris Soner Usakli
1b41a8f467 fixed typo 2013-12-31 14:32:16 -05:00
Baris Soner Usakli
f933fc0167 forgot topics.js oops 2013-12-31 14:27:56 -05:00
Baris Soner Usakli
8cfb239aac closes #705 2013-12-31 14:25:26 -05:00
Baris Soner Usakli
a974c6fa99 possible fix for mongo crash 2013-12-31 13:45:37 -05:00
Julian Lam
998f780fd2 fuck, I am dumb. 2013-12-31 13:11:32 -05:00
Julian Lam
b022d46d47 upgrade script for Topic titless and Usernames - closes #709 2013-12-31 13:04:29 -05:00
Julian Lam
f7793e54b1 adding events.log 2013-12-31 10:49:26 -05:00
Julian Lam
1e61033667 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-12-31 10:49:05 -05:00
Julian Lam
53caa5e422 full unicode support in slugify method, thanks to XRegExp 2013-12-31 10:48:59 -05:00
Julian Lam
dd72e73284 emailer invocation for new users 2013-12-31 09:33:25 -05:00
Baris Soner Usakli
40d20846d8 moar refactor 2013-12-31 03:36:42 -05:00
Baris Soner Usakli
204913c63d Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-12-31 03:14:29 -05:00
Baris Soner Usakli
6c30437c47 closes #706, refactor admin image uploads, fixed gif uploads 2013-12-31 03:14:22 -05:00
Barış Soner Uşaklı
dd7fe47dfd Merge pull request #704 from akhoury/master
guarding against Errors on Socket Disconnect
2013-12-30 16:55:21 -08:00
Aziz Khoury
50323c3d23 guarding against Errors on Socket Disconnect
Saw this 

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

and this

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

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

7
.gitignore vendored
View File

@@ -8,10 +8,15 @@ public/css/*.css
*.sublime-project
*.sublime-workspace
.project
.idea
*.swp
Vagrantfile
.vagrant
provision.sh
*.komodoproject
.DS_Store
feeds/recent.rss
# winston?
error.log
events.log

305
.tx/config Normal file
View File

@@ -0,0 +1,305 @@
[main]
host = https://www.transifex.com
[nodebb.category]
file_filter = public/language/<lang>/category.json
source_file = public/language/en_GB/category.json
source_lang = en_GB
trans.ar = public/language/ar/category.json
trans.cs = public/language/cs/category.json
trans.de = public/language/de/category.json
trans.es = public/language/es/category.json
trans.fi = public/language/fi/category.json
trans.fr = public/language/fr/category.json
trans.hu = public/language/hu/category.json
trans.it = public/language/it/category.json
trans.nb = public/language/nb/category.json
trans.pt_BR = public/language/pt_BR/category.json
trans.sk = public/language/sk/category.json
trans.sv = public/language/sv/category.json
trans.tr = public/language/tr/category.json
trans.zh_CN = public/language/zh_CN/category.json
trans.zh_TW = public/language/zh_TW/category.json
type = KEYVALUEJSON
[nodebb.login]
file_filter = public/language/<lang>/login.json
source_file = public/language/en_GB/login.json
source_lang = en_GB
trans.ar = public/language/ar/login.json
trans.cs = public/language/cs/login.json
trans.de = public/language/de/login.json
trans.es = public/language/es/login.json
trans.fi = public/language/fi/login.json
trans.fr = public/language/fr/login.json
trans.hu = public/language/hu/login.json
trans.it = public/language/it/login.json
trans.nb = public/language/nb/login.json
trans.pt_BR = public/language/pt_BR/login.json
trans.sk = public/language/sk/login.json
trans.sv = public/language/sv/login.json
trans.tr = public/language/tr/login.json
trans.zh_CN = public/language/zh_CN/login.json
trans.zh_TW = public/language/zh_TW/login.json
type = KEYVALUEJSON
[nodebb.recent]
source_file = public/language/en_GB/recent.json
source_lang = en_GB
trans.ar = public/language/ar/recent.json
trans.cs = public/language/cs/recent.json
trans.de = public/language/de/recent.json
trans.es = public/language/es/recent.json
trans.fi = public/language/fi/recent.json
trans.fr = public/language/fr/recent.json
trans.hu = public/language/hu/recent.json
trans.it = public/language/it/recent.json
trans.nb = public/language/nb/recent.json
trans.pt_BR = public/language/pt_BR/recent.json
trans.sk = public/language/sk/recent.json
trans.sv = public/language/sv/recent.json
trans.tr = public/language/tr/recent.json
trans.zh_CN = public/language/zh_CN/recent.json
trans.zh_TW = public/language/zh_TW/recent.json
type = KEYVALUEJSON
[nodebb.unread]
source_file = public/language/en_GB/unread.json
source_lang = en_GB
trans.ar = public/language/ar/unread.json
trans.cs = public/language/cs/unread.json
trans.de = public/language/de/unread.json
trans.es = public/language/es/unread.json
trans.fi = public/language/fi/unread.json
trans.fr = public/language/fr/unread.json
trans.hu = public/language/hu/unread.json
trans.it = public/language/it/unread.json
trans.nb = public/language/nb/unread.json
trans.pt_BR = public/language/pt_BR/unread.json
trans.sk = public/language/sk/unread.json
trans.sv = public/language/sv/unread.json
trans.tr = public/language/tr/unread.json
trans.zh_CN = public/language/zh_CN/unread.json
trans.zh_TW = public/language/zh_TW/unread.json
type = KEYVALUEJSON
[nodebb.footer]
source_file = public/language/en_GB/footer.json
source_lang = en_GB
trans.ar = public/language/ar/footer.json
trans.cs = public/language/cs/footer.json
trans.de = public/language/de/footer.json
trans.es = public/language/es/footer.json
trans.fi = public/language/fi/footer.json
trans.fr = public/language/fr/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.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.es = public/language/es/modules.json
trans.fi = public/language/fi/modules.json
trans.fr = public/language/fr/modules.json
trans.hu = public/language/hu/modules.json
trans.it = public/language/it/modules.json
trans.nb = public/language/nb/modules.json
trans.pt_BR = public/language/pt_BR/modules.json
trans.sk = public/language/sk/modules.json
trans.sv = public/language/sv/modules.json
trans.tr = public/language/tr/modules.json
trans.zh_CN = public/language/zh_CN/modules.json
trans.zh_TW = public/language/zh_TW/modules.json
type = KEYVALUEJSON
[nodebb.register]
source_file = public/language/en_GB/register.json
source_lang = en_GB
trans.ar = public/language/ar/register.json
trans.cs = public/language/cs/register.json
trans.de = public/language/de/register.json
trans.es = public/language/es/register.json
trans.fi = public/language/fi/register.json
trans.fr = public/language/fr/register.json
trans.hu = public/language/hu/register.json
trans.it = public/language/it/register.json
trans.nb = public/language/nb/register.json
trans.pt_BR = public/language/pt_BR/register.json
trans.sk = public/language/sk/register.json
trans.sv = public/language/sv/register.json
trans.tr = public/language/tr/register.json
trans.zh_CN = public/language/zh_CN/register.json
trans.zh_TW = public/language/zh_TW/register.json
type = KEYVALUEJSON
[nodebb.user]
source_file = public/language/en_GB/user.json
source_lang = en_GB
trans.ar = public/language/ar/user.json
trans.cs = public/language/cs/user.json
trans.de = public/language/de/user.json
trans.es = public/language/es/user.json
trans.fi = public/language/fi/user.json
trans.fr = public/language/fr/user.json
trans.hu = public/language/hu/user.json
trans.it = public/language/it/user.json
trans.nb = public/language/nb/user.json
trans.pt_BR = public/language/pt_BR/user.json
trans.sk = public/language/sk/user.json
trans.sv = public/language/sv/user.json
trans.tr = public/language/tr/user.json
trans.zh_CN = public/language/zh_CN/user.json
trans.zh_TW = public/language/zh_TW/user.json
type = KEYVALUEJSON
[nodebb.global]
source_file = public/language/en_GB/global.json
source_lang = en_GB
trans.ar = public/language/ar/global.json
trans.cs = public/language/cs/global.json
trans.de = public/language/de/global.json
trans.es = public/language/es/global.json
trans.fi = public/language/fi/global.json
trans.fr = public/language/fr/global.json
trans.hu = public/language/hu/global.json
trans.it = public/language/it/global.json
trans.nb = public/language/nb/global.json
trans.pt_BR = public/language/pt_BR/global.json
trans.sk = public/language/sk/global.json
trans.sv = public/language/sv/global.json
trans.tr = public/language/tr/global.json
trans.zh_CN = public/language/zh_CN/global.json
trans.zh_TW = public/language/zh_TW/global.json
type = KEYVALUEJSON
[nodebb.notifications]
source_file = public/language/en_GB/notifications.json
source_lang = en_GB
trans.ar = public/language/ar/notifications.json
trans.cs = public/language/cs/notifications.json
trans.de = public/language/de/notifications.json
trans.es = public/language/es/notifications.json
trans.fi = public/language/fi/notifications.json
trans.fr = public/language/fr/notifications.json
trans.hu = public/language/hu/notifications.json
trans.it = public/language/it/notifications.json
trans.nb = public/language/nb/notifications.json
trans.pt_BR = public/language/pt_BR/notifications.json
trans.sk = public/language/sk/notifications.json
trans.sv = public/language/sv/notifications.json
trans.tr = public/language/tr/notifications.json
trans.zh_CN = public/language/zh_CN/notifications.json
trans.zh_TW = public/language/zh_TW/notifications.json
type = KEYVALUEJSON
[nodebb.reset_password]
source_file = public/language/en_GB/reset_password.json
source_lang = en_GB
trans.ar = public/language/ar/reset_password.json
trans.cs = public/language/cs/reset_password.json
trans.de = public/language/de/reset_password.json
trans.es = public/language/es/reset_password.json
trans.fi = public/language/fi/reset_password.json
trans.fr = public/language/fr/reset_password.json
trans.hu = public/language/hu/reset_password.json
trans.it = public/language/it/reset_password.json
trans.nb = public/language/nb/reset_password.json
trans.pt_BR = public/language/pt_BR/reset_password.json
trans.sk = public/language/sk/reset_password.json
trans.sv = public/language/sv/reset_password.json
trans.tr = public/language/tr/reset_password.json
trans.zh_CN = public/language/zh_CN/reset_password.json
trans.zh_TW = public/language/zh_TW/reset_password.json
type = KEYVALUEJSON
[nodebb.users]
source_file = public/language/en_GB/users.json
source_lang = en_GB
trans.ar = public/language/ar/users.json
trans.cs = public/language/cs/users.json
trans.de = public/language/de/users.json
trans.es = public/language/es/users.json
trans.fi = public/language/fi/users.json
trans.fr = public/language/fr/users.json
trans.hu = public/language/hu/users.json
trans.it = public/language/it/users.json
trans.nb = public/language/nb/users.json
trans.pt_BR = public/language/pt_BR/users.json
trans.sk = public/language/sk/users.json
trans.sv = public/language/sv/users.json
trans.tr = public/language/tr/users.json
trans.zh_CN = public/language/zh_CN/users.json
trans.zh_TW = public/language/zh_TW/users.json
type = KEYVALUEJSON
[nodebb.language]
source_file = public/language/en_GB/language.json
source_lang = en_GB
trans.ar = public/language/ar/language.json
trans.cs = public/language/cs/language.json
trans.de = public/language/de/language.json
trans.es = public/language/es/language.json
trans.fi = public/language/fi/language.json
trans.fr = public/language/fr/language.json
trans.hu = public/language/hu/language.json
trans.it = public/language/it/language.json
trans.nb = public/language/nb/language.json
trans.pt_BR = public/language/pt_BR/language.json
trans.sk = public/language/sk/language.json
trans.sv = public/language/sv/language.json
trans.tr = public/language/tr/language.json
trans.zh_CN = public/language/zh_CN/language.json
trans.zh_TW = public/language/zh_TW/language.json
type = KEYVALUEJSON
[nodebb.pages]
source_file = public/language/en_GB/pages.json
source_lang = en_GB
trans.ar = public/language/ar/pages.json
trans.cs = public/language/cs/pages.json
trans.de = public/language/de/pages.json
trans.es = public/language/es/pages.json
trans.fi = public/language/fi/pages.json
trans.fr = public/language/fr/pages.json
trans.hu = public/language/hu/pages.json
trans.it = public/language/it/pages.json
trans.nb = public/language/nb/pages.json
trans.pt_BR = public/language/pt_BR/pages.json
trans.sk = public/language/sk/pages.json
trans.sv = public/language/sv/pages.json
trans.tr = public/language/tr/pages.json
trans.zh_CN = public/language/zh_CN/pages.json
trans.zh_TW = public/language/zh_TW/pages.json
type = KEYVALUEJSON
[nodebb.topic]
source_file = public/language/en_GB/topic.json
source_lang = en_GB
trans.ar = public/language/ar/topic.json
trans.cs = public/language/cs/topic.json
trans.de = public/language/de/topic.json
trans.es = public/language/es/topic.json
trans.fi = public/language/fi/topic.json
trans.fr = public/language/fr/topic.json
trans.hu = public/language/hu/topic.json
trans.it = public/language/it/topic.json
trans.nb = public/language/nb/topic.json
trans.pt_BR = public/language/pt_BR/topic.json
trans.sk = public/language/sk/topic.json
trans.sv = public/language/sv/topic.json
trans.tr = public/language/tr/topic.json
trans.zh_CN = public/language/zh_CN/topic.json
trans.zh_TW = public/language/zh_TW/topic.json
type = KEYVALUEJSON

View File

@@ -8,9 +8,9 @@
* [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
* [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
![NodeBB Main Category Listing](http://i.imgur.com/zffCFoh.png)
![NodeBB Main Category Listing](http://i.imgur.com/zRdzCcj.png)
![NodeBB Topic Page](http://i.imgur.com/JihdcUa.png)
![NodeBB Topic Page](http://i.imgur.com/ZC8W39a.png)
## How can I follow along/contribute?
@@ -23,7 +23,7 @@
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.
* Redis, version 2.6 or greater or MongoDB, version 2.4 or greater
* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
## Installation
@@ -32,6 +32,8 @@ First, we install our base software stack:
# apt-get install git nodejs redis-server npm 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

157
app.js
View File

@@ -16,108 +16,124 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
"use strict";
// Configuration setup
var nconf = require('nconf');
nconf.argv().env();
"use strict";
var fs = require('fs'),
async = require('async'),
var nconf = require('nconf');
nconf.argv().env();
var fs = require('fs'),
os = require('os'),
semver = require('semver'),
winston = require('winston'),
pkg = require('./package.json'),
path = require('path'),
meta;
pkg = require('./package.json'),
utils = require('./public/src/utils.js');
// Runtime environment
global.env = process.env.NODE_ENV || 'production';
winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, {
global.env = process.env.NODE_ENV || 'production';
winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, {
colorize: true
});
});
winston.add(winston.transports.File, {
winston.add(winston.transports.File, {
filename: 'error.log',
level: 'error'
});
});
// TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
winston.err = function (err) {
// TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
winston.err = function (err) {
winston.error(err.stack);
};
};
// Log GNU copyright info along with server info
winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
winston.info('');
if(os.platform() === 'linux') {
require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
if(err || !stdout) {
winston.warn('Couldn\'t find convert. Did you install imagemagick?');
}
});
}
// Log GNU copyright info along with server info
winston.info('NodeBB v' + pkg.version + ' Copyright (C) 2013 DesignCreatePlay Inc.');
winston.info('This program comes with ABSOLUTELY NO WARRANTY.');
winston.info('This is free software, and you are welcome to redistribute it under certain conditions.');
winston.info('');
if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('upgrade') && fs.existsSync(__dirname + '/config.json')) {
// Load server-side configs
if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && fs.existsSync(__dirname + '/config.json')) {
start();
} else if (nconf.get('setup') || nconf.get('install') || !fs.existsSync(__dirname + '/config.json')) {
setup();
} else if (nconf.get('upgrade')) {
upgrade();
} else/* if (nconf.get('help') */{
displayHelp();
};
function start() {
nconf.file({
file: __dirname + '/config.json'
});
meta = require('./src/meta.js');
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/');
nconf.set('upload_url', nconf.get('url') + 'uploads/');
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);
winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.');
winston.info('Time: ' + new Date());
winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using ' + nconf.get('database') +' store at ' + nconf.get(nconf.get('database') + ':host') + ':' + nconf.get(nconf.get('database') + ':port') + '.');
winston.info('NodeBB instance bound to: ' + ((nconf.get('bind_address') === "0.0.0.0" || !nconf.get('bind_address')) ? 'Any address (0.0.0.0)' : nconf.get('bind_address')));
if (process.env.NODE_ENV === 'development') {
winston.info('Base Configuration OK.');
}
if (!semver.satisfies(require('./node_modules/nodebb-theme-cerulean/package.json').version, pkg.dependencies['nodebb-theme-cerulean'])) {
winston.error('nodebb-theme-cerulean is out of date - please run npm install.');
}
if (!semver.satisfies(require('./node_modules/nodebb-theme-vanilla/package.json').version, pkg.dependencies['nodebb-theme-vanilla'])) {
winston.error('nodebb-theme-vanilla is out of date - please run npm install.');
}
var meta = require('./src/meta');
require('./src/database').init(function(err) {
meta.configs.init(function () {
// Initial setup for Redis & Reds
var reds = require('reds'),
RDB = require('./src/redis.js');
reds.createClient = function () {
return reds.client || (reds.client = RDB);
};
var templates = require('./public/src/templates'),
translator = require('./public/src/translator'),
webserver = require('./src/webserver'),
sockets = require('./src/socket.io'),
plugins = require('./src/plugins'),
notifications = require('./src/notifications'),
upgrade = require('./src/upgrade');
var templates = require('./public/src/templates.js'),
translator = require('./public/src/translator.js'),
webserver = require('./src/webserver.js'),
SocketIO = require('socket.io').listen(global.server, { log: false, transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket']}),
websockets = require('./src/websockets.js'),
posts = require('./src/posts.js'),
plugins = require('./src/plugins'), // Don't remove this - plugins initializes itself
Notifications = require('./src/notifications'),
Upgrade = require('./src/upgrade');
templates.setGlobal('relative_path', nconf.get('relative_path'));
Upgrade.check(function(schema_ok) {
upgrade.check(function(schema_ok) {
if (schema_ok || nconf.get('check-schema') === false) {
websockets.init(SocketIO);
global.templates = {};
global.translator = translator;
sockets.init(webserver.server);
plugins.init();
translator.loadServer();
var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false;
// todo: replace below with read directory code, derp.
templates.init([
'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
'emails/header', 'emails/footer',
'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
], customTemplates);
utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
templates.init(tplsToLoad, customTemplates);
});
plugins.ready(function() {
templates.ready(webserver.init);
});
Notifications.init();
notifications.init();
} 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');
@@ -127,8 +143,10 @@
}
});
});
} else if (nconf.get('setup') || !fs.existsSync(__dirname + '/config.json')) {
// New install, ask setup questions
});
}
function setup() {
if (nconf.get('setup')) {
winston.info('NodeBB Setup Triggered via Command Line');
} else {
@@ -149,22 +167,28 @@
if (err) {
winston.error('There was a problem completing NodeBB setup: ', err.message);
} else {
winston.info('NodeBB Setup Completed. Run \'node app\' to manually start your NodeBB server.');
winston.info('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.');
}
process.exit();
});
}
} else if (nconf.get('upgrade')) {
function upgrade() {
nconf.file({
file: __dirname + '/config.json'
});
meta = require('./src/meta.js');
var meta = require('./src/meta');
require('./src/database').init(function(err) {
meta.configs.init(function () {
require('./src/upgrade').upgrade();
});
} else/* if (nconf.get('help') */{
});
}
function displayHelp() {
winston.info('Usage: node app [options] [arguments]');
winston.info(' [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
winston.info('');
@@ -173,5 +197,4 @@
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(' --start manually start NodeBB (default when no options are given)');
};
}());
}

View File

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

81
mocks/databasemock.js Normal file
View File

@@ -0,0 +1,81 @@
/**
* Database Mock - wrapper for database.js, makes system use separate test db, instead of production
* ATTENTION: testing db is flushed before every use!
*/
(function(module) {
'use strict';
var utils = require('./../public/src/utils.js'),
path = require('path'),
nconf = require('nconf'),
winston = require('winston'),
errorText;
nconf.file({ file: path.join(__dirname, '../config.json') });
var dbType = nconf.get('database'),
testDbConfig = nconf.get('test_database'),
productionDbConfig = nconf.get(dbType);
if(!testDbConfig){
errorText = 'test_database is not defined';
winston.info(
"\n===========================================================\n"+
"Please, add parameters for test database in config.json\n"+
"For example (redis):\n"+
'"test_database": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "6379",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
" or (mongo):\n" +
'"test_database": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "27017",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
"==========================================================="
);
winston.error(errorText);
throw new Error(errorText);
}
if( testDbConfig.database === productionDbConfig.database &&
testDbConfig.host === productionDbConfig.host &&
testDbConfig.port === productionDbConfig.port
){
errorText = 'test_database has the same config as production db';
winston.error(errorText);
throw new Error(errorText);
}
nconf.set(dbType, testDbConfig);
db = require('../src/database');
before(function(done) {
db.init(function(err) {
//Clean up
db.flushdb(function(err) {
if(err){
winston.error(err);
throw new Error(err);
} else {
winston.info('test_database flushed');
done();
}
//TODO: data seeding, if needed at all
});
});
});
module.exports = db;
}(module));

View File

@@ -1,69 +0,0 @@
/**
* Redis Mock - wrapper for redis.js, makes system use separate test db, instead of production
* ATTENTION: testing db is flushed before every use!
*/
(function(module) {
'use strict';
var RedisDB,
redis = require('redis'),
utils = require('./../public/src/utils.js'),
path = require('path'),
nconf = require('nconf'),
winston = require('winston'),
errorText;
nconf.file({ file: path.join(__dirname, '../config.json') });
var testDbConfig = nconf.get('redis_test'),
productionDbConfig = nconf.get('redis');
if(!testDbConfig){
errorText = 'redis_test database is not defined';
winston.info(
"\n===========================================================\n"+
"Please, add parameters for test database in config.json\n"+
"For example:\n"+
'"redis_test": {' + '\n' +
' "host": "127.0.0.1",' + '\n' +
' "port": "6379",' + '\n' +
' "password": "",' + '\n' +
' "database": "1"' + '\n' +
'}\n'+
"==========================================================="
);
winston.error(errorText);
throw new Error(errorText);
}
if( testDbConfig.database === productionDbConfig.database &&
testDbConfig.host === productionDbConfig.host &&
testDbConfig.port === productionDbConfig.port
){
errorText = 'redis_test database has the same config as production db';
winston.error(errorText);
throw new Error(errorText);
}
nconf.set('redis',testDbConfig);
RedisDB = require('../src/redis.js');
//Clean up
RedisDB.send_command('flushdb', [], function(error){
if(error){
winston.error(error);
throw new Error(error);
} else {
winston.info('redis_test db flushed');
}
});
//TODO: data seeding, if needed at all
module.exports = RedisDB;
}(module));

68
nodebb
View File

@@ -1,6 +1,62 @@
#!/bin/sh
clear
echo "Launching NodeBB in \"development\" mode."
echo "To run the production build of NodeBB, please use \"forever\"."
echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB"
NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1
#!/bin/bash
# $0 script path
# $1 action
# $2 subaction
case "$1" in
start)
node app
;;
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
echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
;;
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
;;
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 $1
;;
# 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 ''
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
upgrade Run NodeBB upgrade scripts, ensure packages are up-to-date
'
exit 1
esac

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
"version": "0.1.1",
"version": "0.3.1",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -14,12 +14,10 @@
},
"dependencies": {
"socket.io": "~0.9.16",
"redis": "0.8.3",
"express": "3.2.0",
"express-namespace": "~0.1.1",
"emailjs": "0.3.4",
"cookie": "0.0.6",
"connect-redis": "1.4.5",
"passport": "0.1.17",
"passport-local": "0.1.6",
"passport-twitter": "0.1.5",
@@ -27,12 +25,11 @@
"passport-facebook": "0.1.5",
"less-middleware": "0.1.12",
"marked": "0.2.8",
"bcrypt": "0.7.5",
"async": "0.2.8",
"async": "~0.2.8",
"node-imagemagick": "0.1.8",
"gravatar": "1.0.6",
"nconf": "~0.6.7",
"sitemap": "~0.6.0",
"sitemap": "~0.7.1",
"request": "~2.25.0",
"reds": "~0.2.4",
"winston": "~0.7.2",
@@ -40,14 +37,27 @@
"prompt": "~0.2.11",
"uglify-js": "~2.4.0",
"validator": "~1.5.1",
"nodebb-plugin-mentions": "~0.1.14",
"nodebb-plugin-markdown": "~0.1.8",
"nodebb-theme-vanilla": "designcreateplay/nodebb-theme-vanilla",
"nodebb-theme-cerulean": "0.0.7",
"cron": "~1.0.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",
"socket.io-wildcard": "~0.1.1",
"bcryptjs": "~0.7.10"
},
"optionalDependencies": {
"hiredis": "~0.1.15"
"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"
},
"devDependencies": {
"mocha": "~1.13.0"

View File

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

View File

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

View File

@@ -0,0 +1,52 @@
{
"home": "الصفحة الرئيسية",
"search": "بحث",
"buttons.close": "أغلق",
"403.title": "غير مسموح بالدخول",
"403.message": "يبدو أنك قد تعثر على الصفحة التي لم يكن لديك الوصول إليها. ربما يجب عليك <a href='/login'> تسجيل الدخول </a> ",
"404.title": "لم يتم العثور",
"404.message": "يبدو أنك قد تعثرت على صفحة غير موجودة. عودة إلى الصفحة الرئيسية.",
"500.title": "خطأ داخلي.",
"500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
"register": "تسجيل",
"login": "دخول",
"logout": "تسجيل الخروج",
"logout.title": "تم تسجيل الخروج",
"logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB",
"save_changes": "حفظ التغييرات",
"close": "أغلق",
"header.admin": "مشرف",
"header.recent": "حديث",
"header.unread": "غير مقروء",
"header.popular": "Popular",
"header.users": "المستخدمين",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "بحث",
"header.profile": "ملف",
"notifications.loading": "تحميل التبليغات",
"chats.loading": "تحميل الدردشات",
"motd.welcome": "مرحبا بكم NodeBB، منصة مناقشة المستقبل",
"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.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
}

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,8 @@
{
"title": "إعلام",
"back_to_home": "العودة إلى NodeBB",
"outgoing_link": "رابط خارجي",
"outgoing_link_message": "أنت الأن ترحل",
"continue_to": "أكمل إلى",
"return_to": "إرجع إلى"
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -0,0 +1,6 @@
{
"title": "Recent",
"day": "يوم",
"week": "أسبوع",
"month": "شهر"
}

View File

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

View File

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

View File

@@ -0,0 +1,47 @@
{
"topic": "موضوع",
"topics": "مواضيع",
"no_topics_found": "لا توجد مواضيع !",
"profile": "ملف",
"posted_by": "Posted by",
"chat": "دردشة",
"notify_me": "تنبه من ردود جديدة في هذا الموضوع",
"quote": "اقتبس",
"reply": "رد",
"edit": "صحح",
"delete": "حذف",
"move": "انقل",
"fork": "فرع",
"banned": "محظور",
"link": "رابط",
"share": "شارك",
"tools": "أدوات",
"flag": "Flag",
"flag_title": "Flag this post for moderation",
"thread_tools.title": "أدوات الموضوع",
"thread_tools.markAsUnreadForAll": "علم غير مقروء",
"thread_tools.pin": "علق الموضوع",
"thread_tools.lock": "قفل الموضوع",
"thread_tools.move": "نقل الموضوع",
"thread_tools.fork": "تفرع الموضوع",
"thread_tools.delete": "حذف الموضوع",
"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": "ليس لديك أي ردود مفضلة. فضل بعد الردود لرؤيتهم هنا",
"loading_more_posts": "تحميل المزيد من المشاركات",
"move_topic": "نقل الموضوع",
"move_post": "نقل الرد",
"fork_topic": "فرع الموضوع",
"topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
"fork_topic_instruction": "إضغط على الردود لتفريعهم",
"fork_no_pids": "لم تختار أي رد",
"fork_success": "تفريع الموضوع بنجاح!",
"reputation": "سمعة",
"posts": "ردود"
}

View File

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

View File

@@ -0,0 +1,37 @@
{
"banned": "محظور",
"offline": "ليس موجود حالياً",
"username": "إسم المستخدم",
"email": "البريد الإلكتروني",
"fullname": "الاسم الكامل",
"website": "الموقع الإلكتروني",
"location": "موقع",
"age": "عمر",
"joined": "تاريخ التسجيل",
"lastonline": "تاريخ أخر دخول",
"profile_views": "مشاهد الملف",
"reputation": "سمعة",
"posts": "ردود",
"favourites": "Favourites",
"followers": "أتباع",
"following": "يتبع",
"signature": "توقيع",
"gravatar": "Gravatar",
"birthday": "عيد ميلاد",
"change_picture": "تغيير الصورة",
"edit": "صحح",
"uploaded_picture": "صورة تم تحميلها",
"upload_new_picture": "تحميل صورة جديدة",
"change_password": "تغيير كلمة السر",
"confirm_password": "تأكيد كلمة السر",
"password": "كلمة السر",
"upload_picture": "تحميل الصورة",
"upload_a_picture": "تحميل صورة",
"image_spec": "تستطيع تحميل سوى PNG، JPG، GIF تحت 256KB.",
"settings": "Settings",
"show_email": "أظهر بريدي الإلكتروني",
"has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
"follows_no_one": "هذا المستخدم لا يتبع أحد :(",
"email_hidden": "البريد الإلكتروني مخفي",
"hidden": "مخفي"
}

View File

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

View File

@@ -0,0 +1,14 @@
{
"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"
}

View File

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

View File

@@ -0,0 +1,52 @@
{
"home": "Domů",
"search": "Hledat",
"buttons.close": "Zavřít",
"403.title": "Přístup odepřen",
"403.message": "K této stránce nemáte přístup. Zkuste se <a href='/login'>přihlásit</a>?",
"404.title": "Stránka nenalezena",
"404.message": "Tato stránka bohužel neexistuje. Vraťte se na <a href='/'>domovskou stránku</a>.",
"500.title": "Neznámá chyba",
"500.message": "Jejda, vypadá to, že se něco pokazilo.",
"register": "Registrovat",
"login": "Přihlásit se",
"logout": "Odhlásit se",
"logout.title": "Odhlásili jsme Vás.",
"logout.message": "Úspěšně jsme Vás odhlásili z fóra.",
"save_changes": "Uložit změny",
"close": "Zrušit",
"header.admin": "Administrace",
"header.recent": "Aktuality",
"header.unread": "Nepřečtené",
"header.popular": "Popular",
"header.users": "Uživatelé",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "Hledat",
"header.profile": "Můj profil",
"notifications.loading": "Načítání upozornění",
"chats.loading": "Načítání grafů",
"motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
"motd.get": "Získat NodeBB",
"motd.fork": "Fork",
"motd.like": "To se mi líbí",
"motd.follow": "Sledovat",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
}

View File

@@ -0,0 +1,4 @@
{
"name": "Czech",
"code": "cs"
}

View File

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

View File

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

View File

@@ -0,0 +1,8 @@
{
"title": "Upozornění",
"back_to_home": "Zpět na úvodní stránku",
"outgoing_link": "Odkaz mimo fórum",
"outgoing_link_message": "Nyní opouštíte fórum",
"continue_to": "Přejít na",
"return_to": "Vrátit se na "
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -0,0 +1,6 @@
{
"title": "Recent",
"day": "Den",
"week": "Týden",
"month": "Měsíc"
}

View File

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

View File

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

View File

@@ -0,0 +1,47 @@
{
"topic": "Téma",
"topics": "Témata",
"no_topics_found": "Nebyla nalezena žádná témata!",
"profile": "Profil",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Sledovat toto téma",
"quote": "Citovat",
"reply": "Odpovědět",
"edit": "Upravit",
"delete": "Smazat",
"move": "Přesunout",
"fork": "Rozdělit",
"banned": "banned",
"link": "Odkaz",
"share": "Share",
"tools": "Tools",
"flag": "Flag",
"flag_title": "Flag this post for moderation",
"thread_tools.title": "Nástroje",
"thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Zvýraznit vlákno",
"thread_tools.lock": "Uzamknout vlákno",
"thread_tools.move": "Přesunout vlákno",
"thread_tools.fork": "Rozdělit vlákno",
"thread_tools.delete": "Smazat vlákno",
"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!",
"loading_more_posts": "Načítání více příspěvků",
"move_topic": "Přesunout téma",
"move_post": "Přesunout příspěvek",
"fork_topic": "Rozdělit příspěvek",
"topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
"fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
"fork_no_pids": "Žádné příspěvky nebyly vybrány!",
"fork_success": "Téma bylo úspěšně rozděleno!",
"reputation": "Reputace",
"posts": "Příspěvky"
}

View File

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

View File

@@ -0,0 +1,37 @@
{
"banned": "Banned",
"offline": "Offline",
"username": "Uživatelské jméno",
"email": "Email",
"fullname": "Jméno a příjmení",
"website": "Webové stránky",
"location": "Poloha",
"age": "Věk",
"joined": "Registrován",
"lastonline": "Naposledy online",
"profile_views": "Zobrazení profilu",
"reputation": "Reputace",
"posts": "Příspěvky",
"favourites": "Favourites",
"followers": "Sledují ho",
"following": "Sleduje",
"signature": "Podpis",
"gravatar": "Gravatar",
"birthday": "Datum narození",
"change_picture": "Změnit obrázek",
"edit": "Upravit",
"uploaded_picture": "Nahraný obrázek",
"upload_new_picture": "Nahrát nový obrázek",
"change_password": "Změnit heslo",
"confirm_password": "Potvrzení hesla",
"password": "Heslo",
"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.",
"settings": "Settings",
"show_email": "Zobrazovat můj email v profilu",
"has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
"follows_no_one": "Tento uživatel nikoho nesleduje :(",
"email_hidden": "Skrytý email",
"hidden": "skrytý"
}

View File

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

View File

@@ -0,0 +1,14 @@
{
"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_replies": "Niemand hat geantwortet",
"replied": "geantwortet",
"last_edited_by": "zuletzt editiert durch"
}

View File

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

View File

@@ -0,0 +1,52 @@
{
"home": "Übersicht",
"search": "Suche",
"buttons.close": "Schließen",
"403.title": "Zugriff Verweigert",
"403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. <a href='/login'>Logge dich ein</a> und versuche es erneut.",
"404.title": " Nicht Gefunden",
"404.message": "Die abgefragte Seite wurde nicht gefunden. <a href='/''>Zurück zur Übersicht</a>.",
"500.title": "Internal error.",
"500.message": "Ooops! Looks like something went wrong!",
"register": "Registrierung",
"login": "Login",
"logout": "Logout",
"logout.title": "Du bist ausgeloggt.",
"logout.message": "Du hast dich soeben erfolgreich aus dem Forum ausgeloggt.",
"save_changes": "Speichere Änderungen",
"close": "Schließen",
"header.admin": "Admin",
"header.recent": "Aktuell",
"header.unread": "Ungelesen",
"header.popular": "Beliebt",
"header.users": "Benutzer",
"header.chats": "Chats",
"header.notifications": "Benachrichtigungen",
"header.search": "Suche",
"header.profile": "Profil",
"notifications.loading": "Benachrichtigungen laden",
"chats.loading": "Nachrichten werden geladen",
"motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
"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",
"alert.error": "Fehler",
"alert.banned": "Gebannt",
"alert.banned.message": "Du bist gebannt und wirst nun ausgeloggt.",
"alert.unfollow": "Du folgst %1 nicht länger!",
"alert.follow": "Du folgst nun %1!",
"posts": "Beiträge",
"views": "Aufrufe",
"posted": "geposted",
"in": "in",
"recentposts": "Aktuelle Beiträge",
"online": "Online",
"away": "Abwesend",
"dnd": "Nicht stören",
"invisible": "Unsichtbar",
"offline": "Offline"
}

View File

@@ -0,0 +1,4 @@
{
"name": "German",
"code": "de"
}

View File

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

View File

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

View File

@@ -0,0 +1,8 @@
{
"title": "Benachrichtigungen",
"back_to_home": "Zurück zur Startseite",
"outgoing_link": "Externer Link",
"outgoing_link_message": "Du verlässt nun",
"continue_to": "Gehe weiter zu",
"return_to": "Kehre zurück zu"
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -0,0 +1,6 @@
{
"title": "Aktuell",
"day": "Tag",
"week": "Woche",
"month": "Monat"
}

View File

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

View File

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

View File

@@ -0,0 +1,47 @@
{
"topic": "Thema",
"topics": "Themen",
"no_topics_found": "Keine passende Themen gefunden.",
"profile": "Profil",
"posted_by": "Geposted von",
"chat": "Chat",
"notify_me": "Werde bei neues Antworten auf dieses Thema benachrichtigt.",
"quote": "zitieren",
"reply": "antworten",
"edit": "bearbeiten",
"delete": "löschen",
"move": "Verschieben",
"fork": "Aufspalten",
"banned": "gesperrt",
"link": "Link",
"share": "Teilen",
"tools": "Tools",
"flag": "Markieren",
"flag_title": "Diesen Beitrag zur Moderation markieren",
"thread_tools.title": "Thread Tools",
"thread_tools.markAsUnreadForAll": "Als ungelesen markieren",
"thread_tools.pin": "Thread pinnen",
"thread_tools.lock": "Thread sperren",
"thread_tools.move": "Thread verschieben",
"thread_tools.fork": "Thread aufspalten",
"thread_tools.delete": "Thread löschen",
"load_categories": "Kategorien laden",
"disabled_categories_note": "Deaktivierte Kategorien sind ausgegraut.",
"confirm_move": "verschieben",
"confirm_fork": "Aufspalten",
"favourite": "Favorit",
"favourites": "Favoriten",
"favourites.not_logged_in.title": "Nicht eingeloggt!",
"favourites.not_logged_in.message": "Bitte logge dich ein, um diesen Beitrag favorisieren zu können.",
"favourites.has_no_favourites": "Du hast noch keine Favoriten.",
"loading_more_posts": "Lade Mehr Posts",
"move_topic": "Thema verschieben",
"move_post": "Beitrag verschieben",
"fork_topic": "Thema aufspalten",
"topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
"fork_topic_instruction": "Klicke auf die Posts, die du aufspalten willst",
"fork_no_pids": "Keine Beiträge ausgewählt!",
"fork_success": "Thema erfolgreich aufgespalten!",
"reputation": "Reputation",
"posts": "Beiträge"
}

View File

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

View File

@@ -0,0 +1,37 @@
{
"banned": "Gebannt",
"offline": "offline",
"username": "Nutzername",
"email": "E-Mail",
"fullname": "Kompletter Name",
"website": "Homepage",
"location": "Wohnort",
"age": "Alter",
"joined": "Beigetreten",
"lastonline": "Zuletzt online",
"profile_views": "Profilaufrufe",
"reputation": "Reputation",
"posts": "Posts",
"favourites": "Favoriten",
"followers": "Follower",
"following": "Folgt",
"signature": "Signatur",
"gravatar": "Gravatar",
"birthday": "Geburtstag",
"change_picture": "Ändere Profilbild",
"edit": "Ändern",
"uploaded_picture": "Hochgeladene Bilder",
"upload_new_picture": "Neues Bild hochladen",
"change_password": "Ändere Passwort",
"confirm_password": "Passwort wiederholen",
"password": "Passwort",
"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.",
"settings": "Einstellungen",
"show_email": "Zeige meine E-Mail Adresse an.",
"has_no_follower": "Dieser User hat noch keine Follower.",
"follows_no_one": "Dieser User folgt noch niemanden.",
"email_hidden": "E-Mail Adresse versteckt",
"hidden": "versteckt"
}

View File

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

View File

@@ -1,9 +0,0 @@
{
"chat.chatting_with": "Chat with <span id='chat-with-name'></span>",
"chat.placeholder": "type chat message here, press enter to send",
"chat.send": "Send",
"stats.online": "Online",
"stats.users": "Users",
"stats.topics": "Topics",
"stats.posts": "Posts"
}

View File

@@ -1,18 +0,0 @@
{
"home": "Home",
"search": "Search",
"buttons.close": "Close",
"403.title": "Access Denied",
"403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should <a href='/login'>try logging in</a>?",
"404.title": "Not Found",
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='/''>home page</a>.",
"logout": "Logout",
"logout.title": "You are now logged out.",
"logout.message": "You have successfully logged out of NodeBB",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.users": "Users",
"header.search": "Search",
"notifications.loading": "Loading Notifications"
}

View File

@@ -1,3 +0,0 @@
{
"title": "Notifications"
}

View File

@@ -1,23 +0,0 @@
{
"profile": "Profile",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
"favourite": "Favourite",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"banned": "banned",
"link": "Link",
"thread_tools.title": "Thread Tools",
"thread_tools.pin": "Pin Thread",
"thread_tools.lock": "Lock Thread",
"thread_tools.move": "Move Thread",
"thread_tools.delete": "Delete Thread",
"load_categories": "Loading Categories",
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"favourites.not_logged_in.title": "Not Logged In",
"favourites.not_logged_in.message": "Please log in in order to favourite this post"
}

View File

@@ -3,5 +3,12 @@
"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"
"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"
}

View File

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

View File

@@ -0,0 +1,66 @@
{
"home": "Home",
"search": "Search",
"buttons.close": "Close",
"403.title": "Access Denied",
"403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should <a href='/login'>try logging in</a>?",
"404.title": "Not Found",
"404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='/'>home page</a>.",
"500.title": "Internal error.",
"500.message": "Oops! Looks like something went wrong!",
"register": "Register",
"login": "Login",
"logout": "Logout",
"logout.title": "You are now logged out.",
"logout.message": "You have successfully logged out of NodeBB",
"save_changes": "Save Changes",
"close": "Close",
"header.admin": "Admin",
"header.recent": "Recent",
"header.unread": "Unread",
"header.popular": "Popular",
"header.users": "Users",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "Search",
"header.profile": "Profile",
"notifications.loading": "Loading Notifications",
"chats.loading": "Loading Chats",
"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
"motd.get": "Get NodeBB",
"motd.fork": "Fork",
"motd.like": "Like",
"motd.follow": "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.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
}

View File

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

View File

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

View File

@@ -0,0 +1,8 @@
{
"title": "Notifications",
"back_to_home": "Back to NodeBB",
"outgoing_link": "Outgoing Link",
"outgoing_link_message": "You are now leaving",
"continue_to": "Continue to",
"return_to": "Return to "
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -1,4 +1,5 @@
{
"title": "Recent",
"day": "Day",
"week": "Week",
"month": "Month"

View File

@@ -12,5 +12,7 @@
"confirm_password": "Confirm Password",
"confirm_password_placeholder": "Confirm Password",
"register_now_button": "Register Now",
"alternative_registration": "Alternative Registration"
"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,13 @@
{
"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.",
"password_reset_sent": "Password Reset Sent",
"invalid_email": "Invalid Email / Email does not exist!"
}

View File

@@ -0,0 +1,55 @@
{
"topic": "Topic",
"topics": "Topics",
"no_topics_found": "No topics found!",
"profile": "Profile",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Be notified of new replies in this topic",
"quote": "Quote",
"reply": "Reply",
"edit": "Edit",
"delete": "Delete",
"move": "Move",
"fork": "Fork",
"banned": "banned",
"link": "Link",
"share": "Share",
"tools": "Tools",
"flag": "Flag",
"flag_title":"Flag this post for moderation",
"thread_tools.title": "Thread Tools",
"thread_tools.markAsUnreadForAll": "Mark Unread",
"thread_tools.pin": "Pin Thread",
"thread_tools.lock": "Lock Thread",
"thread_tools.move": "Move Thread",
"thread_tools.fork": "Fork Thread",
"thread_tools.delete": "Delete Thread",
"load_categories": "Loading Categories",
"disabled_categories_note": "Disabled Categories are greyed out",
"confirm_move": "Move",
"confirm_fork": "Fork",
"favourite": "Favourite",
"favourites": "Favourites",
"favourites.not_logged_in.title": "Not Logged In",
"favourites.not_logged_in.message": "Please log in in order to favourite this post",
"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_post": "Move Post",
"fork_topic": "Fork Topic",
"topic_will_be_moved_to": "This topic will be moved to the category",
"fork_topic_instruction": "Click the posts you want to fork",
"fork_no_pids": "No posts selected!",
"fork_success": "Succesfully forked topic!",
"reputation": "Reputation",
"posts": "Posts"
}

View File

@@ -1,4 +1,5 @@
{
"title": "Unread",
"no_unread_topics": "There are no unread topics.",
"mark_all_read": "Mark all as Read",
"load_more": "Load More"

View File

@@ -0,0 +1,42 @@
{
"banned": "Banned",
"offline": "Offline",
"username": "User Name",
"email": "Email",
"fullname": "Full Name",
"website": "Website",
"location": "Location",
"age": "Age",
"joined": "Joined",
"lastonline": "Last Online",
"profile_views": "Profile views",
"reputation": "Reputation",
"posts": "Posts",
"favourites":"Favourites",
"followers": "Followers",
"following": "Following",
"signature": "Signature",
"gravatar": "Gravatar",
"birthday": "Birthday",
"change_picture": "Change Picture",
"edit": "Edit",
"uploaded_picture": "Uploaded Picture",
"upload_new_picture": "Upload New Picture",
"change_password": "Change Password",
"confirm_password": "Confirm Password",
"password": "Password",
"upload_picture": "Upload picture",
"upload_a_picture": "Upload a picture",
"image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
"settings": "Settings",
"show_email": "Show My Email",
"has_no_follower": "This user doesn't have any followers :(",
"follows_no_one": "This user isn't following anyone :(",
"email_hidden": "Email Hidden",
"hidden": "hidden"
}

View File

@@ -0,0 +1,14 @@
{
"new_topic_button": "Nuevo Tema",
"no_topics": "<strong>No hay temas en esta categoría.</strong><br />Por que no te animas y publicas uno?",
"sidebar.recent_replies": "Respuestas recientes",
"sidebar.active_participants": "Miembros más activos",
"sidebar.moderators": "Moderadores",
"posts": "respuestas",
"views": "visitas",
"posted": "posted",
"browsing": "viendo ahora",
"no_replies": "Nadie ha respondido aún",
"replied": "respondio",
"last_edited_by": "ultima edición por"
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Usuarios",
"stats.topics": "Temas",
"stats.posts": "Posts",
"success": "exito!"
}

View File

@@ -0,0 +1,52 @@
{
"home": "Inicio",
"search": "Buscar",
"buttons.close": "Cerrar",
"403.title": "Acceso denegado",
"403.message": "Al parecer no tienes premisos necesarios para estar en este lugar. Tal vez puedes <a href='/login'>intentar conectarte</a>?",
"404.title": "Ups... 404, no se encontra che!",
"404.message": "Al parecer lo que estas buscando no existe. Te recomendamos que vuelvas al <a href='/''>inicio</a>.",
"500.title": "Error Interno.",
"500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
"register": "Registrarse",
"login": "Conectarse",
"logout": "Salir",
"logout.title": "Te has desconectado.",
"logout.message": "Haz sido desconectado correctamente",
"save_changes": "Guardar Cambios",
"close": "Cerrar",
"header.admin": "Admin",
"header.recent": "Recientes",
"header.unread": "No Leeidos",
"header.popular": "Popular",
"header.users": "Miembros",
"header.chats": "Chats",
"header.notifications": "Notificaciones",
"header.search": "Buscar",
"header.profile": "Perfil",
"notifications.loading": "Cargando Notificaciones",
"chats.loading": "Cargando Chats",
"motd.welcome": "Bienvenido a NodeBB, la plataforma de debate sobre el futuro.",
"motd.get": "Obtener NodeBB",
"motd.fork": "Fork",
"motd.like": "Me gusta",
"motd.follow": "Seguir",
"previouspage": "Pagina Anterior",
"nextpage": "Siguente Pagina",
"alert.success": "Exito!",
"alert.error": "Error",
"alert.banned": "Banneado",
"alert.banned.message": "Estas banneado, seras desconectado!",
"alert.unfollow": "Ya no estas siguiendo a %1!",
"alert.follow": "Estas siguiendo a %1!",
"posts": "Posts",
"views": "Visitas",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
}

View File

@@ -0,0 +1,4 @@
{
"name": "Spanish",
"code": "es"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Conectarse",
"username": "Usuario",
"password": "Contraseña",
"remember_me": "Recordarme?",
"forgot_password": "Olvidaste tu contraseña?",
"alternative_logins": "Conexiones Alternativas",
"failed_login_attempt": "Error al loguearte, intenta de nuevo.",
"login_successful": "Te has conectado con exito!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Chatear con <span id='chat-with-name'></span>",
"chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar",
"chat.send": "Enviar",
"chat.no_active": "No tiene conversaciones activas."
}

View File

@@ -0,0 +1,8 @@
{
"title": "Notificaciones",
"back_to_home": "Volver al Inicio",
"outgoing_link": "Link Externo",
"outgoing_link_message": "Estas saliendo del sitio",
"continue_to": "Continuar",
"return_to": "Volver a "
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -0,0 +1,6 @@
{
"title": "Reciente",
"day": "Día",
"week": "Semana",
"month": "Mes"
}

View File

@@ -0,0 +1,18 @@
{
"register": "Registrase",
"help.email": "Por defecto, tu email será oculto al publico.",
"help.username_restrictions": "El nombre de usuario debe tener entre %1 y %2 caracteres. Los miembros pueden responderte escribiendo @<span id='yourUsername'>usuario</span>.",
"help.minimum_password_length": "Tu contraseña debe tener al menos %1 caracteres.",
"email_address": "Email",
"email_address_placeholder": "Escribe tu email",
"username": "Usuario",
"username_placeholder": "Escribe tu usuario",
"password": "Contraseña",
"password_placeholder": "Escribe tu Contraseña",
"confirm_password": "Confirmar Contraseña",
"confirm_password_placeholder": "Confirmar Contraseña",
"register_now_button": "Registrarme ahora",
"alternative_registration": "Otros metodos interesantes para registrarse",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

View File

@@ -0,0 +1,13 @@
{
"reset_password": "Resetear Contraseña",
"update_password": "Actualizar contraseña",
"password_changed.title": "Contraseña editada",
"password_changed.message": "<p>La contraseña fue modificada con exito, por favor <a href=\"/login\">conectate de nuevo</a>.",
"wrong_reset_code.title": "Código de Reseteo Incorrecto",
"wrong_reset_code.message": "El código de reseteo ingresado no es correcto. Por favor intentalo de nuevo o <a href=\"/reset\">pide un nuevo código</a>.",
"new_password": "Nueva Contraseña",
"repeat_password": "Confirmar Contraseña",
"enter_email": "Por favor ingresa tu <strong>email</strong> y te enviaremos un email de como resetear tu cuenta.",
"password_reset_sent": "Resteo de contraseña enviado",
"invalid_email": "Email Invalido o no existe!"
}

View File

@@ -0,0 +1,47 @@
{
"topic": "Tema",
"topics": "Temas",
"no_topics_found": "No se encontraron temas!",
"profile": "Perfil",
"posted_by": "Posted by",
"chat": "Chat",
"notify_me": "Seras notificado cuando haya nuevas respuestas en este tema",
"quote": "Citar",
"reply": "Responder",
"edit": "Editar",
"delete": "Borrar",
"move": "Mover",
"fork": "Forkear",
"banned": "banneado",
"link": "Link",
"share": "Compartir",
"tools": "Herramientas",
"flag": "Reportar",
"flag_title": "Reportar este post a los moderadores",
"thread_tools.title": "Herramientas del Tema",
"thread_tools.markAsUnreadForAll": "Marcar como no leido",
"thread_tools.pin": "Poner Sticky",
"thread_tools.lock": "Cerrar Tema",
"thread_tools.move": "Mover Tema",
"thread_tools.fork": "Forkear Tema",
"thread_tools.delete": "Borrar Tema",
"load_categories": "Cargando Categorias",
"disabled_categories_note": "Las categorías deshabilidas estan en gris",
"confirm_move": "Mover",
"confirm_fork": "Forkear",
"favourite": "Favorito",
"favourites": "Favoritos",
"favourites.not_logged_in.title": "No estas conectado :(",
"favourites.not_logged_in.message": "Por favor, conectate para agregar a favorito este post.",
"favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!",
"loading_more_posts": "Cargando más posts",
"move_topic": "Mover Tema",
"move_post": "Mover post",
"fork_topic": "Forkear Tema",
"topic_will_be_moved_to": "Este tema sera movido a la categoría",
"fork_topic_instruction": "Click en los posts que quieres forkear",
"fork_no_pids": "No seleccionaste posts!",
"fork_success": "Forkeado con exito!",
"reputation": "Reputación",
"posts": "Posts"
}

View File

@@ -0,0 +1,6 @@
{
"title": "No leeido",
"no_unread_topics": "No hay temas nuevos para leer.",
"mark_all_read": "Marcar todo como leeido",
"load_more": "Cargar más"
}

View File

@@ -0,0 +1,37 @@
{
"banned": "Banneado",
"offline": "Desconectado",
"username": "Nombre de Usuario",
"email": "Email",
"fullname": "Nombre Completo",
"website": "Website",
"location": "Ubicación",
"age": "Edad",
"joined": "Registro",
"lastonline": "Última vez online",
"profile_views": "Visitas en su perfil",
"reputation": "Reputación",
"posts": "Posts",
"favourites": "Favourites",
"followers": "Seguidores",
"following": "Siguiendo",
"signature": "Firma",
"gravatar": "Gravatar",
"birthday": "Cumpleaños",
"change_picture": "Cambiar Foto",
"edit": "Editar",
"uploaded_picture": "Fotos Cargadas",
"upload_new_picture": "Cargar Nueva Foto",
"change_password": "Cambiar Contraseña",
"confirm_password": "Confirmar Contraseña",
"password": "Contraseña",
"upload_picture": "Cargar foto",
"upload_a_picture": "Cargar una foto",
"image_spec": "Solo puedes usar PNG, JPG, o GIF hasta 256kb.",
"settings": "Settings",
"show_email": "Mostrar mi Email",
"has_no_follower": "Este miembro no tiene seguidores :(",
"follows_no_one": "Este miembro no sigue a nadie, que pena :(",
"email_hidden": "Email Oculto",
"hidden": "oculto"
}

View File

@@ -0,0 +1,9 @@
{
"latest_users": "Ultimos Miembros",
"top_posters": "Top Posteadores",
"most_reputation": "Mayor Reputación",
"online": "Conectados",
"search": "Buscar",
"enter_username": "Ingresa el nombre de usuario para buscar",
"load_more": "Cargar más"
}

View File

@@ -0,0 +1,14 @@
{
"new_topic_button": "Aloita uusi keskustelu.",
"no_topics": "<strong>Tällä aihealueella ei ole yhtään viestiketjua.</strong><br />Miksi et aloittaisi yhtä?",
"sidebar.recent_replies": "Viimeisimmät vastaukset",
"sidebar.active_participants": "Aktiiviset keskustelijat",
"sidebar.moderators": "Moderaattorit",
"posts": "viestit",
"views": "katsottu",
"posted": "lähetetty",
"browsing": "selaamassa",
"no_replies": "Kukaan ei ole vastannut",
"replied": "vastasi",
"last_edited_by": "viimeksi muokannut "
}

View File

@@ -0,0 +1,7 @@
{
"stats.online": "Online",
"stats.users": "Käyttäjää",
"stats.topics": "Viestiketjua",
"stats.posts": "Viestiä",
"success": "onnistunut"
}

View File

@@ -0,0 +1,52 @@
{
"home": "Etusivu",
"search": "Etsi",
"buttons.close": "Sulje",
"403.title": "Pääsy kielletty",
"403.message": "Olet päätynyt sivulle jolle sinulla ei ole tarvittavia oikeuksia. Ehkäpä sinun tulisi <a href='/login'>kirjaudu sisään</a>?",
"404.title": "Sivua ei löydy",
"404.message": "Olet päätynyt sivulle jota ei ole olemassa. Palaa <a href='/'>etusivulle</a>.",
"500.title": "Sisäinen virhe.",
"500.message": "Oho! Jotain meni pieleen!",
"register": "Rekisteröidy",
"login": "Kirjaudu",
"logout": "Kirjaudu ulos",
"logout.title": "Olet nyt kirjaunut ulos.",
"logout.message": "Olet onnistuneesti kirjautunut ulos NodeBB:stä",
"save_changes": "Tallenna muutokset",
"close": "Sulje",
"header.admin": "Admin",
"header.recent": "Viimeisimmät",
"header.unread": "Lukemattomat",
"header.popular": "Popular",
"header.users": "Käyttäjät",
"header.chats": "Chats",
"header.notifications": "Notifications",
"header.search": "Etsi",
"header.profile": "Profiili",
"notifications.loading": "Ladataan ilmoituksia.",
"chats.loading": "Ladataan keskusteluja",
"motd.welcome": "Tervetuloa NodeBB:n, tulevaisuuden keskustelualustalle.",
"motd.get": "Hanki NodeBB",
"motd.fork": "Fork",
"motd.like": "Tykkää",
"motd.follow": "Seuraa",
"previouspage": "Previous Page",
"nextpage": "Next Page",
"alert.success": "Success",
"alert.error": "Error",
"alert.banned": "Banned",
"alert.banned.message": "You are banned you will be logged out!",
"alert.unfollow": "You are no longer following %1!",
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts",
"online": "Online",
"away": "Away",
"dnd": "Do not Disturb",
"invisible": "Invisible",
"offline": "Offline"
}

View File

@@ -0,0 +1,4 @@
{
"name": "Finnish",
"code": "fi"
}

View File

@@ -0,0 +1,10 @@
{
"login": "Kirjaudu sisään",
"username": "Käyttäjän nimi",
"password": "Salasana",
"remember_me": "Muista minut?",
"forgot_password": "Unohtuiko salasana?",
"alternative_logins": "Vaihtoehtoiset sisäänkirjaantumistavat",
"failed_login_attempt": "Sisäänkirjaantuminen epäonnistui, ole hyvä ja yritä uudestaan.",
"login_successful": "Olet onnistuneesti kirjautunut sisään!"
}

View File

@@ -0,0 +1,6 @@
{
"chat.chatting_with": "Juttele <span id=\"chat-with-name\"></span> kanssa",
"chat.placeholder": "kirjoita viestisi tähän, paina enter lähettääksesi",
"chat.send": "Lähetä",
"chat.no_active": "Sinulla ei ole aktiivisiä keskusteluita."
}

View File

@@ -0,0 +1,8 @@
{
"title": "Ilmoitukset",
"back_to_home": "Takaisin NodeBB:n",
"outgoing_link": "Ulkopuolinen linkki",
"outgoing_link_message": "Olet nyt poistumassa",
"continue_to": "Jatka",
"return_to": "Palaa "
}

View File

@@ -0,0 +1,12 @@
{
"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"
}

View File

@@ -0,0 +1,6 @@
{
"title": "Recent",
"day": "Päivä",
"week": "Viikko",
"month": "Kuukausi"
}

View File

@@ -0,0 +1,18 @@
{
"register": "Rekisteröidy",
"help.email": "Oletuksena sähköposti osoitettasi ei näytetä muille .",
"help.username_restrictions": "Yksilöllinen käyttäjänimi, pitää olla %1 - %2 merkkiä pitkä. Toiset voivat mainita sinut @<span id='yourUsername'>käyttäjänimi</span>.",
"help.minimum_password_length": "Salasanasi pitää olla vähintään %1 merkin mittainen.",
"email_address": "Sähköposti",
"email_address_placeholder": "Anna sähköpostiosoitteesi",
"username": "Käyttäjänimi",
"username_placeholder": "Syötä käyttäjänimesi",
"password": "Salasana",
"password_placeholder": "Syötä salasanasi",
"confirm_password": "Vahvista salasana",
"confirm_password_placeholder": "Vahvista salasana",
"register_now_button": "Rekisteröidy nyt",
"alternative_registration": "Vaihtoehtoiset rekisteröitymistavat",
"terms_of_use": "Terms of Use",
"agree_to_terms_of_use": "I agree to the Terms of Use"
}

View File

@@ -0,0 +1,13 @@
{
"reset_password": "Palauta salasana",
"update_password": "Päivitä salasana",
"password_changed.title": "Salasana muutettu",
"password_changed.message": "<p>Salasana palautettu onnistunesti, ole hyvä ja <a href=\"/login\">kirjaudu sisään uudestaan.</a>.",
"wrong_reset_code.title": "Väärä palautuskoodi",
"wrong_reset_code.message": "Annettu palautuskoodi oli väärä. Ole hyvä yritä uudelleen, tai <a href=\"/reset\">pyydä uutta palautuskoodia</a>.",
"new_password": "Uusi salasana",
"repeat_password": "Vahvista salasana",
"enter_email": "Syötä <strong>sähköpostiosoitteesi</strong> niin me lähetämänne Sinulle ohjeet kuinka voit palauttaa käyttäjätilisi.",
"password_reset_sent": "Salasanan palautus lähetetty",
"invalid_email": "Väärä sähköpostiosoite / Sähköpostiosoitetta ei ole!"
}

View File

@@ -0,0 +1,47 @@
{
"topic": "Keskustelu",
"topics": "Keskustelut",
"no_topics_found": "Keskusteluja ei löytynyt!",
"profile": "Profiili",
"posted_by": "Posted by",
"chat": "Juttele",
"notify_me": "Ilmoita uusista viesteistä tässä keskustelussa",
"quote": "Lainaa",
"reply": "Vastaa",
"edit": "Muokkaa",
"delete": "Poista",
"move": "Siirrä",
"fork": "Haaroita",
"banned": "banned",
"link": "Linkkaa",
"share": "Jaa",
"tools": "Työkalut",
"flag": "Flag",
"flag_title": "Flag this post for moderation",
"thread_tools.title": "Ketjun työkalut",
"thread_tools.markAsUnreadForAll": "Merkitse luetuiksi",
"thread_tools.pin": "Tee ketjusta pysyvä",
"thread_tools.lock": "Lukitse ketju",
"thread_tools.move": "Siirrä ketju",
"thread_tools.fork": "Haaroita ketju",
"thread_tools.delete": "Poista ketju",
"load_categories": "Ladataan aihealueita",
"disabled_categories_note": "Käytöstä poistetut aihealueetta ovat harmaina",
"confirm_move": "Siirrä",
"confirm_fork": "Haaroita",
"favourite": "Suosikki",
"favourites": "Suosikit",
"favourites.not_logged_in.title": "Ei kirjaantuneena sisään",
"favourites.not_logged_in.message": "Kirjaudu sisään jotta voit lisätä tämän viestin suosikkeihisi.",
"favourites.has_no_favourites": "Sinulla ei ole yhtään suosikkiviestiä.",
"loading_more_posts": "Ladataan lisää viestejä",
"move_topic": "Siirrä keskustelu",
"move_post": "Siirrä viesti",
"fork_topic": "Haaroita keskustelu",
"topic_will_be_moved_to": "Tämä keskustelu siirretään aihealueelle ",
"fork_topic_instruction": "Klikkaa viestejä jotka haluat haaroittaa",
"fork_no_pids": "Ei valittuja viestejä!",
"fork_success": "Keskustelu haaroitettu onnistuneesti!",
"reputation": "Maine",
"posts": "Viestejä"
}

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