14119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Peter Jaszkowiak	d43564dbbd	No need to build multiple times	2017-02-03 23:55:33 -07:00
Peter Jaszkowiak	fdad66f58e	Revert "Fix tests to use default activated plugin" ... This reverts commit 44a59ac435.	2017-02-03 23:48:43 -07:00
Peter Jaszkowiak	d31499a860	Fix tests rewriting logo.png	2017-02-03 18:29:09 -07:00
Peter Jaszkowiak	44a59ac435	Fix tests to use default activated plugin	2017-02-03 16:37:03 -07:00
Peter Jaszkowiak	360a35d0a6	Resolve merge conflicts	2017-02-02 22:15:26 -07:00
Julian Lam	1012368acd	Merge pull request #5413 from NodeBB/nodebb-executable-refactor ... Refactor `nodebb`, move `build.js`, add `--dev`	2017-02-02 22:04:19 -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
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
Julian Lam	5de67f9607	excluding tx managed language files from grunt	2017-02-02 10:52:20 -05:00
Barış Soner Uşaklı	b08acd197c	up socket.io deps	2017-02-02 17:49:27 +02:00
barisusakli	5c217e873e	build all targets before test	2017-02-02 16:08:19 +03:00
barisusakli	ae7f9bac98	prevent crash if uri is malformed	2017-02-02 13:11:33 +03:00
Misty (Bot)	48b8b6cf95	Latest translations and fallbacks	2017-02-02 09:21:39 +00:00
Julian Lam	bc3f28e473	Merge pull request #5411 from NodeBB/language-dep-warn ... Better deprecation warning for old language route	2017-02-01 12:53:15 -05:00
Peter Jaszkowiak	bf44ca20f2	Better deprecation warning for old language route	2017-02-01 10:36:15 -07:00
Misty (Bot)	975f2a669d	Latest translations and fallbacks	2017-02-01 09:22:09 +00:00
barisusakli	51981ffb99	get extention from content type	2017-01-31 22:18:22 +03:00
Julian Lam	409b8d8ebc	Merge pull request #5409 from NodeBB/translator-no-catch ... Fix translator catching JS errors in callbacks	2017-01-31 14:10:56 -05:00
Peter Jaszkowiak	bb7a35b85c	Fix translator catching JS errors in callbacks	2017-01-31 12:04:31 -07:00
Julian Lam	ff301aeaf7	up vanilla	2017-01-31 12:12:13 -05:00
Misty (Bot)	988c71d9c9	Latest translations and fallbacks	2017-01-31 09:21:38 +00:00
Julian Lam	b230dbaff4	Merge pull request #5408 from NodeBB/language-404s ... Remove requests to nonexistent language files	2017-01-30 17:12:11 -05:00
Peter Jaszkowiak	bc9fa0a990	Remove requests to nonexistent language files	2017-01-30 15:08:03 -07:00
Julian Lam	0aaa320913	Merge pull request #5406 from Pappmann/patch-6 ... Update dashboard.js	2017-01-30 11:54:35 -05:00
Stephan	0c6679ca9c	Update dashboard.js	2017-01-30 17:45:48 +01:00
Misty (Bot)	b222dd653f	Latest translations and fallbacks	2017-01-30 09:23:52 +00:00
Misty (Bot)	da295bb5e6	Latest translations and fallbacks	2017-01-29 09:21:51 +00:00
Misty (Bot)	3ddfa7715f	Latest translations and fallbacks	2017-01-28 09:50:47 +00:00
Julian Lam	debffe385f	closes #5316	2017-01-27 16:29:42 -05:00
Julian Lam	3ab631c82e	Merge pull request #5391 from Pappmann/patch-4 ... added missing translation in dashboard	2017-01-27 11:32:02 -05:00
Julian Lam	7c7517d72b	Merge pull request #5392 from Pappmann/patch-5 ... fixed missing translation string	2017-01-27 11:31:46 -05:00
Julian Lam	05c724de30	added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper	2017-01-27 11:26:08 -05:00
Misty (Bot)	c81c756e57	Latest translations and fallbacks	2017-01-27 09:22:33 +00:00
psychobunny	e2b30d6329	improve regex for unwanted whitespace in cover:url	2017-01-26 18:04:51 -05:00
psychobunny	9d069d76db	random \t's in language string	2017-01-26 14:17:04 -05:00
barisusakli	c3f1129fe9	eslint	2017-01-26 14:22:52 +03:00
barisusakli	29b0552466	update url from config file even if it was passed in env	2017-01-26 14:16:19 +03:00
Misty (Bot)	e3205cf950	Latest translations and fallbacks	2017-01-26 09:22:10 +00:00
Barış Soner Uşaklı	8deeb0e7c0	up composer	2017-01-25 15:06:42 +02:00
Misty (Bot)	49735c67e3	Latest translations and fallbacks	2017-01-25 09:21:56 +00:00
Peter Jaszkowiak	f4147f7922	Generate cache buster on build	2017-01-24 20:24:28 -07:00
Misty (Bot)	44f83825f8	Latest translations and fallbacks	2017-01-24 09:24:12 +00:00
Julian Lam	300816a6db	actually mentions need not be updated...	2017-01-23 14:49:56 -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	372138c789	Revert "fixing bug that caused plugin language files to not be parsed" ... This reverts commit b2bb1a7c24.	2017-01-23 11:27:35 -05:00
Julian Lam	b2bb1a7c24	fixing bug that caused plugin language files to not be parsed	2017-01-23 11:25:19 -05:00