3687 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Baris Soner Usakli	0c4f0dff6f	closes #962	2014-02-07 20:30:10 -05:00
Baris Soner Usakli	917458d48d	minor cleanup	2014-02-07 20:04:14 -05:00
Baris Soner Usakli	e06a7a343a	userslug for new chat messages	2014-02-07 19:29:54 -05:00
Baris Soner Usakli	7531d9dd2c	fixes username in account page	2014-02-07 16:58:56 -05:00
Baris Soner Usakli	1d5239b9a5	closes #966	2014-02-07 16:24:09 -05:00
Baris Soner Usakli	d4c2a47c8e	allow images in home and category	2014-02-07 15:00:53 -05:00
Baris Soner Usakli	e4c92880ea	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-07 13:25:21 -05:00
Baris Soner Usakli	b2d3578eac	check if callback is function	2014-02-07 13:25:14 -05:00
Julian Lam	0670382992	final pass - resolved #961	2014-02-07 12:47:19 -05:00
Baris Soner Usakli	8da065d8fd	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-07 12:28:01 -05:00
Baris Soner Usakli	9b147edb36	closes #964	2014-02-07 12:27:55 -05:00
Julian Lam	69f90c0766	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-02-07 12:11:18 -05:00
Julian Lam	f8ea87b003	issue #961 - fixed bug where if a moderators group was not found, it would cause the active users box to derp out. Also renamed the moderators priv group name	2014-02-07 12:10:46 -05:00
Baris Soner Usakli	d6780652ad	closes #960	2014-02-07 12:09:24 -05:00
Baris Soner Usakli	8efea65e87	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-07 11:45:19 -05:00
Baris Soner Usakli	72c35db6fd	cleanup in move rencet replies'	2014-02-07 11:45:13 -05:00
Julian Lam	e176abae50	started #961, first pass	2014-02-07 11:21:23 -05:00
Baris Soner Usakli	d2bed7791c	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-06 18:40:10 -05:00
Baris Soner Usakli	a142789c25	if status is not set assume online	2014-02-06 18:40:01 -05:00
psychobunny	3c863feac2	fixes translation bug with app.alert	2014-02-06 17:21:58 -05:00
Baris Soner Usakli	a1807f3e12	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-06 17:12:19 -05:00
Baris Soner Usakli	11e8fa31ab	small fix to online user visiblity	2014-02-06 17:12:13 -05:00
Julian Lam	720644b964	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-02-06 17:09:50 -05:00
Julian Lam	d360a9bcac	resolved #868	2014-02-06 17:09:36 -05:00
Baris Soner Usakli	1bde667245	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-06 16:58:50 -05:00
Baris Soner Usakli	f05dc95aa5	removed console.log	2014-02-06 16:58:43 -05:00
psychobunny	a9fbd5be8a	derp, upgrade was upvoting your own favourited posts as well	2014-02-06 16:55:41 -05:00
psychobunny	d9f61385ca	cleanup	2014-02-06 16:50:39 -05:00
psychobunny	2c81d1f2d9	half hearted deprecation warning (maybe for 0.5x?)	2014-02-06 16:50:39 -05:00
psychobunny	37affe2489	no need to use mget, app.alert already translates	2014-02-06 16:50:38 -05:00
psychobunny	1b1bdd7912	upgrade script upvotes all previously favourited posts	2014-02-06 16:50:37 -05:00
psychobunny	1e955b769b	refactoring favourites	2014-02-06 16:50:37 -05:00
psychobunny	25a6302c01	upvoting / downvoting complete	2014-02-06 16:50:36 -05:00
psychobunny	af805d3ca4	Favourites.hasVoted	2014-02-06 16:50:36 -05:00
psychobunny	d35dc2d89b	favouriting no longer affects reputation	2014-02-06 16:50:35 -05:00
psychobunny	6ffab73784	removing reputation from favourites, adding voting buttons to template	2014-02-06 16:50:34 -05:00
psychobunny	ef1fdbed71	server-side voting logic	2014-02-06 16:50:34 -05:00
psychobunny	cf3f72feb9	client-side voting logic	2014-02-06 16:50:33 -05:00
psychobunny	113e5a381b	voting en_GB lang keys	2014-02-06 16:50:33 -05:00
psychobunny	60ec23b200	upvote/downvote/unvote socket calls	2014-02-06 16:50:32 -05:00
Baris Soner Usakli	71c64de8bb	pass error to next	2014-02-06 16:35:14 -05:00
Baris Soner Usakli	493ea79a0b	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-06 16:32:16 -05:00
Baris Soner Usakli	56cdc86a37	took out userSockets, using io.sockets.clients() now'	2014-02-06 16:32:11 -05:00
Julian Lam	4e776cad96	fixing unintentional bolding in category view in Turkish language	2014-02-06 16:19:50 -05:00
Julian Lam	b7cb0d02f8	resolved #944	2014-02-06 16:02:42 -05:00
Julian Lam	1e7adda054	for #944	2014-02-06 15:58:27 -05:00
Julian Lam	f3b2771802	fixing indentation	2014-02-06 15:50:49 -05:00
Julian Lam	054fd46924	Merge branch 'master' of github.com:greynaert/NodeBB into greynaert-master	2014-02-06 15:49:48 -05:00
Julian Lam	0fd9a88a3e	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-02-06 15:45:30 -05:00
Julian Lam	f949af70ad	fixed #949	2014-02-06 15:45:21 -05:00