14346 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Julian Lam	eae541d040	Merge branch 'master' into develop	2017-02-10 16:22:12 -05:00
Julian Lam	21bc1fba3f	Merge pull request #5429 from BenLubar/redis-drops-socket-messages ... Fix forum instances using Redis dropping socket.io messages.	2017-02-10 16:21:38 -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
Ben Lubar	9fb16e3520	Fix forum instances using Redis dropping socket.io messages. ... Bug introduced in b08acd197c. https://github.com/socketio/socket.io-redis/releases/tag/3.0.0 https://github.com/socketio/socket.io-redis/issues/185	2017-02-10 14:28:53 -06: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
Oleksandr Sidko	97c6da7d3f	Added Ukrainian language to Transifex config	2017-02-10 16:05:52 +02:00
barisusakli	f4a6527ce6	getRecentPosterUids test	2017-02-10 15:26:24 +03:00
Misty (Bot)	503378e259	Latest translations and fallbacks	2017-02-10 09:21:57 +00:00
Julian Lam	7ba111acdd	Merge pull request #5420 from NodeBB/assets-route ... /assets/uploads	2017-02-09 16:08:12 -05:00
Julian Lam	a8fd1440d4	fixed incorrect language key in ip blacklist page	2017-02-09 14:42:21 -05:00
Barış Soner Uşaklı	a3e327301b	update regex	2017-02-09 20:21:35 +02:00
barisusakli	b1511a1870	change client route	2017-02-09 21:15:50 +03:00
Julian Lam	a17c26ea45	Merge branch 'master' into develop	2017-02-09 12:53:07 -05:00
Julian Lam	d61665c20a	updated copy for no-routes-not-found	2017-02-09 12:52:25 -05:00
Barış Soner Uşaklı	4f5b9f3a42	Merge pull request #5425 from pichalite/issue-5415 ... Fix scrolling issues on mobile	2017-02-09 19:51:41 +02:00
pichalite	cc160d77e7	Fix scrolling issues on mobile	2017-02-09 17:33:31 +00:00
barisusakli	b9244110d9	up dbsearch	2017-02-09 17:29:28 +03:00
barisusakli	2c527cdfeb	more fixes	2017-02-09 14:38:06 +03:00
barisusakli	ae5deff3d5	fix uids	2017-02-09 14:36:00 +03:00
barisusakli	21861fa931	fix next	2017-02-09 14:31:29 +03:00
barisusakli	4f02775bdf	replies change	2017-02-09 14:30:02 +03:00
barisusakli	667582744e	fix eslint	2017-02-09 13:22:03 +03:00
barisusakli	ab7867d4b5	topic follow tests, fix filterIgnoring	2017-02-09 13:15:43 +03:00
Misty (Bot)	0409109faa	Latest translations and fallbacks	2017-02-09 09:21:45 +00:00
psychobunny	570efb9e4b	Merge branch 'develop' into threads-enhancement	2017-02-08 16:41:16 -05:00
psychobunny	575a3c7b9d	no need for a call to count replies	2017-02-08 16:39:44 -05:00
Peter Jaszkowiak	0fffde67b5	Undeprecate /uploads	2017-02-08 14:24:09 -07:00