544 Commits

Author	SHA1	Message	Date
Julian Lam	f0d9bddd56	fix merge conflict artifact that was left in	2017-03-06 09:58:02 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
barisusakli	531df7bd09	closes #5504	2017-03-06 13:54:43 +03:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	b060bda8a0	some more refactors	2017-03-02 17:25:32 +03:00
barisusakli	b1b87d339f	more refactors	2017-03-02 16:11:11 +03:00
Julian Lam	6e7b505ea7	more linting	2017-02-24 12:55:31 -05: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
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	2017-02-18 19:14:39 -07:00
Peter Jaszkowiak	93f38d4f30	ESlint no-multi-assign ... and max-nested-callbacks, no-mixed-requires, max-statements-per-line	2017-02-18 18:06:28 -07:00
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00
Peter Jaszkowiak	57f89663aa	ESlint radix	2017-02-18 14:29:52 -07:00
Peter Jaszkowiak	c4bdb72941	ESlint no-unneeded-ternary ... and no-extend-native, no-sequences	2017-02-18 12:59:46 -07:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
barisusakli	b33d34f7cf	refactor user/picture.js	2017-02-18 20:27:58 +03:00
Peter Jaszkowiak	1493afee2a	ESlint indent	2017-02-18 02:38:03 -07:00
Peter Jaszkowiak	3b0dd2d1ef	ESlint padded-blocks	2017-02-18 02:32:24 -07:00
Peter Jaszkowiak	feb8405f95	ESlint eol-last	2017-02-18 02:30:48 -07:00
Peter Jaszkowiak	a038c66549	ESlint quotes	2017-02-18 01:56:23 -07:00
Peter Jaszkowiak	604358ecc4	ESlint keyword-spacing, no-multi-spaces	2017-02-18 01:52:56 -07:00
Peter Jaszkowiak	a5a3f3089a	ESlint no-mixed-operators	2017-02-18 01:51:11 -07:00
Peter Jaszkowiak	2e031f3759	ESlint comma-spacing	2017-02-18 01:31:47 -07:00
Peter Jaszkowiak	277a7fb8b4	ESlint key-spacing, no-trailing-spaces	2017-02-18 01:27:46 -07:00
Peter Jaszkowiak	b1b486f729	ESlint quote-props	2017-02-18 01:19:20 -07:00
Peter Jaszkowiak	3361a72725	ESlint no-plusplus ... and no-empty, space-unary-ops	2017-02-18 01:12:18 -07:00
Peter Jaszkowiak	3d6bfa47c5	ESlint no-useless-return	2017-02-17 22:13:41 -07:00
Peter Jaszkowiak	2ba46808a1	ESlint one-var, fix comma-dangle	2017-02-17 20:20:42 -07:00
Peter Jaszkowiak	bc1d70c126	ESlint comma-dangle	2017-02-17 19:31:21 -07:00
pichalite	aacd8a2422	Fix return and tests	2017-02-17 20:36:13 +00:00
pichalite	8dab8864f6	Add extensions for cropped images	2017-02-17 19:42:02 +00:00
Julian Lam	eae541d040	Merge branch 'master' into develop	2017-02-10 16:22:12 -05:00
Julian Lam	6289f118ae	updated cron strings with 5-digit strings instead of 6-digit ones	2017-02-10 15:52:05 -05:00
Julian Lam	7f124a3ccf	Merge branch 'master' into develop	2017-02-10 12:55:11 -05:00
Julian Lam	6b2e40a8ce	promoting digest output to info, instead of verbose	2017-02-10 12:54:17 -05:00
Julian Lam	8a0a74d95e	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 16:03:54 -05:00
Julian Lam	b5daedb7a3	Merge remote-tracking branch 'origin/master' into develop	2017-02-07 15:45:21 -05:00
Peter Jaszkowiak	bb1bfb0449	Merge branch 'master' into assets-route	2017-02-06 15:52:54 -07:00
Peter Jaszkowiak	d31499a860	Fix tests rewriting logo.png	2017-02-03 18:29:09 -07:00
pichalite	de28ff5d43	Ability to crop profile images before uploading	2017-02-03 00:47:09 +00:00
barisusakli	3fb7f9fce5	closes #5398	2017-01-26 22:18:16 +03:00
barisusakli	367078056e	add hook	2017-01-11 14:41:31 +03:00
barisusakli	0c8aa599a0	closes #5357	2017-01-11 14:40:52 +03:00
Julian Lam	3861b2dd80	Merge remote-tracking branch 'origin/master' into develop	2017-01-03 13:39:11 -05:00
pichalite	8a68e1d918	Delete cover position data when cover photo is deleted	2016-12-29 17:28:42 +00:00
Julian Lam	76bcc1c327	Merge branch 'flagging-refactor' into develop	2016-12-19 13:00:31 -05:00