9005 Commits

Author	SHA1	Message	Date
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	ab85ef6b7b	fixed issue where back button stopped ajaxifying internally.	2014-01-24 12:29:11 -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	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
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	3793ddc2e8	fixes user tooltips on infinit load	2014-01-23 21:35:25 -05:00
Julian Lam	2af14e47b1	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-01-23 16:20:46 -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
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	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
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	9393a39452	fixes translation in recent	2014-01-21 19:07:03 -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
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	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	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