Commit Graph

6555 Commits

Author SHA1 Message Date
barisusakli
14fcd36134 closes #2028 2014-08-30 15:39:20 -04:00
barisusakli
603cddc687 closes #1934 2014-08-30 15:19:18 -04:00
barisusakli
4f5c78d675 merge 2014-08-30 14:44:43 -04:00
barisusakli
537dea4e4b crash fix 2014-08-30 14:42:48 -04:00
barisusakli
e6b3da18f2 merge 2014-08-30 11:58:19 -04:00
barisusakli
87c8cd2fb0 another crash fix 2014-08-30 11:56:29 -04:00
barisusakli
73bef8168f another crash fix 2014-08-30 11:54:43 -04:00
barisusakli
0473e7f25b crash fix 2014-08-30 11:50:45 -04:00
barisusakli
6b286a8f07 fix, dont display duped topics on category view 2014-08-29 18:18:31 -04:00
barisusakli
6ac8d9d349 check uid 2014-08-29 17:55:44 -04:00
barisusakli
576081e25f delete user ignored cids on account delete 2014-08-29 16:40:06 -04:00
barisusakli
197226eea6 closes #1742 2014-08-29 15:57:20 -04:00
barisusakli
acef614147 removed 2 BS classes 2014-08-29 14:50:24 -04:00
barisusakli
14fb171072 Merge remote-tracking branch 'origin/master' into 0.5.1 2014-08-29 14:10:21 -04:00
barisusakli
5f2380fdcd dont display all categories 2014-08-29 14:08:13 -04:00
Julian Lam
1f06e4f5a2 added secret key bindings for admins to reload and restart their NodeBBs :shipit: 2014-08-29 12:29:00 -04:00
Julian Lam
063a4e5628 finished up UX integration for in-topic searching, added mousetrap lib to capture ctrl-F only in topic view, closed #1800 2014-08-29 11:48:30 -04:00
Julian Lam
5d22806ded more topic searching work (working example, needs UX tie-in) 2014-08-29 11:18:02 -04:00
Julian Lam
cc930e4042 Merge branch '0.5.1' into topic_searching
Conflicts:
	src/socket.io/topics.js
2014-08-29 09:59:18 -04:00
Julian Lam
fa6daa37eb updated regex to match admin route with no trailing slash 2014-08-29 09:57:13 -04:00
Julian Lam
fa545c5bfd 0.5.0-4
Conflicts:
	package.json
2014-08-28 21:14:37 -04:00
barisusakli
43432e8bbb Merge remote-tracking branch 'origin/master' into 0.5.1 2014-08-28 15:34:58 -04:00
psychobunny
ad00c3cb50 updating font path 2014-08-28 14:29:22 -04:00
psychobunny
20da1b37a5 updating fontawesome, closes #2024 2014-08-28 14:29:09 -04:00
barisusakli
94c765fa25 closes #1996 2014-08-27 18:03:53 -04:00
psychobunny
8f3f409e0f documentation status badge 2014-08-27 16:27:55 -04:00
barisusakli
ba4b98de0e email and username checks on profile update 2014-08-27 16:06:49 -04:00
barisusakli
ed294dd414 Merge remote-tracking branch 'origin/master' into 0.5.1 2014-08-27 15:58:13 -04:00
Julian Lam
cd10248226 basic topic searching via search bar working 2014-08-27 15:26:44 -04:00
Julian Lam
df5283cbae Merge remote-tracking branch 'origin/0.5.1' into topic_searching 2014-08-27 15:04:43 -04:00
barisusakli
347fc05376 getPidIndex socket call 2014-08-27 15:03:36 -04:00
Julian Lam
1d3aafc08f adding sourceRoot to minified mapping 2014-08-27 14:42:10 -04:00
barisusakli
d67cd489cd crash fix 2014-08-27 14:09:15 -04:00
Julian Lam
347d7de25b an ajaxify.go 302 will pass callback and quiet arguments along as well now 2014-08-27 14:04:31 -04:00
Julian Lam
5d32073f2c Merge branch '0.5.1' into topic_searching 2014-08-27 12:29:02 -04:00
barisusakli
fdf19f9025 closes #2022 2014-08-27 01:27:17 -04:00
barisusakli
8eecf59c47 closes #2020 2014-08-26 18:47:52 -04:00
barisusakli
69ce425ae5 closes #2021 2014-08-26 18:45:03 -04:00
barisusakli
42f87a1db7 closes #2017 2014-08-26 15:55:21 -04:00
Julian Lam
2d9ca83ae0 better error messaging when js fails to compile when reloading 2014-08-26 15:31:27 -04:00
psychobunny
4384958bf2 passwords can now contain spaces 2014-08-26 15:05:42 -04:00
psychobunny
6a4bcf8ab8 fixed password error message 2014-08-26 14:57:20 -04:00
Julian Lam
e497290dbc removed commented-out code 2014-08-26 14:51:22 -04:00
Julian Lam
fcbdc5e271 added recompilation of templates to NodeBB Reloading - #2010 2014-08-26 14:48:43 -04:00
barisusakli
eef200be10 closes #1284 2014-08-26 13:47:53 -04:00
Julian Lam
124a4ce89c Merge branch 'hotreload' into 0.5.1
Conflicts:
	public/src/forum/admin/index.js
	src/meta.js
2014-08-26 13:12:25 -04:00
Julian Lam
5f96823f66 allowed the "forum updated" message to show up for reloads as well 2014-08-26 11:41:31 -04:00
psychobunny
1f6f2c13d5 apparently this was confusing 2014-08-26 11:35:54 -04:00
Julian Lam
ff38394f96 latest translations 2014-08-26 10:32:16 -04:00
barisusakli
dc0cec0352 merge 2014-08-25 20:01:12 -04:00