21328 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Peter Jaszkowiak	9f15008247	Address review issues	2017-02-17 11:19:30 -07: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
Peter Jaszkowiak	c75391f9f5	Sound system improvements ... - Fix sound ACP uploads - Display soundpack names with sound files - Soundpacks can have sounds with identical names - Link sounds during build step - Generate map of sound name to file name during build step - Change how soundpacks work. It's now done via a field in plugin.json	2017-02-16 22:58:15 -07: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
barisusakli	9f67142786	closes #5440	2017-02-14 14:16:31 +03:00
psychobunny	0667870286	set an active state for pageview options	2017-02-13 15:50:12 -05:00
Julian Lam	1e33a659ef	up persona	2017-02-13 15:42:09 -05:00
psychobunny	3d1425605a	prettification of pageview stats	2017-02-13 15:40:20 -05:00
psychobunny	62df8edb77	better positioning of dashboard legend	2017-02-13 15:36:20 -05:00
psychobunny	5e35170805	ghfw :rage1:	2017-02-13 15:28:56 -05:00
psychobunny	ccfec622d4	Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop	2017-02-13 15:28:30 -05:00
psychobunny	9e354a09d1	prettier stats on dashboard	2017-02-13 15:28:26 -05:00
barisusakli	30f35c42f6	fix eslint	2017-02-13 22:42:47 +03:00
barisusakli	a3cbe5e090	#5436	2017-02-13 22:24:26 +03:00
Misty (Bot)	31ac72375f	Latest translations and fallbacks	2017-02-13 09:22:08 +00:00
barisusakli	21eefb9760	closes #5436	2017-02-12 20:36:12 +03:00
barisusakli	8b006fb1ab	closes #5434	2017-02-12 20:11:49 +03:00
Misty (Bot)	3dc2a91990	Latest translations and fallbacks	2017-02-12 09:22:10 +00:00
Julian Lam	5d4a0d7f05	Merge pull request #5426 from mortiy/ukrainian ... Added Ukrainian language to Transifex config	2017-02-11 14:41:39 -05:00
Misty (Bot)	c4a2babbf7	Latest translations and fallbacks	2017-02-11 09:21:46 +00:00
Peter Jaszkowiak	b553236620	Better defaults if cache buster read fails	2017-02-10 21:18:09 -07:00