Commit Graph

13475 Commits

Author SHA1 Message Date
Julian Lam
da47f5675c don't wrap images in links if the link is blank, fixes #4976 2016-08-25 13:01:16 -04:00
barisusakli
6c8a34ae50 up persona 2016-08-25 17:32:26 +03:00
barisusakli
f996dfab91 removed find 2016-08-25 17:02:22 +03:00
barisusakli
ad0dd3bf28 up theme 2016-08-25 16:56:13 +03:00
barisusakli
5983235875 .translateAttr 2016-08-25 16:40:18 +03:00
barisusakli
bb6a3f3a52 up themes 2016-08-25 16:26:54 +03:00
barisusakli
276031cd6f closes #4585, closes https://github.com/NodeBB/nodebb-theme-persona/issues/299 2016-08-25 16:05:07 +03:00
NodeBB Misty
5393a98e26 Latest translations and fallbacks 2016-08-25 09:02:33 -04:00
barisusakli
abd0a10918 added selected group to profile api 2016-08-25 14:24:17 +03:00
barisusakli
b6ac809a7d moved sync code out of async 2016-08-25 13:56:43 +03:00
barisusakli
9eb64aa3fa closes #4975 2016-08-25 10:30:51 +03:00
psychobunny
6516b70f9a Merge pull request #4974 from yariplus/patch-10
Fix requiring files outside of node_modules
2016-08-24 17:51:50 -04:00
Timothy Fike
ed3bc06dee Fix requiring files outside of node_modules
e.g.
```
"scripts": [
        "../../public/vendor/jquery/js/jquery-ui-1.10.4.custom.js"
]
```
2016-08-24 17:48:04 -04:00
Julian Lam
f0c4c59793 up composer 2016-08-24 16:12:00 -04:00
Julian Lam
358deb386a up themes 2016-08-24 11:14:15 -04:00
NodeBB Misty
15d9a5f4d5 Latest translations and fallbacks 2016-08-24 09:02:29 -04:00
barisusakli
6a04e2909d page param not used 2016-08-24 14:54:18 +03:00
barisusakli
0d7d6b665f up themes 2016-08-24 14:52:18 +03:00
barisusakli
84f88a6f15 refactor user search
use pagination on results
removed infinite scroll
changed the term and section to use the query param as well
pagination urls respect search
2016-08-24 14:47:01 +03:00
barisusakli
768c1b37d4 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2016-08-24 12:14:33 +03:00
barisusakli
0fb74a2636 pass err object along so errors dont get treated as 404 @julianlam 2016-08-24 12:14:28 +03:00
Barış Soner Uşaklı
2e1e40026a Merge pull request #4971 from BenLubar/search-null
Fix null object in search for users with no preferences set.
2016-08-24 10:23:07 +03:00
Ben Lubar
598935b3bf Fix null object in search for users with no preferences set.
localStorage.getItem returned null, and JSON.parse(null) is null.
2016-08-23 19:35:50 -05:00
Julian Lam
dbdbfc6d75 allowing the port to be defined by a custom port environment variable, for certain hosting environments 2016-08-23 15:10:52 -04:00
barisusakli
34276dd638 up themes 2016-08-23 20:04:25 +03:00
barisusakli
5d5b74f3ed if no sorting specificed let search plugins handle 2016-08-23 19:59:25 +03:00
barisusakli
31751c9d8a closes #4960 2016-08-23 18:47:07 +03:00
NodeBB Misty
61efabf4ec Latest translations and fallbacks 2016-08-23 09:03:30 -04:00
Barış Soner Uşaklı
34a116149a Merge pull request #4969 from BenLubar/category-ignore-recursive
ignore/watch categories recursively
2016-08-23 14:52:44 +03:00
Ben Lubar
862fd1a94a ignore/watch categories recursively 2016-08-23 00:24:34 -05:00
Julian Lam
ebb50160cb wrap saving of url_parsed in conditional, since url isn't set during setup 2016-08-22 18:16:09 -04:00
Julian Lam
60ea7d5121 fixes #4966 2016-08-22 16:24:31 -04:00
Ben Lubar
de49de3c56 Show accounts using the same IP address as a registration queue entry (#4965) 2016-08-22 15:42:49 -04:00
NodeBB Misty
3864e8044e Latest translations and fallbacks 2016-08-22 09:02:56 -04:00
barisusakli
e4fa0289d6 closes #4961 2016-08-22 14:38:13 +03:00
NodeBB Misty
f4fafeb500 Latest translations and fallbacks 2016-08-21 09:02:34 -04:00
Julian Lam
8a107c8d6c saving getUsersCSV to event log and outputting to log if pressed 2016-08-19 12:40:57 -04:00
barisusakli
409621c661 closes #4843 2016-08-19 17:50:16 +03:00
NodeBB Misty
d5b8b1da56 Latest translations and fallbacks 2016-08-19 09:03:20 -04:00
Julian Lam
8d745ceb07 moving chat dropdown generation to tpl /cc @pichalite 2016-08-18 14:39:51 -04:00
Julian Lam
a412ef04b0 up persona 2016-08-18 13:29:32 -04:00
Julian Lam
48ade6099c fixes #4469 2016-08-18 11:07:44 -04:00
Julian Lam
093b21fc31 fixes #4954 2016-08-18 10:05:52 -04:00
NodeBB Misty
bf3b270c77 Latest translations and fallbacks 2016-08-18 09:02:32 -04:00
barisusakli
096cbf30cf up themes 2016-08-18 13:42:43 +03:00
Barış Soner Uşaklı
37f7b89e2a Merge pull request #4959 from pichalite/login-sessions
move login sessions section to account info route
2016-08-18 13:18:57 +03:00
pichalite
0b431ec41c move login sessions section to account info route 2016-08-18 00:15:36 +00:00
Anil Mandepudi
a36af97c0c fix breadcrumb for account info page (#4958) 2016-08-17 19:51:58 -04:00
psychobunny
59bd1d71f4 return roomId in optional callback when opening new chat 2016-08-17 16:32:53 -04:00
NodeBB Misty
32dea338b0 Latest translations and fallbacks 2016-08-17 09:03:13 -04:00