14738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	55f07d3301	fixed flags list in account info page	2017-03-29 12:44:40 -04:00
Misty (Bot)	e9794224a8	Latest translations and fallbacks	2017-03-29 09:24:44 +00:00
Julian Lam	5fbbe898d0	fixes #5538	2017-03-28 12:17:20 -04:00
Julian Lam	1594a84e1c	fixes #5536	2017-03-28 12:13:44 -04:00
Julian Lam	a63459dc98	Merge branch 'master' of github.com:NodeBB/NodeBB	2017-03-28 12:13:30 -04:00
Misty (Bot)	8d4a32dc27	Latest translations and fallbacks	2017-03-28 09:24:51 +00:00
Julian Lam	c34b10dd50	Merge branch 'master' into develop	2017-03-27 14:38:27 -04:00
Julian Lam	15506c30a4	updates es search translation	2017-03-27 14:38:13 -04:00
husseinwalli	3876a88252	Added additional parameters to user creation method (#5496) ... Treating picture, location and birthday similar to data.email as optional parameters to be passed to the create a user	2017-03-27 14:05:06 -04:00
Peter Jaszkowiak	ff09d6e0dd	Fix #5549, improve tpl compilation (#5551)	2017-03-27 13:53:26 -04:00
Misty (Bot)	c1c96668af	Latest translations and fallbacks	2017-03-27 09:24:50 +00:00
Barış Soner Uşaklı	6b0a907ede	closes #5552	2017-03-26 15:12:28 +03:00
Misty (Bot)	2a2ed96a07	Latest translations and fallbacks	2017-03-26 09:24:22 +00:00
Julian Lam	42dc496572	Merge pull request #5550 from NodeBB/patch_5543 ... Remove duplicate slugify	2017-03-25 16:29:14 -04:00
Misty (Bot)	114f87e78c	Latest translations and fallbacks	2017-03-25 09:22:16 +00:00
Peter Jaszkowiak	14ed0be4f7	Remove duplicate slugify	2017-03-24 14:43:58 -06:00
Julian Lam	0e157d93ea	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 15:52:58 -04:00
Julian Lam	a1f87a5d7f	added tests for #5545	2017-03-24 15:52:33 -04:00
Julian Lam	a49e647de3	fixes #5545 again	2017-03-24 14:46:51 -04:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Julian Lam	31b6d47f88	fixes #5545	2017-03-24 14:36:54 -04:00
Julian Lam	c84e54c6c6	Merge pull request #5544 from NodeBB/patch_5543 ... Fix #5543	2017-03-24 13:32:32 -04:00
Peter Jaszkowiak	a7677063de	Rename to uniqueUsername	2017-03-24 10:33:38 -06:00
Peter Jaszkowiak	642306e69c	Fix #5543	2017-03-24 10:28:18 -06:00
Misty (Bot)	3319a72679	Latest translations and fallbacks	2017-03-24 09:22:18 +00:00
Julian Lam	6060b8e13b	fix tests	2017-03-23 14:39:46 -04:00
Julian Lam	f2653cd380	broader error handling for empty notif creation return	2017-03-23 14:35:29 -04:00
Barış Soner Uşaklı	a3d65d10f6	fix test again	2017-03-23 16:45:24 +03:00
Barış Soner Uşaklı	46da2daab9	fix test	2017-03-23 16:31:14 +03:00
Barış Soner Uşaklı	61eafb32f3	fix moderation note test	2017-03-23 16:31:06 +03:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04:00
Aziz Khoury	6682e048ea	wrapImagesInLinks with <a download> attribute ... if the `src` of the `img` does not have an extension, most browsers will trigger a download with whatever filename is set, also without an extension, so when it's opened in any OS, it wont have a default application to open it with. So, In this case, if the `alt` attribute has an extension (meaning if it looks like filename) - we use that with the html5 [`download` attr](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download) The PR does not affect any src if they have an extension.	2017-03-22 12:19:31 +02:00
Julian Lam	ce64db8d71	fix logic error that caused upgrade scripts to always be skipped	2017-03-21 21:10:46 -04:00
Julian Lam	a82a50baa6	fix date and name in config urls upgrade script	2017-03-21 21:10:20 -04:00
Julian Lam	b6134b160e	moved auto_reconnect out of socketOptions object for Mongo	2017-03-21 15:55:24 -04:00
Julian Lam	db84296373	Merge pull request #5539 from NodeBB/julianlam-patch-1 ... Up MongoDB dependency to v2.2.25	2017-03-21 14:22:17 -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
Ben Lubar	7f713ee822	Admin option to allow all users to view votes (#5534) ... * Admin option to allow all users to view votes * Fix </strong></strong>	2017-03-17 14:08:47 -04:00
Julian Lam	e4168f4a87	linting	2017-03-17 13:35:24 -04:00
Julian Lam	c805d55b85	creating notification for flag assignment	2017-03-17 13:16:16 -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
barisusakli	449352d899	wait for all routes to load before listening	2017-03-16 11:24:36 +03:00
Julian Lam	2ef71e22aa	Merge pull request #5532 from NodeBB/patch_5491 ... Fix tests for #5491 fix	2017-03-15 23:11:09 -04:00
Peter Jaszkowiak	8f8babf90b	Fix tests	2017-03-15 20:09:07 -07:00
Julian Lam	23d4497c73	Merge pull request #5531 from NodeBB/patch_5491 ... Fix #5491	2017-03-15 23:01:42 -04:00
Peter Jaszkowiak	8c45411ccc	Fix #5491	2017-03-15 20:00:05 -07:00