Commit Graph

37 Commits

Author SHA1 Message Date
Baris Soner Usakli
0aeeac9d61 image upload and changing images will clean up later andrew stayla 2013-05-11 21:55:14 -04: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
Julian Lam
2acd40a8bb fixing up the post window to extend the body when opened, so it doesn't clip stuff 2013-05-08 16:05:54 -04:00
Julian Lam
917eadae95 Merge remote-tracking branch 'origin' 2013-05-08 14:16:48 -04:00
Julian Lam
ff025f0e48 interim commit to thread moving 2013-05-08 14:09:50 -04:00
Baris Usakli
187d5a101a edit page 2013-05-08 12:51:37 -04:00
psychobunny
4cb59c5aa9 started styling category.tpl, and added a fail plus sign to header, will revisit in the AM 2013-05-08 05:46:11 +00:00
Baris Soner Usakli
3f67fc29e8 links from user pics in posts 2013-05-07 19:25:28 -04:00
Baris Soner Usakli
8710aa3457 users page 2013-05-07 19:18:13 -04:00
psychobunny
6cb739ee67 install scripts for categories and added new post badges to category listing 2013-05-07 21:02:07 +00:00
psychobunny
b734ee5c50 homepage complete, hero unit et al. 2013-05-07 20:49:27 +00:00
Julian Lam
7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
2013-05-07 13:24:46 -04:00
psychobunny
c80d178a57 duhsign for category home page 2013-05-07 15:49:24 +00:00
Baris Soner Usakli
e57ae200e4 account page border 2013-05-06 16:12:04 -04:00
Baris Soner Usakli
6e49dc65c7 css 2013-05-06 14:12:01 -04:00
Baris Soner Usakli
91c2271ffd account page 2013-05-06 13:42:25 -04:00
Baris Soner Usakli
48d5100dfe some profile changes, added post count to users and account and some css to account 2013-05-06 13:25:07 -04:00
psychobunny
1009726b51 almost done X users browsing this thread feature. there is one bug where anonymous users do not get disconnected from the room, so I'll have to figure that out later 2013-05-06 06:07:04 +00:00
psychobunny
35f2ac7bf7 small style changes in header, added edit and delete button for moderators/own posts, hide moderator tools for all users except those that qualify 2013-05-04 06:44:00 +00:00
psychobunny
ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why 2013-05-04 04:53:43 +00:00
psychobunny
c73d1237d2 started favourites/rep 2013-05-03 17:52:20 +00:00
Julian Lam
430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-03 13:06:26 -04:00
Julian Lam
ba1001aac9 fixed alternative login css 2013-05-03 13:02:36 -04:00
psychobunny
e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future 2013-05-03 16:22:40 +00:00
psychobunny
abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-03 15:01:59 +00:00
psychobunny
9fe73d68fc style changes to topics 2013-05-03 15:01:56 +00:00
Julian Lam
00f7347575 css cleanup 2013-05-02 20:56:18 -04:00
Julian Lam
d5dc81b63c social icons 2013-05-02 16:15:48 -04:00
psychobunny
c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
2013-05-02 19:48:14 +00:00
psychobunny
517b4de2fe threads look awesome now 2013-05-02 19:45:22 +00:00
Julian Lam
4c41011d83 minor stylistic change to header 2013-05-02 14:51:57 -04:00
Julian Lam
8be3b8c05e accidentally developed on a merge commit... *fingers crossed*
Merge branch 'master' of github.com:psychobunny/node-forum

Conflicts:
	public/templates/login.tpl
2013-05-02 14:47:00 -04:00
Julian Lam
32d9b5349e beginning google integration 2013-05-02 12:45:22 -04:00
psychobunny
c73feeea2a hide alternate login strategies if config is not set 2013-05-02 16:36:26 +00:00
Julian Lam
5708076137 enabling twitter login 2013-05-02 11:35:15 -04:00
Julian Lam
09fb79d3a2 integrated LESS middleware to static served CSS/less files 2013-05-02 09:40:44 -04:00