Julian Lam
1f7ab82f78
Merge remote-tracking branch 'origin' into notifications
...
Conflicts:
src/webserver.js
2013-05-23 13:24:27 -04:00
psychobunny
cd4ca110a1
moved utils over to client side for code sharing
2013-05-23 13:21:46 -04:00
Julian Lam
78713f0599
Merge remote-tracking branch 'origin' into notifications
2013-05-23 13:13:35 -04:00
Baris Usakli
acd797fe20
changed github link on home
2013-05-23 13:04:25 -04:00
Julian Lam
c8d48127ad
more changes to notification dropdown in header bar
2013-05-23 12:54:57 -04:00
Julian Lam
6bae30336a
foundation for user notifications
2013-05-22 21:43:01 -04:00
Julian Lam
6cd65e6598
fixing motd so that it shows default motd if config is empty
2013-05-22 15:15:48 -04:00
Julian Lam
499f840e1e
added toggle in config to switch on and off the motd
2013-05-22 12:11:44 -04:00
Julian Lam
ec463ce3d3
added motd support
2013-05-22 12:06:23 -04:00
Julian Lam
26781157b3
refactoring posts, topics, and categories so that each "get" is moved up
...
one level. Topics.get will get all of the posts in a tid, etc.
2013-05-21 21:07:26 -04:00
Julian Lam
624ccc592c
resolving issue where the post window stays open during navigation
...
- app.close_post_window now neatly closes the post window
2013-05-21 20:20:54 -04:00
psychobunny
34133eef8c
post counts + read status working on homepage category listing. fixed posts.get_cid_by_pid
2013-05-21 18:12:39 -04:00
Julian Lam
7c165876f1
fixed bug where deleted posts still showed up in teasers
2013-05-21 14:54:35 -04:00
psychobunny
cb6d98cecb
derp conflicts
...
Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
public/src/templates.js
2013-05-17 15:26:46 -04:00
psychobunny
fb52dfc6c8
templates refactor part 2
...
updated so that tpls get loaded on demand as opposed to all at once on
load; added a function to pull the tpl list on load instead of having to
manually define new templates in code; some clean up; added utils.walk;
2013-05-17 15:20:08 -04:00
Julian Lam
7d648e7abe
Merge branch 'master' of github.com:psychobunny/node-forum
2013-05-17 14:26:26 -04:00
Julian Lam
297c4b8173
socketizing topic creation so that a new topic shows up automatically when one is created
2013-05-17 14:25:45 -04:00
psychobunny
1cdbd376ba
deprecated server side templates finally. code sharing between client side and server side templates; force_refresh parameter added to temasd
...
deprecated server side templates finally. code sharing between client
side and server side templates; force_refresh parameter added to
templates config.json; created initialization fn for webserver
2013-05-17 13:36:44 -04:00
Julian Lam
4b6ad9607e
removing static saving of recent post, and added in dynamic pulling on Topics.get
2013-05-17 12:25:06 -04:00
Julian Lam
e256ee99f7
Merge branch 'master' of github.com:psychobunny/node-forum
2013-05-16 12:49:57 -04:00
Julian Lam
bdeb7b13f1
interim commit for moderator support
2013-05-16 12:49:39 -04:00
Baris Usakli
34432773d6
fix crash when you go to /topics/nonexistant
2013-05-16 12:13:39 -04:00
psychobunny
91b4ec2547
fixed crashing error in graph/user/picture, and started updating the main post row in topic.tpl
2013-05-15 15:55:39 -04:00
psychobunny
25e218442a
updated category: tracking active participants + removed placeholder; recent author picture now pulled dynamically; graph/users/picture implemented
2013-05-15 15:42:24 -04:00
Baris Usakli
073b87982b
moved user routes into routers/user.js
2013-05-14 14:04:19 -04:00
Baris Usakli
188b1d5ada
for andrew
2013-05-14 13:04:12 -04:00
Baris Usakli
4c324664fa
removed global modules
2013-05-14 12:13:29 -04:00
Baris Usakli
d564811b71
fixed the data passing to accountedit.tpl
2013-05-14 11:32:37 -04:00
Baris Soner Usakli
0bb0fd5789
removed debug console.logs
2013-05-13 17:40:51 -04:00
Baris Soner Usakli
901b378912
css fix
2013-05-13 17:40:14 -04:00
Baris Soner Usakli
62bffff3c7
forgot to add a ;
2013-05-13 15:16:54 -04:00
Baris Soner Usakli
71d595a552
debug image uploading
2013-05-13 14:26:08 -04:00
Julian Lam
aab149aecf
Merge branch 'master' of github.com:psychobunny/NodeBB
2013-05-13 14:16:43 -04:00
Julian Lam
80b20fe877
adding alternate logins to register page
2013-05-13 14:16:33 -04:00
Baris Soner Usakli
eccd1f66d1
removed some debug stuff from image upload
2013-05-13 13:51:25 -04:00
Baris Soner Usakli
5796140f58
image upload changes
2013-05-13 13:30:33 -04:00
Baris Soner Usakli
5785b16ae9
fixed users page so that all reps and post counts are comma delimited, some image upload fixes
2013-05-13 12:45:40 -04:00
Baris Soner Usakli
e476e27807
image upload error msgs, file size limit
2013-05-13 12:14:10 -04:00
Baris Soner Usakli
0aeeac9d61
image upload and changing images will clean up later andrew stayla
2013-05-11 21:55:14 -04:00
Baris Soner Usakli
7d27a7c6d3
changed user update profile so that it only updates specific fields, before it was possible to send in rep,post count
2013-05-09 13:53:58 -04:00
Julian Lam
e9a552eab4
editing of posts
2013-05-09 10:20:25 -04:00
psychobunny
f218e0f3a7
user has read feature - turns post count badge red if there is a new post and grey if the user has seen this post already
2013-05-09 07:27:55 +00:00
psychobunny
a4e8f9e706
cleaned up webserver a bit, moved over authentication stuff into its own file, got rid of unused routes, user routes still need to be moved out but am waiting for baris to finish
2013-05-09 06:26:32 +00:00
psychobunny
30323fa29f
Merge branch 'master' of https://github.com/psychobunny/NodeBB
2013-05-09 03:33:58 +00:00
psychobunny
f3f08a9c94
more fixes to ajaxify, updated /users blocks to sit flush to the left, started work on the ACP including basic templates, added a method to get active users in all rooms (socket connections), added more routes mostly pointing to admin, added a routing folder to start organizing routes better, starting with admin.
2013-05-09 03:33:53 +00:00
Baris Usakli
5057af7bbe
user edit fix for !==
2013-05-08 16:00:37 -04:00
Baris Usakli
44f0183b29
fixed anon users visiting user profiles
2013-05-08 14:58:40 -04:00
Baris Usakli
2539079c84
removed console.log
2013-05-08 14:54:07 -04:00
Baris Usakli
9166a9ccde
user edit changes
2013-05-08 14:49:33 -04:00
Baris Usakli
0210e5a928
edit
2013-05-08 14:26:29 -04:00
