Commit Graph

29855 Commits

Author SHA1 Message Date
Aziz Khoury
807e3a9d7e adding cls back in socketio index 2016-04-15 16:45:04 -04:00
Aziz Khoury
4f3a962f7f what did i do? 2016-04-15 16:42:22 -04:00
Aziz Khoury
01ee020750 bring back disconnect only for CLS purposes 2016-04-15 16:39:08 -04:00
Aziz Khoury
53e9627001 unify request as a store key for both http and websockets calls 2016-04-15 15:55:55 -04:00
pichalite
b5d798077f remove log
:fail:
2016-04-15 10:57:58 -07:00
pichalite
30ce17ef73 mark room unread on new message 2016-04-15 17:44:16 +00:00
barisusakli
83d863f3db closes #4517 2016-04-15 16:07:56 +03:00
NodeBB Misty
e551cbfa74 Latest translations and fallbacks 2016-04-15 09:02:24 -04:00
psychobunny
54859e8634 up persona 2016-04-14 13:46:23 -04:00
barisusakli
19bc6fa133 fix undefined callback in sounds 2016-04-14 18:52:54 +03:00
barisusakli
6cc08f3868 fix indent 2016-04-14 18:44:44 +03:00
barisusakli
e564260650 moved groupTitle from user settings to user profile/edit 2016-04-14 18:41:52 +03:00
Julian Lam
2ddcaa9ce1 added new hook for hotswap preparation 2016-04-14 11:16:12 -04:00
NodeBB Misty
dde7f26944 Incremented version number 2016-04-13 15:24:27 -04:00
Julian Lam
3390b7d7f6 closes #4516 2016-04-13 11:58:14 -04:00
Julian Lam
604373b5e4 fixing plugin checker which erroneously always returned success 2016-04-13 10:43:29 -04:00
Julian Lam
099749e908 upped composer, re: nodebb/nodebb-plugin-composer-default#33 2016-04-13 09:18:20 -04:00
barisusakli
229326acd6 another tab 2016-04-13 10:32:59 +03:00
barisusakli
f43be13f87 fix indent 2016-04-13 10:32:31 +03:00
barisusakli
bec688cea0 relative path fix 2016-04-13 10:31:59 +03:00
Barış Soner Uşaklı
3b1c1d2cfd Merge pull request #4513 from pichalite/post-tools
show post tools for global mod on post delete
2016-04-12 10:04:38 +03:00
pichalite
aad64cad35 show post tools for global mod on delete 2016-04-12 05:37:39 +00:00
barisusakli
f7ac1d89ff fix undefined next 2016-04-11 14:41:04 +03:00
Barış Soner Uşaklı
31815f7d22 Merge pull request #4510 from rbeer/teaser-pid
Add pid to teaser ajaxify data
2016-04-10 17:48:04 +03:00
Raphael Beer
006496efe3 Add pid to teaser ajaxify data 2016-04-10 14:09:33 +02:00
Barış Soner Uşaklı
9860320496 Merge pull request #4508 from pichalite/issue-4506
fixes #4506
2016-04-09 08:51:07 +03:00
pichalite
e23377580d fixes #4506 2016-04-08 23:55:10 +00:00
Ben Lubar
114e957b0f add client-side unread count support for the "new" filter 2016-04-08 13:54:51 -05:00
Ben Lubar
217f0c5652 Switch to a named filter for unread to allow future expansion.
Don't use the query string as it is not passed to infinite scroll.
2016-04-08 13:42:47 -05:00
Ben Lubar
a61d947295 allow filtering /unread to only topics that have not yet been seen 2016-04-08 13:31:21 -05:00
barisusakli
a81285befa dont crash if category doesn't exist 2016-04-08 18:09:46 +03:00
Julian Lam
e481ed21eb Using pid as discriminator for mergeId
... for favourite and upvote notifications.
2016-04-07 21:22:56 -04:00
Julian Lam
c89a02bfb9 upped composer again 2016-04-07 17:53:11 -04:00
Julian Lam
4105565ed1 upped composer version @BenLubar @RaceProUK 2016-04-07 17:50:53 -04:00
Julian Lam
0449e014f6 updated some help text 2016-04-07 17:47:20 -04:00
psychobunny
c88ed66312 closes #4502 2016-04-07 16:55:53 -04:00
Julian Lam
a9f966f23c closes #4503, /cc @BenLubar 2016-04-07 11:32:18 -04:00
Julian Lam
ba44db5b5b updated dependency check logic to better handle missing dependencies 2016-04-07 10:47:13 -04:00
NodeBB Misty
2e65e8ae7d Latest translations and fallbacks 2016-04-07 09:02:29 -04:00
Julian Lam
430adc366c fix #4498 2016-04-06 21:49:43 -04:00
Julian Lam
7bc4ea18f4 Merge remote-tracking branch 'origin/master' into fix-vendors 2016-04-06 21:43:19 -04:00
Julian Lam
930c2b7472 Merge branch 'master' into fix-vendors 2016-04-06 21:42:37 -04:00
psychobunny
075df88600 Merge pull request #4500 from frissdiegurke/master
Emoji update
2016-04-06 18:31:38 -04:00
Ole R
5023935baf Enable nodebb-plugin-emoji-one by default 2016-04-06 23:58:48 +02:00
Ole R
0d0e4fa94f Update dependencies 2016-04-06 23:57:45 +02:00
Yami
5158314ac4 Merge pull request #1 from BenLubar/yamikuronue-coverage-fix
fixed the merge conflict by merging
2016-04-06 06:24:23 -04:00
Julian Lam
bf73c0de5f closes #3286 2016-04-05 21:34:53 -04:00
Ben Lubar
1a77b18a82 Revert "Updating instructions to match reality"
Example of a working config file:

{
        "url": "http://localhost:4567",
        "secret": "c6e41882-ac49-4977-a712-312e47eb0fa4",
        "database": "mongo",
        "port": "4567",

        "mongo": {
                "host": "172.17.0.2",
                "port": 27017
        },

        "test_database": {
                "host": "172.17.0.2",
                "port": "27017",
                "password": "",
                "database": "1"
        }
}

This reverts commit 65848d1a76.
2016-04-05 19:47:45 -05:00
Ben Lubar
b3da9f74b0 Merge remote-tracking branch 'yamikuronue/master' into yamikuronue-coverage-fix 2016-04-05 19:46:44 -05:00
Julian Lam
053bbc06fa fixes apapadimoulis/what-bugs#84
closes #4496
2016-04-05 20:12:39 -04:00