31695 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	7f8f197e60	Merge branch 'master' into develop	2017-03-16 14:58:39 -04:00
Misty (Bot)	da1858f674	Incremented version number	2017-03-16 14:58:24 -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	250bb4b011	fixed leftover merge conflict artifact	2017-03-15 10:23:25 -04:00
Julian Lam	1ebbbdd3f9	Merge remote-tracking branch 'origin/master' into develop	2017-03-15 10:01:00 -04:00
barisusakli	ff4c7ab3bb	fix tests	2017-03-15 12:49:08 +03: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	6d444ccacf	Merge pull request #5526 from NodeBB/patch_5346 ... Fix #5346	2017-03-14 09:52:42 -04:00
Misty (Bot)	2106050bdc	Latest translations and fallbacks	2017-03-14 09:22:41 +00:00
Peter Jaszkowiak	c199075d98	Fix #5346	2017-03-13 20:20:41 -07:00
Julian Lam	25518bdd18	removed unused vars	2017-03-13 16:54:29 -04:00
psychobunny	8a6665a26c	up lav, closes #5525	2017-03-13 16:54:28 -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
psychobunny	767705085b	test against nodejs 7 as well	2017-03-13 14:00:48 -04:00
psychobunny	4a33f45b1e	use writeFileSync for synchronous fs write operations - nodejs 7.x	2017-03-13 13:57:35 -04:00
Barış Soner Uşaklı	0396e9300b	Merge pull request #5500 from RoiEXLab/fix-admin-search ... Fix admin Search	2017-03-13 09:58:30 +02:00
barisusakli	90b8a3afd0	refactor topics/delete.js	2017-03-12 21:38:53 +03:00
Misty (Bot)	9f1a2b0cc9	Latest translations and fallbacks	2017-03-12 09:22:16 +00: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
Misty (Bot)	3e93975595	Latest translations and fallbacks	2017-03-11 09:22:17 +00:00
Julian Lam	b0fa9f85e4	Merge pull request #5467 from NodeBB/upgrades-refactor ... Refactor upgrade scripts to use individual files in src/upgrades/ as source of schema changes	2017-03-10 21:57:05 -05: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	9dc54f801e	up persona	2017-03-10 14:55:52 -05:00
psychobunny	286d0ab203	prevent tagsinput initialization from flagging as unsaved	2017-03-10 14:40:10 -05:00
psychobunny	5ca9e5e14c	ACP: distinguish <small> from regular text	2017-03-10 14:36:35 -05:00
psychobunny	62f445ad7f	ACP: added tagsinput to other fields that are "comma separated"	2017-03-10 14:36:35 -05:00
barisusakli	bb146e049c	fix lint	2017-03-10 22:36:09 +03: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