8605 Commits

Author	SHA1	Message	Date
Julian Lam	a49e647de3	fixes #5545 again	2017-03-24 14:46:51 -04:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Julian Lam	31b6d47f88	fixes #5545	2017-03-24 14:36:54 -04:00
Peter Jaszkowiak	a7677063de	Rename to uniqueUsername	2017-03-24 10:33:38 -06:00
Peter Jaszkowiak	642306e69c	Fix #5543	2017-03-24 10:28:18 -06:00
Julian Lam	f2653cd380	broader error handling for empty notif creation return	2017-03-23 14:35:29 -04:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04:00
Julian Lam	ce64db8d71	fix logic error that caused upgrade scripts to always be skipped	2017-03-21 21:10:46 -04:00
Julian Lam	a82a50baa6	fix date and name in config urls upgrade script	2017-03-21 21:10:20 -04:00
Julian Lam	b6134b160e	moved auto_reconnect out of socketOptions object for Mongo	2017-03-21 15:55:24 -04:00
Ben Lubar	7f713ee822	Admin option to allow all users to view votes (#5534) ... * Admin option to allow all users to view votes * Fix </strong></strong>	2017-03-17 14:08:47 -04:00
Julian Lam	e4168f4a87	linting	2017-03-17 13:35:24 -04:00
Julian Lam	c805d55b85	creating notification for flag assignment	2017-03-17 13:16:16 -04:00
Julian Lam	7f8f197e60	Merge branch 'master' into develop	2017-03-16 14:58:39 -04:00
barisusakli	449352d899	wait for all routes to load before listening	2017-03-16 11:24:36 +03:00
Julian Lam	2ef71e22aa	Merge pull request #5532 from NodeBB/patch_5491 ... Fix tests for #5491 fix	2017-03-15 23:11:09 -04:00
Peter Jaszkowiak	8f8babf90b	Fix tests	2017-03-15 20:09:07 -07:00
Julian Lam	23d4497c73	Merge pull request #5531 from NodeBB/patch_5491 ... Fix #5491	2017-03-15 23:01:42 -04:00
Peter Jaszkowiak	8c45411ccc	Fix #5491	2017-03-15 20:00:05 -07:00
psychobunny	f7d1e58d65	improved threaded view design... again	2017-03-15 18:56:12 -04:00
Julian Lam	69dd1e3aca	Merge branch 'master' into develop	2017-03-15 14:39:18 -04:00
Julian Lam	33bf930bb9	fixes #5528	2017-03-15 13:49:35 -04:00
barisusakli	8d7283e6c7	dont minify if file ends with .min.js #5529	2017-03-15 20:33:33 +03:00
Julian Lam	1ebbbdd3f9	Merge remote-tracking branch 'origin/master' into develop	2017-03-15 10:01:00 -04:00
barisusakli	6a4b082080	closes #5524	2017-03-15 12:19:09 +03:00
barisusakli	cb92ebb3be	fix call	2017-03-14 23:29:26 +03:00
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
Julian Lam	25518bdd18	removed unused vars	2017-03-13 16:54:29 -04:00
Julian Lam	c323a813c0	added logic to handle backwards compatibility with old schemaDate method of tracking upgrade scripts	2017-03-13 16:45:05 -04:00
barisusakli	90b8a3afd0	refactor topics/delete.js	2017-03-12 21:38:53 +03:00
barisusakli	0478e9c98c	lint	2017-03-11 19:37:34 +03:00
barisusakli	37be43a3c5	async	2017-03-11 18:32:00 +03:00
barisusakli	27b030a71c	test for #5523	2017-03-11 16:43:31 +03:00
Julian Lam	cf0532168e	Merge remote-tracking branch 'origin/develop' into upgrades-refactor	2017-03-10 19:08:33 -05:00
Julian Lam	34d24c4fd4	Refactored upgrade scripts once more (for great justice!) #5467	2017-03-10 19:07:42 -05:00
Julian Lam	f0059ec723	fixed paths in upgrade scripts	2017-03-10 19:07:05 -05:00
Julian Lam	e309175989	eslinted template	2017-03-10 16:37:16 -05:00
Julian Lam	fc13776f26	moving files from src/upgrades to individual folders by version	2017-03-10 16:36:22 -05:00
Julian Lam	4ba795b5f2	adding fallbacks for meta/config.topicsPerPage	2017-03-10 16:29:40 -05:00
Julian Lam	33d1cc6d0f	replace erroring line with operator-assignment	2017-03-10 15:56:45 -05:00
Julian Lam	2fd4edc0e2	Merge branch 'develop' into upgrades-refactor	2017-03-10 15:44:40 -05:00
Julian Lam	860999fa6c	Merge remote-tracking branch 'origin/master' into develop	2017-03-10 15:44:29 -05:00
psychobunny	62f445ad7f	ACP: added tagsinput to other fields that are "comma separated"	2017-03-10 14:36:35 -05:00
psychobunny	debe34b96c	better styling for tagsinput in ACP and added it to general -> keywords	2017-03-10 14:25:37 -05:00
barisusakli	3b41c40b93	refactor deleter code to use unixtimestamp	2017-03-10 22:22:08 +03:00
psychobunny	447b7b02ca	use tagsinput for #5439 instead	2017-03-10 14:12:17 -05:00
psychobunny	f2eb4b8083	closes #5439	2017-03-10 14:03:07 -05:00
psychobunny	b3f8428691	closes #5510	2017-03-10 13:36:24 -05:00
psychobunny	a67d48e719	#5513 (#5520) ... closes #5513	2017-03-10 12:50:19 -05:00