1379 Commits

Author	SHA1	Message	Date
Julian Lam	88b47f357b	removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite	2017-12-15 13:21:31 -05:00
Barış Soner Uşaklı	99eb1d1785	closes #6163	2017-12-11 10:53:29 -05:00
Barış Soner Uşaklı	f11fd566f9	add inf scroll method #6158	2017-12-08 20:10:37 -05:00
Barış Soner Uşaklı	19ae8dc7e7	closes #6154	2017-12-07 12:15:07 -05:00
Baris Usakli	3551d7d68e	closes #4804	2017-12-04 14:56:14 -05:00
Barış Soner Uşaklı	4f2f84e47c	#4804	2017-11-30 12:39:07 -05:00
Baris Usakli	b19310049d	closes #6136	2017-11-29 11:46:36 -05:00
Baris Usakli	f036eb18a4	closes #5936	2017-11-28 15:42:32 -05:00
Barış Soner Uşaklı	71895f3736	closes #6079	2017-11-23 14:19:26 -05:00
Peter Jaszkowiak	74ceb78800	Upvote notification frequency selection (#6087) ... Closes #5963 - Notify on every upvote - Notify on every tenth upvote - Notify logarithmically (on 10, 100, 1000...) - Disable upvote notifications	2017-11-21 14:14:14 -05:00
Barış Soner Uşaklı	5da24b4120	https://github.com/NodeBB/NodeBB/issues/6073	2017-11-16 10:55:59 -05:00
Julian Lam	7e0d0e0eb5	Merge remote-tracking branch 'origin/develop'	2017-11-02 14:13:48 -04:00
Barış Soner Uşaklı	5b2a674a4f	closes #6020	2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı	25cd21fba8	closes #6019	2017-10-31 10:53:28 -04:00
Baris Usakli	c4310395c9	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # package.json	2017-10-19 13:54:56 -04:00
Barış Soner Uşaklı	d8dc79e3c7	closes #5992	2017-10-18 14:49:42 -04:00
Baris Usakli	6a6dc7ef06	closes #5990	2017-10-16 15:35:46 -04:00
Peter Jaszkowiak	46fafb20b9	Remove string.js dependency	2017-10-13 21:02:41 -06:00
Baris Usakli	8276e20254	closes #5937	2017-09-21 14:30:12 -04:00
Barış Soner Uşaklı	ff88be91fa	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı	5344edc2a7	closes #5885	2017-08-18 20:08:19 -04:00
Baris Usakli	575c9a41cd	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-08-15 13:00:18 -04:00
Barış Soner Uşaklı	f161bbf956	Post queue (#5878) ... * #5876 * add user to post queue table * add time of post into queue add posting restrictions to queue * fix shouldQueueLogic for guests * add test for post-queue route	2017-08-15 12:59:40 -04:00
Baris Usakli	bc6b1a8f56	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # public/src/admin/extend/plugins.js	2017-08-11 11:33:06 -04:00
Baris Usakli	bd5edc55aa	closes #5086	2017-08-02 13:45:00 -04:00
Julian Lam	184dacf1d7	Merge branch 'master' into develop	2017-07-20 13:19:41 -04:00
Julian Lam	d9ace1723c	removed references to libs that aren't used	2017-07-17 12:40:50 -04:00
Barış Soner Uşaklı	cc4f4e7282	style changes	2017-07-15 16:57:41 -04:00
Julian Lam	a2627d2066	added default payload to emails, and adding nodebb logo for email header	2017-07-13 11:30:44 -04:00
Julian Lam	9c71da1577	sending callback with welcome email test	2017-07-12 15:20:30 -04:00
Baris Usakli	5167c1aa4f	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-28 14:19:29 -04:00
Julian Lam	3bd02d58e3	fixes logic that allowed posts beyond maximum post length if min is set to 0, @barisusakli	2017-06-28 12:25:51 -04:00
Julian Lam	28d8be8b9d	fixed #5782	2017-06-28 11:20:57 -04:00
Baris Usakli	1b0c6741f8	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-22 14:52:49 -04:00
Baris Usakli	cf444755df	closes #5729	2017-06-20 14:23:21 -04:00
Barış Soner Uşaklı	50f2a4ed19	remove dupe hook	2017-06-16 17:51:31 -04:00
Barış Soner Uşaklı	d9e84b1db8	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-13 20:58:19 -04:00
Baris Usakli	8ea5c060f5	closes #5754	2017-06-13 15:20:31 -04:00
Baris Usakli	037a0e5239	closes #5742 ... also fix reverse infinite scroll when sorting is changed	2017-06-06 16:40:32 -04:00
Barış Soner Uşaklı	e56178f72e	remove init socket.io	2017-06-02 17:18:58 -04:00
Barış Soner Uşaklı	2ae855678a	closes #5735	2017-06-02 15:30:59 -04:00
Julian Lam	6728e9a5cc	#5729	2017-06-02 15:01:24 -04:00
Baris Usakli	d13eb52f39	closes #5722	2017-05-30 14:10:16 -04:00
Julian Lam	12524b5ce4	fix lint	2017-05-30 13:17:26 -04:00
Julian Lam	d2b5b53cb4	refactor for sendValidationEmail, and sending better dummy data for welcome email template	2017-05-30 13:09:30 -04:00
Julian Lam	7ce208ca13	Better dummy data for testing banned email template	2017-05-30 12:11:44 -04:00
Julian Lam	313d48b47d	updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data	2017-05-30 12:11:44 -04:00
Barış Soner Uşaklı	59b1d8fbae	Merge pull request #5710 from NodeBB/_lodash ... Switch from underscore to lodash	2017-05-29 13:38:21 -04:00
Barış Soner Uşaklı	5e90e4db02	closes #5618	2017-05-27 23:58:12 -04:00
Peter Jaszkowiak	3c2d4fe649	Switch from underscore to lodash	2017-05-27 14:51:45 -06:00