644 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	413bb4736c	Save language metadata on build to avoid readdirs later	2017-04-20 00:16:06 -06:00
Peter Jaszkowiak	30b47d39f3	Fix #5536	2017-04-19 20:33:03 -06:00
barisusakli	236758b712	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-04-18 14:00:14 -04:00
Peter Jaszkowiak	2827db3309	Fix sounds playing through multiple tabs	2017-04-17 15:56:24 -06: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
Julian Lam	a62a4e698f	Merge pull request #5578 from NodeBB/utils-translator-require ... Make utils and translator easier to require	2017-04-12 23:16:59 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	75d291183d	Fix using nodebb in other CWDs	2017-04-12 15:22:58 -06:00
Peter Jaszkowiak	010473e5cc	Merge branch 'master' into patch-pitaj	2017-04-09 23:09:52 -06:00
Peter Jaszkowiak	1ed571189c	Make utils and translator easier to require ... Move utils.walk to file.walk, backwards compatible	2017-04-08 20:27:52 -06:00
Peter Jaszkowiak	b53d3254dd	buzz is no longer used	2017-04-08 19:05:10 -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
Peter Jaszkowiak	17ff8a4151	Enable passing paths as module sources	2017-04-08 19:05:10 -06:00
pichalite	4c89497cc4	Closes #5521	2017-04-07 20:57:00 +00:00
Barış Soner Uşaklı	43f8678c7a	update local config immediately	2017-04-06 17:59:46 -04:00
Julian Lam	7afe8a32f6	Merge branch 'master' into develop	2017-03-29 15:26:49 -04:00
Peter Jaszkowiak	ff09d6e0dd	Fix #5549, improve tpl compilation (#5551)	2017-03-27 13:53:26 -04:00
Julian Lam	69dd1e3aca	Merge branch 'master' into develop	2017-03-15 14:39:18 -04:00
barisusakli	8d7283e6c7	dont minify if file ends with .min.js #5529	2017-03-15 20:33:33 +03:00
Julian Lam	793555a344	Merge branch 'master' into develop	2017-03-07 14:35:49 -05:00
RoiEX	186c1f40e9	Refactor Code	2017-03-06 20:07:06 +01:00
RoiEX	710377ceea	Remove space	2017-03-06 19:51:53 +01:00
RoiEX	603d45fbfa	Changed Serving Method	2017-03-06 19:47:03 +01:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
RoiEX	4082ca40c1	Add last comma	2017-03-05 15:20:35 +01:00
RoiEX	0710c6488d	Fix trailing commas	2017-03-05 15:15:41 +01:00
RoiEX	eca150f392	Fix Tests	2017-03-05 15:10:35 +01:00
RoiEX	f761191fca	Add OSD	2017-03-05 14:45:30 +01:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	ea871384d8	remove fallbacks	2017-03-03 16:45:18 +03:00
barisusakli	3b8d14bf12	closes #5493	2017-03-03 16:15:01 +03:00
barisusakli	202bafa3e3	add images to bundle	2017-03-02 18:21:01 +03:00
Julian Lam	45c479a101	Merge branch 'master' into develop	2017-02-28 12:07:56 -05:00
barisusakli	8a0cf6c0ac	more admin socket tests	2017-02-28 15:16:49 +03:00
Julian Lam	58cbf44143	Merge branch 'master' into develop	2017-02-27 10:05:20 -05:00
Peter Jaszkowiak	20d250bceb	Upgrade script for new sounds system	2017-02-25 23:07:43 -07:00
Peter Jaszkowiak	007051c14c	Fix #5476	2017-02-25 19:51:49 -07:00
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12: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
pichalite	1d5b3cc73f	ACP manage tags page UI changes	2017-02-23 20:45:05 +00:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
barisusakli	4cd4414d19	small change	2017-02-23 15:29:35 +03:00
Barış Soner Uşaklı	026c32f32b	Merge pull request #5462 from NodeBB/minify-modules ... Minify all module scripts in production	2017-02-23 13:15:05 +02:00
barisusakli	2dac3d2292	closes #5465, blacklist tests	2017-02-22 14:53:44 +03: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	beb652ee43	Move minifier.js to src/meta	2017-02-20 00:44:04 -07:00
Peter Jaszkowiak	9b1068e868	Minify all module scripts in production	2017-02-19 02:07:19 -07:00