14539 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	827980e129	Merge branch 'master' into develop	2017-03-01 11:28:48 -05:00
Julian Lam	b85dcb2570	lint	2017-03-01 11:28:07 -05:00
Julian Lam	7c21152f2e	Merge remote-tracking branch 'origin/master' into develop	2017-03-01 10:55:15 -05:00
Julian Lam	5411b4c234	Merge pull request #5464 from NodeBB/assets-images-upgrade ... Upgrade script for prepending `/assets` in config URLs	2017-03-01 10:54:33 -05:00
Barış Soner Uşaklı	fecdbc969f	fix set call	2017-03-01 17:47:59 +02:00
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
Julian Lam	45c479a101	Merge branch 'master' into develop	2017-02-28 12:07:56 -05: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
psychobunny	43bf422cba	Merge pull request #5487 from NodeBB/posts-votes-sorted-set ... posts:votes sorted set	2017-02-27 17:07:46 -05:00
psychobunny	06eabbc507	typo	2017-02-27 17:07:17 -05:00
psychobunny	7bdbe7d9db	wrong date	2017-02-27 17:04:36 -05:00
psychobunny	5d9b6062d6	simpler method for getting pids	2017-02-27 17:03:40 -05:00
psychobunny	86a8b8ab93	posts:votes sorted set	2017-02-27 15:27:07 -05:00
barisusakli	feb359f7d4	closes #5479	2017-02-27 20:16:44 +03:00
Julian Lam	4a851e0a85	Merge branch 'master' into develop	2017-02-27 12:15:48 -05:00
Julian Lam	8166f30b90	abort sound upgrade if no sounds set in config	2017-02-27 12:15:38 -05:00
Julian Lam	022823f57c	Merge branch 'master' into develop	2017-02-27 10:16:27 -05:00
Julian Lam	039f80c5aa	added null check for #5482	2017-02-27 10:16:16 -05:00
Julian Lam	58cbf44143	Merge branch 'master' into develop	2017-02-27 10:05:20 -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
Julian Lam	b1ceec7571	Merge remote-tracking branch 'origin/master' into develop	2017-02-25 21:43:50 -05: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	15542f1382	removing old tests that got added back in due to git being silly	2017-02-24 13:30:07 -05:00
Julian Lam	6e7b505ea7	more linting	2017-02-24 12:55:31 -05:00
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