Commit Graph

3708 Commits

Author SHA1 Message Date
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 v0.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