Commit Graph

6065 Commits

Author SHA1 Message Date
Julian Lam
b3e04ed2bc closed #1744 2014-07-09 15:56:53 -04:00
psychobunny
4cbe97a466 don't need this file anymore 2014-07-09 15:56:21 -04:00
Julian Lam
5f68b8f657 passing in all environment variables when forking, #1714 2014-07-09 15:49:04 -04:00
psychobunny
c6183f1a82 closes #1428 2014-07-09 15:41:03 -04:00
psychobunny
ecbb05ccca widgets.render doesn't actually use the url 2014-07-09 15:20:59 -04:00
barisusakli
9d7a8fcc0b getSortedSetRevRangeWithScores 2014-07-09 13:45:33 -04:00
barisusakli
b5df5c0a91 closes #1562, level session 2014-07-09 13:26:39 -04:00
barisusakli
53d68be7c0 level sortedSetsRemove 2014-07-09 12:57:04 -04:00
barisusakli
0f5c1d1892 added messaging hook #1798 2014-07-09 12:43:02 -04:00
barisusakli
75bf9e62be cleaned languages.js 2014-07-09 12:21:40 -04:00
Julian Lam
cac3ebc9e5 vertically centering modal when opened 2014-07-09 11:05:50 -04:00
Julian Lam
c259e0407e closed #1807 2014-07-09 11:03:32 -04:00
Julian Lam
cd8c1eeff6 started #1807 2014-07-09 10:55:22 -04:00
Julian Lam
dae2e14aac epic hax to make the chat message list resize #1788 2014-07-08 21:54:31 -04:00
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