Commit Graph

6918 Commits

Author SHA1 Message Date
psychobunny
28efeef844 latest bs3 2014-09-24 18:36:57 -04:00
psychobunny
bb9a0d8cab moving acp styling to core - now unaffected by selected themes 2014-09-24 18:36:55 -04:00
barisusakli
c000e852b5 closes #1935 2014-09-24 17:13:17 -04:00
psychobunny
016a98e7b1 make sure search dropdown is open if active 2014-09-24 16:25:22 -04:00
psychobunny
7c896768ce case insensitive acp searching 2014-09-24 16:01:34 -04:00
psychobunny
13dd686521 only add divider if there are results 2014-09-24 16:00:23 -04:00
psychobunny
027e8eb54c acp searching, closes #2140 2014-09-24 15:55:45 -04:00
psychobunny
977bc014f9 index acp files 2014-09-24 15:55:44 -04:00
barisusakli
73faa79a69 fix edit page csrf, category slug optional 2014-09-24 15:53:39 -04:00
barisusakli
da64eb0873 closes #2117 2014-09-24 15:42:49 -04:00
psychobunny
5d344b3dac linting 2014-09-24 14:49:16 -04:00
psychobunny
9f40cd03e8 on /admin/settings, render general 2014-09-24 14:47:58 -04:00
psychobunny
117b8dece4 settings acp refactor for dedicated routes 2014-09-24 14:45:49 -04:00
psychobunny
9b17ec9f26 updating database mock for core templates 2014-09-24 13:54:10 -04:00
psychobunny
bd4ab2a24c moving database mock into tests folder 2014-09-24 13:54:09 -04:00
barisusakli
6abb0ff4c8 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2014-09-24 13:50:45 -04:00
barisusakli
1a26cb0938 #2139 2014-09-24 13:50:43 -04:00
psychobunny
64b43d58ea moved core templates into nodebb core (admin, status pages, emails) 2014-09-24 13:45:11 -04:00
barisusakli
4eabf41a21 dont allow invalid status to be set 2014-09-24 13:36:32 -04:00
barisusakli
bedadd8b5f #2137 2014-09-24 00:07:24 -04:00
barisusakli
23197af725 closes #2114 2014-09-23 23:05:46 -04:00
Julian Lam
da2725ec8a upped markdown minver 2014-09-23 23:01:20 -04:00
Julian Lam
bc116c16e9 Merge branch 'hashtalk' 2014-09-23 22:28:47 -04:00
Julian Lam
ecea917d11 closed #2097 -- NodeBB will prefer using Redis as session store if at all possible 2014-09-23 17:18:44 -04:00
Julian Lam
20819e3dfd Revert "use redis session storage instead of connect-mongo"
This reverts commit 056f89d6cf.
2014-09-23 17:18:43 -04:00
barisusakli
8abb247870 fix mention regression 2014-09-23 17:12:37 -04:00
Julian Lam
f41be4ae8b exposed redis' "connect" method, so socket.io can call it from outside database/redis.js, fixed NodeBB requiring Redis as a socket.io store. It will now go back to using in-memory store per process, if no redis config is found in the NodeBB configuration. re: #2097 2014-09-23 17:09:46 -04:00
barisusakli
b1f492dec3 fix redis bulk zadd 2014-09-23 17:07:22 -04:00
Julian Lam
e1211527b0 Merge branch '0.5.1' into hashtalk
Conflicts:
	src/controllers/topics.js
2014-09-23 16:16:45 -04:00
Julian Lam
d7a69e51c1 Merge branch '0.5.1' into hashtalk 2014-09-23 16:13:50 -04:00
Julian Lam
528ee3ad05 Merge remote-tracking branch 'origin/hashtalk' into hashtalk 2014-09-23 16:02:38 -04:00
barisusakli
64c51d5cba check nid before pusing and marking read 2014-09-23 16:02:23 -04:00
Julian Lam
50a7c42f15 Merge remote-tracking branch 'origin/hashtalk' into hashtalk 2014-09-23 16:02:22 -04:00
Julian Lam
05e147b440 Merge branch 'master' of github.com:chronize/NodeBB into chronize-master 2014-09-23 16:00:11 -04:00
Julian Lam
abdcb32ad2 Merge pull request #2119 from Fusselwurm/patch-1
default for missing post_index parameter when topic pagination is used
2014-09-23 15:47:48 -04:00
psychobunny
a0da73dabd don't pass back err if plugin.json is corrupted 2014-09-23 15:03:13 -04:00
psychobunny
180625ece3 forgot to return just posts array 2014-09-23 14:00:28 -04:00
psychobunny
77dfc7378b filter:post.getPostSummaryByPids 2014-09-23 13:58:16 -04:00
psychobunny
0eb4fd89ef don't blow up nodebb if plugin.json is broken 2014-09-23 13:58:14 -04:00
barisusakli
fb764472dd closes #2125 2014-09-23 13:48:19 -04:00
Julian Lam
901470ce05 always pipe child output to parent 2014-09-23 13:44:32 -04:00
barisusakli
0767998022 closes #2124 2014-09-23 13:34:53 -04:00
psychobunny
99bacf910c oops - #2126 2014-09-23 13:33:36 -04:00
psychobunny
7f2254c9da closes https://github.com/NodeBB/NodeBB/issues/2126 2014-09-23 13:08:53 -04:00
Julian Lam
b6f7014a9d fixed infinite scroller so that it takes the height of OP into account when detecting when to load more posts while scrolling up 2014-09-23 13:05:43 -04:00
Julian Lam
a6abde2a2b fixed upward infinite scrolling so that it is less jarring 2014-09-23 13:05:43 -04:00
barisusakli
48c3619028 lowered chat zindex 2014-09-22 22:17:50 -04:00
barisusakli
2d5dc44ce5 closes #2123 2014-09-22 21:54:28 -04:00
barisusakli
515e663f85 getObjectsFix
return empty array if keys is empty or not an array
2014-09-22 21:47:20 -04:00
barisusakli
39392672a2 moved static
removed pageRouter middleware into routes,
helper method to setup page routes
2014-09-22 21:39:02 -04:00