psychobunny
|
0a293be823
|
linting categories.js and footer.js
|
2014-03-12 16:18:48 -04:00 |
|
psychobunny
|
d183e58771
|
linting admin/groups
|
2014-03-12 16:17:00 -04:00 |
|
psychobunny
|
6ea760d636
|
linting admin/index; admin/languages
|
2014-03-12 16:15:39 -04:00 |
|
psychobunny
|
2d65a746e4
|
linting admin/settings
|
2014-03-12 16:14:18 -04:00 |
|
psychobunny
|
b515995432
|
removed unnecessary switch case
|
2014-03-12 16:12:23 -04:00 |
|
psychobunny
|
e9fb2f4135
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2014-03-12 16:02:03 -04:00 |
|
psychobunny
|
44a91fe9ea
|
linting admin/themes
|
2014-03-12 16:01:58 -04:00 |
|
Julian Lam
|
ca2e9d7d9e
|
linting and moving xregexp back to .js
|
2014-03-12 15:51:24 -04:00 |
|
psychobunny
|
da0355ef79
|
remove async dep for widgets (30kb was overkill for one use of async.each); linting
|
2014-03-12 15:05:07 -04:00 |
|
Julian Lam
|
2826381b20
|
draft saving in composer -- resolved #1197
|
2014-03-12 14:08:55 -04:00 |
|
barisusakli
|
c320051a1e
|
chat jshint
|
2014-03-12 01:40:35 -04:00 |
|
Julian Lam
|
e757183cec
|
linting
|
2014-03-12 01:29:24 -04:00 |
|
Julian Lam
|
89ba0840e6
|
minor reordering of jslint comment
|
2014-03-12 01:23:35 -04:00 |
|
Julian Lam
|
0668556d4f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
2014-03-12 01:23:20 -04:00 |
|
Julian Lam
|
c000a8c5ba
|
linting
|
2014-03-12 01:23:11 -04:00 |
|
barisusakli
|
e9ab9dcce2
|
search cleanup
|
2014-03-12 00:13:42 -04:00 |
|
barisusakli
|
67f1251ba3
|
pagination cleanup
|
2014-03-11 22:54:17 -04:00 |
|
Julian Lam
|
392075eb27
|
fixing theme previews in subfolder installs
|
2014-03-11 20:14:45 -04:00 |
|
Julian Lam
|
4343f240d0
|
moving async back to proper vendor folder
|
2014-03-11 18:51:59 -04:00 |
|
Julian Lam
|
2f1707e772
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
2014-03-11 18:48:57 -04:00 |
|
barisusakli
|
813b3d6fcc
|
changes for live streaming of posts
|
2014-03-11 18:46:27 -04:00 |
|
psychobunny
|
1e9850b6b9
|
vendor*
|
2014-03-11 18:38:23 -04:00 |
|
psychobunny
|
df29410c08
|
moving async back to require.js modules/vendor folder
|
2014-03-11 18:37:16 -04:00 |
|
Julian Lam
|
3dc4fd9fd9
|
added sounds for incoming and outgoing chat, and new notification
|
2014-03-11 17:47:13 -04:00 |
|
Julian Lam
|
f65a7f96ff
|
moving async to proper vendor folder
|
2014-03-11 16:32:28 -04:00 |
|
Julian Lam
|
cb304d7d54
|
fixed #1188
|
2014-03-11 15:56:04 -04:00 |
|
barisusakli
|
a5f4135c62
|
added socket listeners to home
|
2014-03-11 15:15:54 -04:00 |
|
psychobunny
|
29ad8d2582
|
closes #1192
|
2014-03-11 14:41:32 -04:00 |
|
barisusakli
|
3d68c7c6b6
|
added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js
|
2014-03-11 03:39:41 -04:00 |
|
psychobunny
|
a68ba044c3
|
fixed missing topic_name and viewcount when reverse infinite scrolling
|
2014-03-09 23:48:22 -04:00 |
|
psychobunny
|
857df86726
|
fixed pagination, and loading of template blocks on cold load (temp solution)
|
2014-03-09 22:35:09 -04:00 |
|
psychobunny
|
875c8ed66c
|
console.log
|
2014-03-09 21:21:57 -04:00 |
|
psychobunny
|
62afe65ccf
|
bugfix + deprecated templates.getTemplateNameFromUrl
|
2014-03-09 21:05:01 -04:00 |
|
psychobunny
|
712c382a28
|
optimizing ajaxify (still needs work though)
|
2014-03-09 20:48:15 -04:00 |
|
psychobunny
|
464c2f42c3
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/admin/themes.tpl
src/meta.js
src/routes/api.js
|
2014-03-09 19:19:13 -04:00 |
|
barisusakli
|
73c89010cb
|
closes #1182
|
2014-03-09 17:29:05 -04:00 |
|
barisusakli
|
57f9f8bc57
|
closes #1176
|
2014-03-09 16:39:31 -04:00 |
|
psychobunny
|
1ef95bd09e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
app.js
public/templates/category.tpl
public/templates/popular.tpl
public/templates/recent.tpl
public/templates/unread.tpl
src/routes/plugins.js
src/webserver.js
|
2014-03-09 16:07:34 -04:00 |
|
barisusakli
|
6496b91c29
|
closes #1180
|
2014-03-09 14:02:30 -04:00 |
|
Julian Lam
|
6fb393de78
|
fixing #1177
|
2014-03-08 16:50:32 -05:00 |
|
Julian Lam
|
5a8a3627d2
|
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
|
2014-03-08 16:04:22 -05:00 |
|
psychobunny
|
e84dd4fd94
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/accountedit.tpl
public/templates/header.tpl
src/routes/meta.js
src/webserver.js
|
2014-03-07 19:21:40 -05:00 |
|
Baris Soner Usakli
|
30130b2d62
|
set back to false when loading indicator fades out
|
2014-03-06 20:53:41 -05:00 |
|
Baris Soner Usakli
|
6a824a2e10
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2014-03-06 17:57:15 -05:00 |
|
Baris Soner Usakli
|
7dfdab0a2d
|
search page change
|
2014-03-06 17:57:07 -05:00 |
|
psychobunny
|
7183fda2eb
|
console.log
|
2014-03-06 16:48:55 -05:00 |
|
psychobunny
|
bcd8137d0e
|
console.log
|
2014-03-06 16:47:59 -05:00 |
|
psychobunny
|
55a7838725
|
temporary templateMapping fix for admin side; will come back to this after merging this branch
|
2014-03-06 16:00:17 -05:00 |
|
Julian Lam
|
1f23642ab4
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
2014-03-06 15:38:02 -05:00 |
|
Julian Lam
|
e9e53ad95e
|
added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
|
2014-03-06 15:32:06 -05:00 |
|