16569 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	87433d50a3	Merge branch 'master' into develop	2017-01-05 10:10:11 -05:00
Julian Lam	2c6beb9ffb	Merge branch 'master' into develop	2017-01-05 10:05:57 -05:00
Misty (Bot)	b4a3883d6b	Latest translations and fallbacks	2017-01-05 09:21:40 +00:00
Misty (Bot)	9ab69d3960	update arabic language.json	2017-01-04 17:33:52 +00:00
Misty (Bot)	07f8ca5d6c	Latest translations and fallbacks	2017-01-04 17:27:57 +00:00
Julian Lam	8e7af0291a	fixed grammar in admin-manage-categories string	2017-01-04 11:50:03 -05:00
Julian Lam	81ca10d72e	Merge pull request #5332 from pitaj/async@2 ... async v2 upgrade	2017-01-04 11:05:45 -05:00
barisusakli	c42eaee30c	fix typo in language file	2017-01-04 15:28:16 +03:00
Julian Lam	736c1a4ad1	Merge pull request #5340 from pichalite/patch-1 ... Update Chart.js dependency version	2017-01-03 21:28:02 -05:00
Anil Mandepudi	22d0e60f08	Update Chart.js dependency version ... Update Chart.js dependency to fix chart issue on category analytics page.	2017-01-03 18:05:39 -08:00
Barış Soner Uşaklı	aa32e7b359	fix indents	2017-01-04 00:58:32 +03:00
Barış Soner Uşaklı	39723074c0	Merge pull request #5327 from pichalite/translations ... Add missing translations	2017-01-03 22:49:50 +02:00
Barış Soner Uşaklı	e225f318bb	Merge pull request #5339 from loopback0/master ... Allow text selection on /unread	2017-01-03 22:49:01 +02:00
loopback0	a86134cc5b	Fix selection ... Tweak to allow the shift + click behaviour for the checkboxes while still letting the browser behaviour work	2017-01-03 20:18:35 +00:00
Julian Lam	3861b2dd80	Merge remote-tracking branch 'origin/master' into develop	2017-01-03 13:39:11 -05:00
Julian Lam	541f51e947	restrict flags interface so that moderators only see flags from cids they can actually moderate	2017-01-03 13:38:06 -05:00
psychobunny	949b4aaa1f	added logo to .gitignore so it doesn't get updated by test runner	2017-01-03 13:07:24 -05:00
barisusakli	ba1889f441	messaging refactor	2017-01-03 20:02:24 +03:00
barisusakli	6b2dde02b5	closes #5333	2017-01-03 15:08:16 +03:00
Peter Jaszkowiak	11f7cc4163	Pass tests	2017-01-02 23:04:57 -07:00
Peter Jaszkowiak	ec544518e8	Use async v2	2017-01-02 22:23:17 -07:00
Peter Jaszkowiak	cb82824c13	Fix ACP title bug with hashes (#5331)	2017-01-02 10:59:55 -05:00
Barış Soner Uşaklı	a08474a9fd	Merge pull request #5319 from pichalite/issue-5317 ... Let global mods change user avatar	2016-12-31 09:40:20 +02:00
psychobunny	268f907a08	Merge pull request #5329 from pichalite/user-tests ... Add more user tests	2016-12-29 20:10:52 -05:00
pichalite	a0ff3734cf	Add more user tests	2016-12-30 00:51:22 +00:00
psychobunny	1c64e4e741	Merge pull request #5328 from pichalite/user-tests ... Add more user tests	2016-12-29 18:31:23 -05:00
pichalite	0ea477abde	Add more user tests	2016-12-29 23:16:23 +00:00
pichalite	da8795f666	Add missing translations	2016-12-29 19:41:43 +00:00
Anil Mandepudi	8ddf7eb922	Use scrollStop in chat (#5326)	2016-12-29 14:25:05 -05:00
psychobunny	8df47f333e	Merge pull request #5325 from pichalite/issue-5324 ... Delete cover position data when cover photo is deleted	2016-12-29 13:12:46 -05:00
pichalite	8a68e1d918	Delete cover position data when cover photo is deleted	2016-12-29 17:28:42 +00:00
psychobunny	22b9f5db92	Merge pull request #5320 from pichalite/issue-5305 ... Confirm before removing user and group cover picture	2016-12-28 20:14:56 -05:00
pichalite	5b646495af	Confirm before removing user and group cover picture	2016-12-29 01:01:35 +00:00
pichalite	ab797b91a4	Let global mods change user avatar	2016-12-28 19:00:14 +00:00
Julian Lam	05fdd35818	removed menu item for flags management in ACP	2016-12-27 15:33:55 -05:00
Julian Lam	277f447f3e	fix minSchemaDate in upgrade.js	2016-12-27 15:30:10 -05:00
Julian Lam	3ea927fa65	fix minSchemaDate in upgrade.js	2016-12-27 15:29:46 -05:00
Julian Lam	db20df0110	Merge branch 'master' into develop	2016-12-27 15:26:59 -05:00
Barış Soner Uşaklı	f225fc3e3d	closes #5314	2016-12-27 21:20:05 +03:00
Julian Lam	a8521d0349	remove double-click to mark all notifications read	2016-12-27 12:55:28 -05:00
psychobunny	d4a1542ba3	use dot instead of spec for tests	2016-12-23 11:32:43 -05:00
barisusakli	c78c4926df	up themes	2016-12-23 17:01:11 +03:00
barisusakli	190b3759a0	fix tests	2016-12-23 16:51:18 +03:00
barisusakli	827e4b4ffd	refactor post tools	2016-12-23 16:35:48 +03:00
barisusakli	a112655bd2	fix missing ;	2016-12-23 15:59:15 +03:00
barisusakli	4943832dd8	fix dupe code	2016-12-23 15:58:40 +03:00
barisusakli	306687ccaa	remove old upgrade code	2016-12-23 15:49:28 +03:00
barisusakli	e48f1dac2a	move bookmarks	2016-12-23 15:37:26 +03:00
barisusakli	c927eb15d7	fix requires	2016-12-23 15:37:18 +03:00
barisusakli	c36e2aa13d	refactor app.js/start	2016-12-23 14:45:37 +03:00