14347 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Barış Soner Uşaklı	c5f40e3cf5	fix indents	2017-03-01 17:42:50 +02:00
Barış Soner Uşaklı	6222b55dd8	Merge branch 'master' into assets-images-upgrade	2017-03-01 17:40:44 +02:00
barisusakli	ac84e447dc	closes #5492	2017-03-01 17:37:17 +03:00
Peter Jaszkowiak	b96b983552	Upgrade script for prepending /assets in config ... Fix for sound settings upgrade script to upgrade user sound settings even if admin settings weren't set	2017-02-28 13:57:24 -07:00
barisusakli	2e47cf4db3	intersititial test	2017-02-28 16:42:10 +03:00
barisusakli	8a0cf6c0ac	more admin socket tests	2017-02-28 15:16:49 +03:00
barisusakli	bb1045c5a0	remove unused require	2017-02-28 12:29:49 +03:00
barisusakli	ef93ef3dd4	if user does not have settings object skip	2017-02-28 12:23:42 +03:00
barisusakli	feb359f7d4	closes #5479	2017-02-27 20:16:44 +03:00
Julian Lam	8166f30b90	abort sound upgrade if no sounds set in config	2017-02-27 12:15:38 -05:00
Julian Lam	039f80c5aa	added null check for #5482	2017-02-27 10:16:16 -05:00
Julian Lam	4d8bebcd81	Merge pull request #5482 from NodeBB/sounds-fix-5476 ... Upgrade script for new sounds system	2017-02-27 10:02:23 -05:00
Peter Jaszkowiak	da3cb0492c	Verbose instead	2017-02-26 14:08:27 -07:00
Misty (Bot)	2bbf3c4f66	Latest translations and fallbacks	2017-02-26 09:22:49 +00:00
Peter Jaszkowiak	20d250bceb	Upgrade script for new sounds system	2017-02-25 23:07:43 -07:00
Julian Lam	0213ca4bb1	Merge pull request #5477 from NodeBB/sounds-fix-5476 ... Fix sounds issue	2017-02-25 22:08:31 -05: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	347761173a	helpers tests	2017-02-25 15:10:23 +03:00
Misty (Bot)	a22909dbe8	Latest translations and fallbacks	2017-02-25 09:22:36 +00: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
Misty (Bot)	00a67b97ce	Incremented version number	2017-02-24 13:47:46 -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
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	c1b1ff5c6e	adding origin to new local ioConfig var, as per @barisusakli, re: #5472	2017-02-23 12:47:06 -05:00