Commit Graph

12303 Commits

Author SHA1 Message Date
Julian Lam
d0f08b4dd4 added prompt to passport input for Google SSO 2016-04-18 16:04:09 -04:00
Julian Lam
9cfa1bb976 Merge branch 'pichalite-new-chat-message' 2016-04-18 14:56:52 -04:00
Julian Lam
dd3c00d9e2 updated theme versions 2016-04-18 14:56:41 -04:00
Julian Lam
674136423c Merge branch 'new-chat-message' of https://github.com/pichalite/NodeBB into pichalite-new-chat-message 2016-04-18 14:56:27 -04:00
psychobunny
5f5d8e6b56 ah, woops 2016-04-18 11:22:38 -04:00
psychobunny
6e617dd69a closes #4520 2016-04-18 10:59:55 -04:00
psychobunny
d24b15a584 closes #4523 2016-04-18 10:06:32 -04:00
barisusakli
ff9b2bad49 closes #4512 2016-04-18 16:07:04 +03:00
NodeBB Misty
accd9b6e2e Latest translations and fallbacks 2016-04-18 09:02:24 -04:00
barisusakli
ba6f687880 up themes 2016-04-18 15:47:06 +03:00
barisusakli
ec33a57f77 closes #3128 2016-04-18 15:44:07 +03:00
Barış Soner Uşaklı
35ac64db7f Merge pull request #4504 from BenLubar/unread-topics
Add /unread/new, which is the same as /unread but does not show topics that were already partially read by the user.
2016-04-18 14:42:10 +03:00
Barış Soner Uşaklı
d95944f8d0 Merge pull request #4529 from kerneldeveloper/master
Make the description more clear.
2016-04-18 13:29:17 +03:00
Barış Soner Uşaklı
3d6f5fa54e Merge pull request #4535 from pichalite/acp-user-reg
move ACP setting for user registration type
2016-04-18 10:16:22 +03:00
pichalite
4bb5dad05d move ACP user reg type 2016-04-18 06:58:20 +00:00
psychobunny
4c7d8b1118 Merge pull request #4534 from darktrge/patch-1
remove HTTP(S) schema for external bootstrap CSS file.
2016-04-17 13:02:49 -04:00
Danijel
b7335c7a61 remove HTTP(S) schema for external bootstrap CSS file.
remove HTTP(S) schema from external bootstrap CSS file to avoid mixed content error.
2016-04-17 15:38:43 +02:00
Mr.Lee
3e2f36fc29 Make the description more clear.
The same description in mongo.js  and install.js are ambiguous.
2016-04-16 23:34:57 +08:00
NodeBB Misty
a3e829e974 Latest translations and fallbacks 2016-04-16 09:02:26 -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