Commit Graph

1044 Commits

Author SHA1 Message Date
Julian Lam
bcc65fd879 closed #328 2013-09-24 08:38:19 -04:00
Julian Lam
99440585e6 Merge branch 'master' into optimize-22-09-2013
Conflicts:
	package.json
2013-09-23 20:04:09 -04:00
Julian Lam
521586f08f Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-23 15:45:23 -04:00
Baris Usakli
bae9f46d8b small fixes to search 2013-09-23 15:31:52 -04:00
Julian Lam
d7ea24e218 issue #322 - minifying css file and added jquery to minified compilation 2013-09-23 15:27:46 -04:00
Julian Lam
e621d7e601 closed #322 - autominifying client-side assets on load 2013-09-23 15:21:34 -04:00
Baris Usakli
b25c3d8b67 closes #324 2013-09-23 14:40:31 -04:00
Baris Usakli
bade99d069 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-09-23 13:43:25 -04:00
Baris Usakli
776b51fef7 closes #323 2013-09-23 13:43:15 -04:00
Julian Lam
7fdf83089d linting 2013-09-23 12:50:27 -04:00
Julian Lam
043aafd7b7 closed #315 2013-09-22 20:40:10 -04:00
Julian Lam
5f00f1e18e renamed "toHTML" method to "parse" 2013-09-22 13:54:21 -04:00
Julian Lam
c940ce3329 camelCased get_latest_undeleted_pid method 2013-09-22 13:33:05 -04:00
Julian Lam
2366e2b209 refactored get_latest_undeleted_pid to not blindly call getPostsByTid in
order to determine post deletion. (issue #320)
2013-09-22 13:28:10 -04:00
Julian Lam
2b7fd3c9d1 interim commit 2013-09-22 12:55:03 -04:00
Baris Soner Usakli
de34c7580f closes #314 2013-09-22 00:29:31 -04:00
Julian Lam
8243019a60 closed #312 2013-09-20 20:43:02 -04:00
Baris Soner Usakli
6be5bcc4c8 closes #308 2013-09-19 20:43:56 -04:00
Baris Usakli
efef9c864c closes #306 2013-09-19 15:02:35 -04:00
Baris Usakli
27cb837b08 closes #303 2013-09-19 12:29:25 -04:00
Baris Usakli
f9442db96f closes #284 2013-09-18 16:23:08 -04:00
Baris Usakli
e5ef498164 merged users.tpl 2013-09-18 16:05:01 -04:00
Baris Usakli
24e4be77d8 closes #304 2013-09-18 16:01:54 -04:00
Julian Lam
ccca4d2914 fixed issue where meta was called before nconf loaded 2013-09-18 12:15:29 -04:00
psychobunny
28704a6164 hinting 2013-09-18 10:50:02 -04:00
psychobunny
cf4ba9d1d3 format/jshint favourites.js 2013-09-18 10:44:54 -04:00
Julian Lam
c69e30c146 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-18 07:23:50 -04:00
psychobunny
fd32d75d3b jshinted categories.js 2013-09-17 15:54:08 -04:00
psychobunny
64b071f277 nconf and redis wrapper no longer global objects. jshinted app.js. updated sockets.io to latest 2013-09-17 15:38:57 -04:00
Julian Lam
af246ad0d7 Merge remote-tracking branch 'origin' 2013-09-17 15:14:15 -04:00
Julian Lam
56a87329ec removing extra line 2013-09-17 15:14:11 -04:00
Baris Usakli
ce61138351 fixed conflicts 2013-09-17 13:42:07 -04:00
Baris Usakli
564662ee00 closes #294 2013-09-17 13:37:03 -04:00
psychobunny
1b9e451a6f formatting - server side admin 2013-09-17 13:10:58 -04:00
psychobunny
1780b343b4 formatting - routes 2013-09-17 13:10:14 -04:00
psychobunny
aea3181d27 formatting - server side core 2013-09-17 13:09:37 -04:00
Julian Lam
d249f411f8 closed #300 - issue where web socket connections were not working properly
with passworded redis instances
2013-09-15 20:51:36 -04:00
Julian Lam
79280b195e changed get_uid_by_userslug to be error-first 2013-09-15 10:15:23 -04:00
Julian Lam
4a18728e19 closed #297 2013-09-15 10:11:29 -04:00
Julian Lam
b7498416fa fixing redisstore sessions with passworded redis stores 2013-09-15 09:23:48 -04:00
Julian Lam
49b201db0f added heroku support for dynamic port reading via process.env 2013-09-15 09:09:44 -04:00
Julian Lam
be4d6761b1 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-09-15 07:58:07 -04:00
Julian Lam
c01ba1a3cb closed #296 2013-09-15 07:58:02 -04:00
Baris Soner Usakli
af59ff3209 closes #286, closes #287 2013-09-14 22:28:50 -04:00
Julian Lam
95b16690e0 altering api route to use next() instead of echoing 404... 2013-09-14 11:01:28 -04:00
Julian Lam
f6b865a052 closed #292 2013-09-14 10:58:50 -04:00
Julian Lam
d1c756306a updates to allow dynamic addition of static directories provided by plugins 2013-09-13 11:10:17 -04:00
psychobunny
43c0c2ec2a fix for favouriting 2013-09-12 14:16:13 -04:00
psychobunny
a277104ad5 dehinted favourites.js 2013-09-12 14:13:00 -04:00
psychobunny
84afffc761 categories.js jshinted 2013-09-12 14:07:29 -04:00