14494 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Julian Lam	995f8296a4	linting	2017-02-24 12:03:47 -05:00
Julian Lam	b5f8fc815e	re-allowing pluplus in for loops	2017-02-24 11:53:00 -05:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05:00
barisusakli	048eb8a320	some helper tests	2017-02-24 18:06:23 +03:00
barisusakli	04b07e292c	thumb tests	2017-02-24 17:34:34 +03:00
barisusakli	ca1fe557c7	topic controller tests	2017-02-24 16:26:19 +03:00
barisusakli	3a87f2566a	more group tests	2017-02-24 15:05:00 +03:00
barisusakli	b7d5bc7dc8	more group tests	2017-02-24 12:54:16 +03:00
Misty (Bot)	3509e12748	Latest translations and fallbacks	2017-02-24 09:22:21 +00:00
Peter Jaszkowiak	f7a964474d	Ignore log files	2017-02-23 20:00:30 -07:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Peter Jaszkowiak	ee9d7584e4	Fix test, misc	2017-02-23 17:29:08 -07:00
Julian Lam	cfc8884c9c	Merge pull request #5475 from NodeBB/favicon-fix ... Fixes #5474	2017-02-23 17:11:11 -05:00
Peter Jaszkowiak	8b533bb431	Fixes #5474	2017-02-23 14:19:11 -07:00
Julian Lam	4163ce0218	Merge pull request #5473 from pichalite/acp-tags ... ACP manage tags page UI changes	2017-02-23 15:49:32 -05:00
pichalite	1d5b3cc73f	ACP manage tags page UI changes	2017-02-23 20:45:05 +00:00
Barış Soner Uşaklı	35ff71c37d	more tests	2017-02-23 23:06:00 +03:00
Julian Lam	14398a2d90	up markdown	2017-02-23 14:55:14 -05:00
Barış Soner Uşaklı	b4a32ee96f	style changes	2017-02-23 22:42:45 +03:00
Julian Lam	c09f994b0a	Merge remote-tracking branch 'origin/master' into develop	2017-02-23 14:24:15 -05:00
Julian Lam	a9f144230e	Merge branch 'master' into develop	2017-02-23 13:57:46 -05:00
Barış Soner Uşaklı	743f758f75	set origin header to url	2017-02-23 21:29:28 +03:00
Julian Lam	25f6293821	using io.origins instead	2017-02-23 13:26:52 -05:00
Julian Lam	91d3ce1abc	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:26:52 -05:00
Barış Soner Uşaklı	c168ed43d4	up build timeout	2017-02-23 21:25:50 +03:00
psychobunny	7b7565ee8e	Merge pull request #5468 from pichalite/acp-groups ... ACP manage groups UI updates	2017-02-23 13:22:57 -05:00
Julian Lam	a4c00663ff	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:13:59 -05:00
Julian Lam	8154e29ad5	Merge branch 'master' into develop	2017-02-23 13:08:20 -05:00
Julian Lam	c1b1ff5c6e	adding origin to new local ioConfig var, as per @barisusakli, re: #5472	2017-02-23 12:47:06 -05:00
Barış Soner Uşaklı	9079ee5b14	style	2017-02-23 20:44:23 +03:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
psychobunny	458cbfd603	show dashboard notice if forum is running in dev mode	2017-02-23 12:14:20 -05:00
psychobunny	a2847dc851	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2017-02-23 12:01:25 -05:00
Julian Lam	d4c2fc3bc8	closes #5472	2017-02-23 11:54:51 -05:00
psychobunny	ebe5ed7560	Merge pull request #5470 from pichalite/acp-templates ... Fix ACP templates markup	2017-02-23 11:46:02 -05:00
barisusakli	0de21cb3ff	fix tab	2017-02-23 17:12:46 +03:00
barisusakli	09d0ce4778	post tests	2017-02-23 17:02:54 +03:00
barisusakli	4cd4414d19	small change	2017-02-23 15:29:35 +03:00
Barış Soner Uşaklı	026c32f32b	Merge pull request #5462 from NodeBB/minify-modules ... Minify all module scripts in production	2017-02-23 13:15:05 +02:00
Misty (Bot)	02cc988ae7	Latest translations and fallbacks	2017-02-23 09:22:14 +00:00
pichalite	aea40902b0	Fix markup in category privileges template	2017-02-23 00:28:54 +00:00
pichalite	f09f1f6ed8	Fix ACP templates markup	2017-02-23 00:20:42 +00:00
pichalite	dcb0f18422	ACP manage groups UI updates	2017-02-22 20:28:56 +00:00
Julian Lam	e887dda37a	Merge pull request #5461 from pichalite/image-dimension ... Use ACP profile image dimension setting in cropper	2017-02-22 14:53:40 -05:00
barisusakli	2dac3d2292	closes #5465, blacklist tests	2017-02-22 14:53:44 +03:00
barisusakli	5c01c7b1c7	delayed notification test	2017-02-22 13:35:05 +03:00
Julian Lam	e427f1663e	Merge pull request #5456 from NodeBB/sounds-refactor ... Sound system improvements	2017-02-21 16:14:58 -05:00
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00