Commit Graph

50 Commits (d1041bedf48c700d949bde948e0705b5b1b99907)

Author SHA1 Message Date
Baris Usakli 58aa0ee647 friends
Julian Lam f767d3a007 making the toaster notifications have fixed positioning instead of abba-solute
psychobunny a7cefe35f8 started to add real data to the topics listing, got latest post working per topic
psychobunny 35974ed6b9 more changes to category view
psychobunny 8e48990a48 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 7e67260a74 still derping away on duhsign
Julian Lam 23254103e4 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam f662353cbf fixes to thread avatar on phone
Baris Soner Usakli d7b6141e31 button to change picture
psychobunny e41cc6fd10 toying around with category listing again
Julian Lam 9df65da7d4 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 4fd1244e2d some work on deleting posts, and allowing a mod to edit a post
Baris Soner Usakli 9ba5490da6 users page images 80x80
Baris Soner Usakli 0aeeac9d61 image upload and changing images will clean up later andrew stayla
psychobunny 30323fa29f Merge branch 'master' of https://github.com/psychobunny/NodeBB
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.
Julian Lam 2acd40a8bb fixing up the post window to extend the body when opened, so it doesn't clip stuff
Julian Lam 917eadae95 Merge remote-tracking branch 'origin'
Julian Lam ff025f0e48 interim commit to thread moving
Baris Usakli 187d5a101a edit page
psychobunny 4cb59c5aa9 started styling category.tpl, and added a fail plus sign to header, will revisit in the AM
Baris Soner Usakli 3f67fc29e8 links from user pics in posts
Baris Soner Usakli 8710aa3457 users page
psychobunny 6cb739ee67 install scripts for categories and added new post badges to category listing
psychobunny b734ee5c50 homepage complete, hero unit et al.
Julian Lam 7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
psychobunny c80d178a57 duhsign for category home page
Baris Soner Usakli e57ae200e4 account page border
Baris Soner Usakli 6e49dc65c7 css
Baris Soner Usakli 91c2271ffd account page
Baris Soner Usakli 48d5100dfe some profile changes, added post count to users and account and some css to account
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
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
psychobunny ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
psychobunny c73d1237d2 started favourites/rep
Julian Lam 430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam ba1001aac9 fixed alternative login css
psychobunny e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future
psychobunny abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 9fe73d68fc style changes to topics
Julian Lam 00f7347575 css cleanup
Julian Lam d5dc81b63c social icons
psychobunny c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
psychobunny 517b4de2fe threads look awesome now
Julian Lam 4c41011d83 minor stylistic change to header
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
Julian Lam 32d9b5349e beginning google integration
psychobunny c73feeea2a hide alternate login strategies if config is not set
Julian Lam 5708076137 enabling twitter login
Julian Lam 09fb79d3a2 integrated LESS middleware to static served CSS/less files