1098 Commits

Author	SHA1	Message	Date
Julian Lam	cd652e6730	up mentions	2017-01-31 11:45:25 -05:00
Julian Lam	7414482753	Merge branch 'master' into develop	2017-01-27 11:27:21 -05:00
barisusakli	a89ed01f4f	up composer	2017-01-27 13:14:05 +03:00
barisusakli	46cde0444e	up dbsearch	2017-01-27 12:40:52 +03:00
Barış Soner Uşaklı	8deeb0e7c0	up composer	2017-01-25 15:06:42 +02:00
barisusakli	aeed8f53f3	closes #5393	2017-01-24 12:45:45 +03:00
Julian Lam	72092f7109	bump mentions again	2017-01-23 14:53:11 -05:00
Julian Lam	300816a6db	actually mentions need not be updated...	2017-01-23 14:49:56 -05:00
Julian Lam	2a9d9204c0	Merge branch 'master' into develop	2017-01-23 14:48:54 -05:00
Julian Lam	a41bd73b30	bump mentions	2017-01-23 14:48:46 -05:00
Julian Lam	4e9d5bbd8a	Up composer version	2017-01-23 12:38:21 -05:00
Julian Lam	8dc5e20f37	Up composer version	2017-01-23 12:38:05 -05:00
Julian Lam	fcec6fd41d	Merge remote-tracking branch 'origin/master' into develop	2017-01-23 11:18:10 -05:00
Barış Soner Uşaklı	a63ec0a265	up dbsearch	2017-01-21 14:23:36 +02:00
Julian Lam	f58107e40a	Merge remote-tracking branch 'origin/master' into develop	2017-01-12 11:29:34 -05:00
Barış Soner Uşaklı	05053071fe	up composer	2017-01-11 20:12:26 +02:00
psychobunny	3b4d7b1d70	up tjs	2017-01-10 13:47:31 -05:00
Julian Lam	43056a4bfa	Merge branch 'master' into develop	2017-01-08 16:26:00 -05:00
Julian Lam	f6900f2500	Merge pull request #5345 from pichalite/devdeps ... Update dev dependencies	2017-01-08 15:58:09 -05:00
barisusakli	362fbd66e9	up composer	2017-01-06 19:20:36 +03:00
barisusakli	3f15dbdc54	up persona	2017-01-05 21:14:20 +03:00
pichalite	65d17a07b7	Update dev dependencies	2017-01-05 18:06:59 +00:00
Julian Lam	2c6beb9ffb	Merge branch 'master' into develop	2017-01-05 10:05:57 -05:00
Anil Mandepudi	22d0e60f08	Update Chart.js dependency version ... Update Chart.js dependency to fix chart issue on category analytics page.	2017-01-03 18:05:39 -08:00
Peter Jaszkowiak	ec544518e8	Use async v2	2017-01-02 22:23:17 -07:00
psychobunny	d4a1542ba3	use dot instead of spec for tests	2016-12-23 11:32:43 -05:00
barisusakli	c78c4926df	up themes	2016-12-23 17:01:11 +03:00
Misty (Bot)	2a5b5a7b45	Incremented version number	2016-12-22 17:08:19 +00:00
barisusakli	3add454289	up composer	2016-12-22 11:22:18 +03:00
psychobunny	61a58f2607	fixes npm test on windows	2016-12-21 11:21:30 -05:00
psychobunny	b5d1eb2d54	up persona	2016-12-20 17:01:53 -05:00
psychobunny	454ee2d801	up persona: new quick reply option	2016-12-20 15:35:58 -05:00
psychobunny	b51fd4096b	up persona	2016-12-20 12:11:23 -05:00
Misty (Bot)	ecdd57dda2	Incremented version number	2016-12-19 19:18:25 +00:00
barisusakli	70f71888f1	up themes	2016-12-19 21:53:19 +03:00
barisusakli	1fed01fe43	ability to filter search by tags	2016-12-19 21:40:16 +03:00
Barış Soner Uşaklı	fef239d97a	up mongodb	2016-12-18 23:01:32 +03:00
Barış Soner Uşaklı	647c05ec42	up composer	2016-12-18 22:25:58 +03:00
Peter Jaszkowiak	db1fdb897f	Fixes for dev-ing on windows ... - Change `nodebb.bat` to simply run `node ./nodebb` with same arguments - Fix `npm test` for windows	2016-12-10 20:57:34 -07:00
barisusakli	4db171985d	up composer	2016-12-09 18:57:56 +03:00
psychobunny	56fb941979	up'd tjs	2016-12-07 15:53:47 -05:00
psychobunny	6b7b51eaf0	Merge pull request #5170 from pitaj/master ... ACP search updated to support translations	2016-12-06 17:45:19 -05:00
psychobunny	b0126267a8	closes #5249	2016-12-06 11:48:59 -05:00
Julian Lam	68f8f57a34	upped composer version	2016-12-01 22:19:50 -05:00
psychobunny	a54a9b512a	v1.4.0	2016-12-01 16:29:45 -05:00
Peter Jaszkowiak	5223bb5191	Merge branch 'master' of github.com:nodebb/nodebb	2016-12-01 13:40:07 -07:00
barisusakli	afef79a81e	closes #5241	2016-11-29 17:16:12 +03:00
Peter Jaszkowiak	a431dc0305	ACP search updated to support translations	2016-11-28 12:52:26 -07:00
Julian Lam	f42c5ede61	up markdown	2016-11-24 12:11:33 -05:00
Julian Lam	50f7508a92	up markdown and composer versions	2016-11-24 11:10:40 -05:00