8072 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	20d250bceb	Upgrade script for new sounds system	2017-02-25 23:07:43 -07:00
Peter Jaszkowiak	007051c14c	Fix #5476	2017-02-25 19:51:49 -07:00
barisusakli	0e7740af32	fix tests for subfolder installs	2017-02-25 16:04:04 +03:00
barisusakli	6aa8c8aa94	merge	2017-02-25 11:17:56 +03:00
barisusakli	fa08498a9e	closes #5480	2017-02-25 11:01:35 +03:00
psychobunny	2a311d2ff6	printing initialization message twice for some reason	2017-02-24 16:37:30 -05:00
psychobunny	09a1ed0869	Merge pull request #5371 from kingjan1999/master ... Update FontAwesome to 4.7.0	2017-02-24 16:33:38 -05:00
Julian Lam	995f8296a4	linting	2017-02-24 12:03:47 -05:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05: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
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
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ı	b4a32ee96f	style changes	2017-02-23 22:42:45 +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
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	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
psychobunny	458cbfd603	show dashboard notice if forum is running in dev mode	2017-02-23 12:14:20 -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
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
Barış Soner Uşaklı	89380824f8	navigation test	2017-02-21 17:00:54 +03:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Peter Jaszkowiak	beb652ee43	Move minifier.js to src/meta	2017-02-20 00:44:04 -07:00
Peter Jaszkowiak	9b1068e868	Minify all module scripts in production	2017-02-19 02:07:19 -07:00
pichalite	a99572fc48	Use ACP profile image dimension setting in cropper	2017-02-19 08:30:30 +00:00
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	2017-02-18 19:14:39 -07:00
Peter Jaszkowiak	b227297ef3	ESlint no-use-before-define	2017-02-18 18:55:33 -07:00
Peter Jaszkowiak	93f38d4f30	ESlint no-multi-assign ... and max-nested-callbacks, no-mixed-requires, max-statements-per-line	2017-02-18 18:06:28 -07:00
Barış Soner Uşaklı	1b43faba1a	closes #5441	2017-02-19 02:44:38 +03:00
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00
Peter Jaszkowiak	c18808fdeb	ESlint no-useless-concat, no-mixed-spaces-and-tabs	2017-02-18 14:42:15 -07:00