1168 Commits

Author	SHA1	Message	Date
Julian Lam	a141835cf8	Merge branch 'master' into develop	2017-04-13 16:45:46 -04:00
psychobunny	1179dd9503	up composer, closes #5586	2017-04-13 15:32:38 -04:00
psychobunny	1e3acc0caf	up persona	2017-04-13 15:18:27 -04:00
psychobunny	b1ee7cc5b4	up persona	2017-04-13 15:18:11 -04:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	a8add6477c	Fix merge conflicts	2017-04-12 21:29:54 -06:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	f16a40d29e	Add nodebb file to linter	2017-04-12 15:29:01 -06:00
Peter Jaszkowiak	010473e5cc	Merge branch 'master' into patch-pitaj	2017-04-09 23:09:52 -06:00
Peter Jaszkowiak	2c418fd2af	Use npm bootstrap	2017-04-08 19:05:10 -06:00
Peter Jaszkowiak	0ef30e91ba	Use ace-builds npm package instead of vendor ... ace can be referenced as an r.js module, reduces acp bundle size	2017-04-08 19:05:10 -06:00
pichalite	4c89497cc4	Closes #5521	2017-04-07 20:57:00 +00:00
Julian Lam	ef2b245a82	bump mentions	2017-03-30 11:00:11 -04:00
Julian Lam	7afe8a32f6	Merge branch 'master' into develop	2017-03-29 15:26:49 -04:00
Julian Lam	a450cb869d	up themes	2017-03-29 15:26:18 -04:00
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04:00
Julian Lam	9714e3c26b	Up MongoDB dependency to v2.2.25 ... This is a PR to see if tests go 💥	2017-03-21 14:01:41 -04:00
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
Julian Lam	1ebbbdd3f9	Merge remote-tracking branch 'origin/master' into develop	2017-03-15 10:01:00 -04:00
psychobunny	8a6665a26c	up lav, closes #5525	2017-03-13 16:54:28 -04: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	5aa45e9181	up persona	2017-03-10 13:37:02 -05:00
barisusakli	1c1d97dd54	up spam be gone	2017-03-09 21:32:43 +03:00
psychobunny	9f2e5e9c4b	closes #4685	2017-03-08 11:31:58 -05:00
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