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
|
12 years ago |
|
Julian Lam
|
55afa17651
|
getting chats working between both page and modal, yay #1788
|
12 years ago |
|
Julian Lam
|
a031bc2721
|
highlighting of the user with whom you are currently chatting with #1788
|
12 years ago |
|
Julian Lam
|
07a82ec12c
|
more WIP
|
12 years ago |
|
Julian Lam
|
1db96dc627
|
typing notifcation socket implementation for chat page, #1788
|
12 years ago |
|
Julian Lam
|
84e046185b
|
WIP
|
12 years ago |
|
Julian Lam
|
4d85df5bae
|
issue #1788 - start
|
12 years ago |
|
Julian Lam
|
3d90ca6a46
|
more WIP
|
12 years ago |
|
Julian Lam
|
404ab4878b
|
typing notifcation socket implementation for chat page, #1788
|
12 years ago |
barisusakli
|
bc257c1c10
|
removed dupe version
|
12 years ago |
|
barisusakli
|
c5ccf4333b
|
translate helpers
|
12 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
|
12 years ago |
|
Julian Lam
|
89acec13dc
|
latest translations from transifex
|
12 years ago |
Zurg
|
f430feec65
|
Update users.json
|
12 years ago |
|
Zurg
|
76aa16ce30
|
Update the error.json
|
12 years ago |
|
Barış Soner Uşaklı
|
2bdf9713c9
|
Update README.md
|
12 years ago |
|
Julian Lam
|
89dc8c490a
|
WIP
|
12 years ago |
|
barisusakli
|
43c1787754
|
dont exist if cant parse css
|
12 years ago |
|
barisusakli
|
4ab6a5d4b2
|
removed double meta require
|
12 years ago |
|
barisusakli
|
04144ed75d
|
missing semicolon
|
12 years ago |
|
barisusakli
|
f5232dbc96
|
check db errors on start and upgrade
|
12 years ago |
|
barisusakli
|
37b73e1c02
|
cleaner mongo setRemoveRandom
|
12 years ago |
|
Julian Lam
|
0dad7adb8d
|
issue #1788 - start
|
12 years ago |
|
Julian Lam
|
b03bb3a32b
|
issue #1788 - start
|
12 years ago |
|
barisusakli
|
5097526ae0
|
pass express app to plugins, closes #1789
|
12 years ago |
|
barisusakli
|
f288f80da6
|
meta.js refactor
|
12 years ago |
|
Julian Lam
|
49b4af42e1
|
latest translations for Chinese Simplified
|
12 years ago |
|
Julian Lam
|
507fc2cc56
|
latest persian translations
|
12 years ago |
|
Julian Lam
|
ae37cdb048
|
latest chinese translations
|
12 years ago |
|
barisusakli
|
80cb0cf7e0
|
plugins.js jslint
|
12 years ago |
psychobunny
|
ddcca28cf0
|
pass allowRegistration in login API for #1786
|
12 years ago |
|
Julian Lam
|
8432e3ff82
|
latest translations for persian
|
12 years ago |
|
barisusakli
|
3e75a4397a
|
fixes guest post data in topics
|
12 years ago |
|
barisusakli
|
dcbed4e935
|
closes #1763
show alert if email not confirmed, clicking alert will send confirmation
email
|
12 years ago |
|
Julian Lam
|
a960f53f92
|
latest translations
|
12 years ago |
|
Julian Lam
|
699795621a
|
Merge branch 'master' of github.com:nodebb/NodeBB
|
12 years ago |
|
barisusakli
|
586aeaf53f
|
added error checking to install.js for categories
|
12 years ago |
|
barisusakli
|
5ea74ae9e9
|
closes #1776
|
12 years ago |
|
barisusakli
|
5d0755c4a8
|
package.json
|
12 years ago |
|
barisusakli
|
119d13053d
|
move static to end
|
12 years ago |
|
barisusakli
|
ec1196d288
|
use router for relative path
|
12 years ago |
|
barisusakli
|
38494a2af0
|
pass in session directly
|
12 years ago |
|
barisusakli
|
78c977e8f6
|
removed trailing slash
|
12 years ago |
|
barisusakli
|
9e8584eee7
|
uploads
|
12 years ago |
|
barisusakli
|
24ebf20d7e
|
first commit
|
12 years ago |
|
barisusakli
|
4b005a4037
|
crash fix
|
12 years ago |
|
Julian Lam
|
9a9ce8684c
|
latest translations and fallbacks
|
12 years ago |
|
Barış Soner Uşaklı
|
c0227b46f5
|
Merge pull request #1775 from frissdiegurke/patch-1
fixed no href-attribute handled as external link
|
12 years ago |
frissdiegurke
|
2d9bc7eee7
|
fixed no href-attribute handled as external link
|
12 years ago |
|
barisusakli
|
e6c9647acf
|
display user post topic stats in admin index
|
12 years ago |