11851 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	4404387218	Merge branch 'master' into chat-route	2014-07-08 20:09:09 -04:00
barisusakli	bb9caa7228	removed dupe	2014-07-08 14:15:53 -04:00
psychobunny	46d3e4a6eb	undo	2014-07-08 13:26:18 -04:00
psychobunny	615b81a447	closes #1797	2014-07-08 13:14:59 -04:00
psychobunny	0c55417df2	purge topic if it's the post is purged in that topic	2014-07-08 12:37:31 -04:00
psychobunny	0aef2d2be9	closes #1805	2014-07-08 12:31:44 -04:00
psychobunny	3f81aaafb0	Merge pull request #1804 from Fastinyoh/master ... Added a hook: action:user.delete	2014-07-08 12:19:24 -04:00
Julian Lam	7b3159292f	added some utility functions for #1798, fixed chat notifications bodyLong value	2014-07-08 11:55:55 -04:00
Julian Lam	2b15f46638	removed console.log, fixing language key reference error #1788	2014-07-08 10:05:59 -04:00
dhingey	f7372ba8d5	Added a hook: action:user.delete ... Allows plugins to access the uid of the user being deleted.	2014-07-08 00:21:58 -07:00
Julian Lam	95102f7e74	jshinting	2014-07-07 20:02:26 -04:00
Julian Lam	71916f0691	marathon bugfixing with @barisusakli re: #1788	2014-07-07 19:47:03 -04:00
barisusakli	5497b8c419	striptags	2014-07-07 17:56:58 -04:00
barisusakli	64d04f7aa6	closes #1803	2014-07-07 17:36:14 -04:00
Julian Lam	d9cdd2f165	limiting recent chats to 20	2014-07-07 17:02:35 -04:00
Julian Lam	13e4e8dad7	a couple final tweaks to contact list and such... #1788	2014-07-07 16:59:46 -04:00
Julian Lam	ac9f104b39	Merge remote-tracking branch 'origin/chat-route' into chat-route ... How in the seven hells do I manage to conflict myself? Conflicts: public/src/forum/chats.js public/src/modules/chat.js src/middleware/middleware.js	2014-07-07 16:06:56 -04:00
Julian Lam	c684ec8958	Merge remote-tracking branch 'origin/master'	2014-07-07 15:57:29 -04:00
Julian Lam	186473fa7b	adding undefined check to hrefEmpty	2014-07-07 15:57:21 -04:00
Julian Lam	55afa17651	getting chats working between both page and modal, yay #1788	2014-07-07 15:55:34 -04:00
Julian Lam	a031bc2721	highlighting of the user with whom you are currently chatting with #1788	2014-07-07 13:09:09 -04:00
barisusakli	80e69bc210	missing ;	2014-07-07 12:57:31 -04:00
Julian Lam	07a82ec12c	more WIP	2014-07-07 12:31:11 -04:00
Julian Lam	1db96dc627	typing notifcation socket implementation for chat page, #1788	2014-07-07 12:31:10 -04:00
Julian Lam	84e046185b	WIP	2014-07-07 12:31:10 -04:00
Julian Lam	4d85df5bae	issue #1788 - start	2014-07-07 12:31:10 -04:00
Julian Lam	3d90ca6a46	more WIP	2014-07-07 12:26:17 -04:00
Julian Lam	404ab4878b	typing notifcation socket implementation for chat page, #1788	2014-07-06 16:28:49 -04:00
barisusakli	bc257c1c10	removed dupe version	2014-07-06 15:12:13 -04:00
barisusakli	c5ccf4333b	translate helpers	2014-07-05 16:59:02 -04:00
Julian Lam	d18461c8eb	wtf. Merge remote-tracking branch 'origin/chat-route' into chat-route ... Conflicts: public/language/en_GB/modules.json src/controllers/accounts.js src/middleware/middleware.js src/routes/index.js	2014-07-05 15:46:37 -04:00
Julian Lam	89acec13dc	latest translations from transifex	2014-07-05 15:05:47 -04:00
Zurg	f430feec65	Update users.json	2014-07-05 15:05:47 -04:00
Zurg	76aa16ce30	Update the error.json	2014-07-05 15:05:47 -04:00
Barış Soner Uşaklı	2bdf9713c9	Update README.md	2014-07-05 15:05:09 -04:00
Julian Lam	89dc8c490a	WIP	2014-07-05 15:01:25 -04:00
barisusakli	43c1787754	dont exist if cant parse css	2014-07-05 14:27:21 -04:00
barisusakli	4ab6a5d4b2	removed double meta require	2014-07-05 00:19:19 -04:00
barisusakli	04144ed75d	missing semicolon	2014-07-05 00:11:40 -04:00
barisusakli	f5232dbc96	check db errors on start and upgrade	2014-07-05 00:11:21 -04:00
barisusakli	37b73e1c02	cleaner mongo setRemoveRandom	2014-07-04 23:36:40 -04:00
Julian Lam	0dad7adb8d	issue #1788 - start	2014-07-04 22:04:20 -04:00
Julian Lam	b03bb3a32b	issue #1788 - start	2014-07-04 19:54:47 -04:00
barisusakli	5097526ae0	pass express app to plugins, closes #1789	2014-07-04 18:25:08 -04:00
barisusakli	f288f80da6	meta.js refactor	2014-07-04 18:20:44 -04:00
Julian Lam	49b4af42e1	latest translations for Chinese Simplified	2014-07-04 16:01:42 -04:00
Julian Lam	507fc2cc56	latest persian translations	2014-07-04 16:01:42 -04:00
Julian Lam	ae37cdb048	latest chinese translations	2014-07-04 16:01:42 -04:00
barisusakli	80cb0cf7e0	plugins.js jslint	2014-07-04 14:43:08 -04:00
psychobunny	ddcca28cf0	pass allowRegistration in login API for #1786	2014-07-04 11:41:03 -04:00