14392 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	6ea0fc4e2f	changed file schema to be name only, storing them in object sets referencing their applicable versions	2017-02-22 15:57:31 -05:00
Julian Lam	9eed3abb1d	added template to upgrades folder	2017-02-22 13:28:22 -05:00
Julian Lam	5b8c9503c3	refactor upgrade scripts to use individual files in src/upgrades/ as source of schema changes	2017-02-22 13:20:47 -05:00
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00
Barış Soner Uşaklı	89380824f8	navigation test	2017-02-21 17:00:54 +03:00
barisusakli	f2a795a9b7	fix tests	2017-02-21 15:18:01 +03:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
Misty (Bot)	4b21679d6f	Latest translations and fallbacks	2017-02-21 09:24:38 +00:00
barisusakli	4ee7edad64	test uploadProfileImageFromUrl	2017-02-20 21:58:35 +03:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Misty (Bot)	7d8477289d	Latest translations and fallbacks	2017-02-20 09:22:34 +00:00
Anil Mandepudi	f302c0d739	Update gruntfile to build on initialization (#5458) ... * Update gruntfile to build on initialization * Skip option skips build	2017-02-19 11:01:38 -05:00
Misty (Bot)	2e27ce640c	Latest translations and fallbacks	2017-02-19 09:25:24 +00:00
Barış Soner Uşaklı	1b43faba1a	closes #5441	2017-02-19 02:44:38 +03:00
barisusakli	7842c3411c	remove logs	2017-02-18 20:52:45 +03:00
barisusakli	b33d34f7cf	refactor user/picture.js	2017-02-18 20:27:58 +03:00
Barış Soner Uşaklı	23ed1af282	Merge pull request #5457 from pichalite/image-extension ... Add extensions for cropped images	2017-02-18 15:06:45 +02:00
pichalite	aacd8a2422	Fix return and tests	2017-02-17 20:36:13 +00:00
pichalite	7f4e4c8e2e	Fix styling	2017-02-17 20:02:26 +00:00
pichalite	4d755bad0c	Use typeToExtension from file.js	2017-02-17 19:57:18 +00:00
pichalite	8dab8864f6	Add extensions for cropped images	2017-02-17 19:42:02 +00:00
barisusakli	aa64ec7db1	remove unnecessary code	2017-02-17 22:33:41 +03:00
barisusakli	d6cdc6d34d	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-02-17 21:44:21 +03:00
Julian Lam	a379b03e71	lint	2017-02-17 09:10:53 -05:00
Julian Lam	f7f5b2c8d9	Merge remote-tracking branch 'origin/master' into develop	2017-02-17 09:10:25 -05:00
Julian Lam	5ee2aa8adb	Merge pull request #5453 from NodeBB/patch_5369 ... Fix #5368	2017-02-17 08:48:57 -05:00
Julian Lam	802878c371	Merge pull request #5455 from pichalite/cropper ... Make cropper in to a module	2017-02-17 08:48:21 -05:00
barisusakli	e009ce5609	closes #5443	2017-02-17 16:46:30 +03:00
barisusakli	a427bba9cb	up persona	2017-02-17 14:48:09 +03:00
barisusakli	4d05e492cc	closes #5312	2017-02-17 14:45:45 +03:00
Misty (Bot)	461ad301a1	Latest translations and fallbacks	2017-02-17 09:22:25 +00:00
pichalite	2ca8f60e77	Finalize cropper module	2017-02-17 05:32:37 +00:00
pichalite	d784a8dce8	Restore uploader.js	2017-02-17 04:26:34 +00:00
pichalite	43f4d9819e	Linting	2017-02-17 00:54:53 +00:00
pichalite	484891472e	Make cropper in to a module	2017-02-17 00:48:38 +00:00
psychobunny	45063ed683	Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop	2017-02-16 18:28:42 -05:00
psychobunny	36bf54a4b8	bump tjs	2017-02-16 18:28:37 -05:00
Peter Jaszkowiak	3d56dc4857	Fix #5368	2017-02-16 13:33:28 -07:00
barisusakli	fd88e9fdff	up composer	2017-02-16 22:07:20 +03:00
barisusakli	9b3741bc63	up composer	2017-02-16 15:35:19 +03:00
barisusakli	dad5b135c3	lint	2017-02-16 15:11:31 +03:00
barisusakli	c285eb7fcd	closes #5450	2017-02-16 15:01:11 +03:00
Misty (Bot)	2c428cdec1	Latest translations and fallbacks	2017-02-16 09:22:12 +00:00
Julian Lam	8bf719b258	Merge pull request #5431 from NodeBB/ajaxify-cache-buster ... Ajaxify improvements, `/assets/uploads/` fixes, cache buster improvements	2017-02-15 13:49:47 -05:00
Julian Lam	fcaefbadca	Merge remote-tracking branch 'origin/master' into develop	2017-02-15 12:06:52 -05:00
Julian Lam	9e23d09e5e	removing outdated logic to call process.exit on reset completion as all invocations use callbacks now. Allowing invocation of reset -p and -t without nodebb-plugin- or nodebb-theme- prefix	2017-02-15 09:47:38 -05:00
Anil Mandepudi	c25836b5fc	Option to upload without cropping (#5447) ... * Option to upload without cropping * Fix styling * Fix styling * Add missing semi-colon * I fail at styling :fail:	2017-02-14 16:31:51 -05:00
barisusakli	867fd99fb6	closes #4625	2017-02-14 20:56:24 +03:00
barisusakli	4d8d23830d	utils tests	2017-02-14 15:47:36 +03:00
barisusakli	4bbf517af3	rewards test	2017-02-14 15:04:48 +03:00