21985 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	a2fecf5ae4	Merge remote-tracking branch 'origin/master' into flagging-refactor	2016-12-06 16:12:42 -05:00
Julian Lam	9f9051026b	more work on #5232	2016-12-06 16:11:56 -05:00
Barış Soner Uşaklı	a0d32e953a	Merge pull request #5261 from stuwil/fix-twitter-share-text ... Avoid HTML codes in Twitter social share text	2016-12-06 23:04:31 +02:00
Stuart Williams	647d0e0a75	Avoid encoding HTML in Twitter social share text	2016-12-06 15:49:34 -05:00
Barış Soner Uşaklı	d468b6c466	Merge pull request #5260 from stuwil/fix-5259 ... Generate Post social share links with relative URL	2016-12-06 21:20:18 +02:00
Stuart Williams	cafc5cd891	closes #5259	2016-12-06 14:08:04 -05:00
psychobunny	b0126267a8	closes #5249	2016-12-06 11:48:59 -05:00
Peter Jaszkowiak	8ca98625b9	Key through search results	2016-12-05 18:32:17 -07:00
Peter Jaszkowiak	f1cfed50a1	Translate skins and themes fully	2016-12-05 18:31:58 -07:00
Peter Jaszkowiak	5843e8dd77	Fix Translator to work with namespace paths	2016-12-05 17:55:42 -07:00
Peter Jaszkowiak	9fd64549a3	Use async instead of Promises	2016-12-05 17:55:04 -07:00
Julian Lam	cd3002e812	removed user flag reset method and associated socket call from ACP	2016-12-05 15:52:01 -05:00
Julian Lam	88958049eb	added some more filters, and appending event to history on flag creation ... issue #5232	2016-12-05 15:33:08 -05:00
Julian Lam	8e1d441e20	Added some quick filters, #5232	2016-12-05 12:40:25 -05:00
Julian Lam	b7217e8841	Merge remote-tracking branch 'origin/master' into flagging-refactor	2016-12-05 11:28:10 -05:00
Julian Lam	777f15941f	closes #5251	2016-12-05 10:45:06 -05:00
Julian Lam	252574346e	tweak gitignores, closes #5250	2016-12-05 10:32:44 -05:00
Julian Lam	ad732935fb	closes #5254	2016-12-05 10:23:28 -05:00
barisusakli	cbd6853ccb	notif controller test	2016-12-05 17:16:28 +03:00
barisusakli	8691256a67	fix post move test	2016-12-05 16:30:30 +03:00
barisusakli	7d47f4b067	tag tests	2016-12-05 15:09:13 +03:00
Moritz Schmidt	e8e33a8a23	ZSET scores are float: parseInt => parseFloat ... In Redis, scores of sorted sets can be floats – so we should use `parseFloat` instead of `parseInt` when converting from string to number. Should not lead to #4939 again, as `new Date()` works regardless of whether it's being passed a float or integer.	2016-12-04 17:41:27 +01:00
Julian Lam	753d4b0275	wrapped up basic functionality of list and detail for flags, filter support. #5232	2016-12-02 15:28:28 -05:00
Julian Lam	9129597811	#5232 some tweaks to flag history saving	2016-12-02 12:51:39 -05:00
Julian Lam	169defd194	#5232, update flag history to save new value	2016-12-02 12:34:58 -05:00
Julian Lam	0724bee6c6	removed deprecated dismiss methods	2016-12-02 12:10:19 -05:00
Julian Lam	20fa8ebf76	simplified flags.get a tad	2016-12-02 11:24:12 -05:00
Julian Lam	dde3d2b135	Merge remote-tracking branch 'origin/master' into flagging-refactor	2016-12-02 11:01:35 -05:00
Julian Lam	33ff5e09bb	updated revoke session middleware to allow self or admin or global mod invocation, tweaked tests a bit	2016-12-02 10:50:47 -05:00
barisusakli	aad9a39f02	move post test	2016-12-02 18:22:30 +03:00
barisusakli	55416911f7	category tests	2016-12-02 18:08:15 +03:00
Julian Lam	23cdeeb344	linting :shipit:	2016-12-02 10:07:33 -05:00
Julian Lam	a1b49a98e7	locking down session deletion route to admins and global mods only	2016-12-02 09:49:52 -05:00
Julian Lam	839a0efc0a	one more language string for #5232	2016-12-02 09:49:25 -05:00
barisusakli	69b766bbc8	more tests	2016-12-02 17:05:46 +03:00
barisusakli	1440139903	more tests	2016-12-02 16:10:07 +03:00
barisusakli	091f459f5e	search socket test	2016-12-02 14:58:13 +03:00
barisusakli	4b6e4f085d	more tests ... group cover upload tests registration approval queue tests	2016-12-02 14:05:59 +03:00
Julian Lam	68f8f57a34	upped composer version	2016-12-01 22:19:50 -05:00
Julian Lam	c36fe3389e	Merge remote-tracking branch 'origin/master' into flagging-refactor	2016-12-01 17:06:02 -05:00
Julian Lam	22eeabc5c7	new strings for empty notes or history, #5232	2016-12-01 16:36:30 -05:00
psychobunny	a54a9b512a	v1.4.0	2016-12-01 16:29:45 -05:00
Julian Lam	f1d144f15e	history appending, finished up notes, #5232	2016-12-01 16:22:10 -05:00
psychobunny	bcb3903446	priv table headers	2016-12-01 16:07:40 -05:00
Peter Jaszkowiak	5223bb5191	Merge branch 'master' of github.com:nodebb/nodebb	2016-12-01 13:40:07 -07:00
Julian Lam	d9d60c20bd	flag updating and note appending, #5232	2016-12-01 11:42:06 -05:00
Julian Lam	709a7ff7f0	fixed issue with getUsersData not actually returning the same number of elements as was passed-in	2016-12-01 11:04:37 -05:00
barisusakli	fb42b83e1b	remove hardcoded value @pichalite	2016-12-01 18:59:50 +03:00
barisusakli	7f90e31a38	more socket user tests	2016-12-01 18:59:24 +03:00
barisusakli	c3980d0c2e	follow tests	2016-12-01 18:36:43 +03:00