1142 Commits

Author	SHA1	Message	Date
Julian Lam	793555a344	Merge branch 'master' into develop	2017-03-07 14:35:49 -05:00
Julian Lam	f732d6c1b9	Merge pull request #5501 from RoiEXLab/add-osd-functionality ... Add OpenSearchDocument XML (#5399)	2017-03-06 15:10:10 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
barisusakli	f6721c249f	up composer	2017-03-06 14:37:46 +03:00
RoiEX	431f5e1f0f	Add missing dependency ... This deoendency is required by rss, but travis doesn't seem to notice that	2017-03-05 14:56:50 +01:00
Julian Lam	b1ceec7571	Merge remote-tracking branch 'origin/master' into develop	2017-02-25 21:43:50 -05:00
Misty (Bot)	00a67b97ce	Incremented version number	2017-02-24 13:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Julian Lam	14398a2d90	up markdown	2017-02-23 14:55:14 -05:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
Julian Lam	e427f1663e	Merge pull request #5456 from NodeBB/sounds-refactor ... Sound system improvements	2017-02-21 16:14:58 -05:00
Peter Jaszkowiak	f3a8256f35	ESlint strict	2017-02-18 02:23:47 -07:00
Julian Lam	f7f5b2c8d9	Merge remote-tracking branch 'origin/master' into develop	2017-02-17 09:10:25 -05:00
barisusakli	e009ce5609	closes #5443	2017-02-17 16:46:30 +03:00
barisusakli	a427bba9cb	up persona	2017-02-17 14:48:09 +03:00
Peter Jaszkowiak	c75391f9f5	Sound system improvements ... - Fix sound ACP uploads - Display soundpack names with sound files - Soundpacks can have sounds with identical names - Link sounds during build step - Generate map of sound name to file name during build step - Change how soundpacks work. It's now done via a field in plugin.json	2017-02-16 22:58:15 -07:00
psychobunny	45063ed683	Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop	2017-02-16 18:28:42 -05:00
psychobunny	36bf54a4b8	bump tjs	2017-02-16 18:28:37 -05:00
barisusakli	fd88e9fdff	up composer	2017-02-16 22:07:20 +03:00
barisusakli	9b3741bc63	up composer	2017-02-16 15:35:19 +03:00
barisusakli	c285eb7fcd	closes #5450	2017-02-16 15:01:11 +03:00
Julian Lam	fcaefbadca	Merge remote-tracking branch 'origin/master' into develop	2017-02-15 12:06:52 -05:00
barisusakli	867fd99fb6	closes #4625	2017-02-14 20:56:24 +03:00
Julian Lam	1e33a659ef	up persona	2017-02-13 15:42:09 -05:00
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