1117 Commits

Author	SHA1	Message	Date
barisusakli	b9244110d9	up dbsearch	2017-02-09 17:29:28 +03:00
Julian Lam	daa63909f3	Merge remote-tracking branch 'origin/master' into develop	2017-02-08 10:29:06 -05:00
Julian Lam	d5a45832c3	up composer	2017-02-08 10:26:05 -05:00
Julian Lam	23d92c214d	up persona, vanilla, and markdown	2017-02-07 16:28:25 -05:00
Julian Lam	8a0a74d95e	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 16:03:54 -05:00
Julian Lam	b5daedb7a3	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 15:45:21 -05:00
Peter Jaszkowiak	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07:00
psychobunny	dbc3113940	Merge pull request #5412 from pichalite/cropperjs ... Ability to crop profile images before uploading	2017-02-06 14:33:49 -05:00
Peter Jaszkowiak	d43564dbbd	No need to build multiple times	2017-02-03 23:55:33 -07:00
Julian Lam	bfd16d188e	Merge branch 'master' into develop	2017-02-03 10:04:49 -05:00
Peter Jaszkowiak	5aa3e6b95b	Merge branch 'master' into nodebb-executable-refactor	2017-02-02 19:19:02 -07:00
Peter Jaszkowiak	553567c3b2	Refactor nodebb, move build.js, add --dev	2017-02-02 19:15:01 -07:00
pichalite	de28ff5d43	Ability to crop profile images before uploading	2017-02-03 00:47:09 +00:00
Julian Lam	70b20e3ff1	Up markdown	2017-02-02 15:19:05 -05:00
Misty (Bot)	a70051b30c	Incremented version number	2017-02-02 17:16:01 +00:00
Julian Lam	adb66c71b8	up markdown	2017-02-02 11:58:34 -05:00
Barış Soner Uşaklı	b08acd197c	up socket.io deps	2017-02-02 17:49:27 +02:00
Julian Lam	ff301aeaf7	up vanilla	2017-01-31 12:12:13 -05:00
Julian Lam	9a0bd29d67	up vanilla	2017-01-31 12:12:02 -05:00
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