Julian Lam
|
4404387218
|
Merge branch 'master' into chat-route
|
11 years ago |
barisusakli
|
bb9caa7228
|
removed dupe
|
11 years ago |
psychobunny
|
46d3e4a6eb
|
undo
|
11 years ago |
|
psychobunny
|
615b81a447
|
closes #1797
|
11 years ago |
|
psychobunny
|
0c55417df2
|
purge topic if it's the post is purged in that topic
|
11 years ago |
|
psychobunny
|
0aef2d2be9
|
closes #1805
|
11 years ago |
psychobunny
|
3f81aaafb0
|
Merge pull request #1804 from Fastinyoh/master
Added a hook: action:user.delete
|
11 years ago |
|
Julian Lam
|
7b3159292f
|
added some utility functions for #1798, fixed chat notifications bodyLong value
|
11 years ago |
|
Julian Lam
|
2b15f46638
|
removed console.log, fixing language key reference error #1788
|
11 years ago |
dhingey
|
f7372ba8d5
|
Added a hook: action:user.delete
Allows plugins to access the uid of the user being deleted.
|
11 years ago |
|
Julian Lam
|
95102f7e74
|
jshinting
|
11 years ago |
|
Julian Lam
|
71916f0691
|
marathon bugfixing with @barisusakli re: #1788
|
11 years ago |
|
barisusakli
|
5497b8c419
|
striptags
|
11 years ago |
|
barisusakli
|
64d04f7aa6
|
closes #1803
|
11 years ago |
|
Julian Lam
|
d9cdd2f165
|
limiting recent chats to 20
|
11 years ago |
|
Julian Lam
|
13e4e8dad7
|
a couple final tweaks to contact list and such... #1788
|
11 years ago |
|
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
|
11 years ago |
|
Julian Lam
|
c684ec8958
|
Merge remote-tracking branch 'origin/master'
|
11 years ago |
|
Julian Lam
|
186473fa7b
|
adding undefined check to hrefEmpty
|
11 years ago |
|
Julian Lam
|
55afa17651
|
getting chats working between both page and modal, yay #1788
|
11 years ago |
|
Julian Lam
|
a031bc2721
|
highlighting of the user with whom you are currently chatting with #1788
|
11 years ago |
|
barisusakli
|
80e69bc210
|
missing ;
|
11 years ago |
|
Julian Lam
|
07a82ec12c
|
more WIP
|
11 years ago |
|
Julian Lam
|
1db96dc627
|
typing notifcation socket implementation for chat page, #1788
|
11 years ago |
|
Julian Lam
|
84e046185b
|
WIP
|
11 years ago |
|
Julian Lam
|
4d85df5bae
|
issue #1788 - start
|
11 years ago |
|
Julian Lam
|
3d90ca6a46
|
more WIP
|
11 years ago |
|
Julian Lam
|
404ab4878b
|
typing notifcation socket implementation for chat page, #1788
|
11 years ago |
|
barisusakli
|
bc257c1c10
|
removed dupe version
|
11 years ago |
|
barisusakli
|
c5ccf4333b
|
translate helpers
|
11 years ago |
|
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
|
11 years ago |
|
Julian Lam
|
89acec13dc
|
latest translations from transifex
|
11 years ago |
Zurg
|
f430feec65
|
Update users.json
|
11 years ago |
|
Zurg
|
76aa16ce30
|
Update the error.json
|
11 years ago |
|
Barış Soner Uşaklı
|
2bdf9713c9
|
Update README.md
|
11 years ago |
|
Julian Lam
|
89dc8c490a
|
WIP
|
11 years ago |
|
barisusakli
|
43c1787754
|
dont exist if cant parse css
|
11 years ago |
|
barisusakli
|
4ab6a5d4b2
|
removed double meta require
|
11 years ago |
|
barisusakli
|
04144ed75d
|
missing semicolon
|
11 years ago |
|
barisusakli
|
f5232dbc96
|
check db errors on start and upgrade
|
11 years ago |
|
barisusakli
|
37b73e1c02
|
cleaner mongo setRemoveRandom
|
11 years ago |
|
Julian Lam
|
0dad7adb8d
|
issue #1788 - start
|
11 years ago |
|
Julian Lam
|
b03bb3a32b
|
issue #1788 - start
|
11 years ago |
|
barisusakli
|
5097526ae0
|
pass express app to plugins, closes #1789
|
11 years ago |
|
barisusakli
|
f288f80da6
|
meta.js refactor
|
11 years ago |
|
Julian Lam
|
49b4af42e1
|
latest translations for Chinese Simplified
|
11 years ago |
|
Julian Lam
|
507fc2cc56
|
latest persian translations
|
11 years ago |
|
Julian Lam
|
ae37cdb048
|
latest chinese translations
|
11 years ago |
|
barisusakli
|
80cb0cf7e0
|
plugins.js jslint
|
11 years ago |
|
psychobunny
|
ddcca28cf0
|
pass allowRegistration in login API for #1786
|
11 years ago |