08c303b3c7
interim commit
12 years ago
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
12 years ago
d6bd801561
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
8a2c18de5b
fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread
12 years ago
9b5c8de541
setUserField
12 years ago
c906b7419a
added reputation to /account
12 years ago
3bdbf3c191
password reset will use the user has
12 years ago
54b4c55dfc
removed the unused login function
12 years ago
fee76db8dc
more fixes
12 years ago
954392e4c4
fixes to gravatars and get functions in user.js
12 years ago
8a0266562c
Merge branch 'master' of https://github.com/psychobunny/NodeBB
12 years ago
08f7b64ccf
hash changes to user data
12 years ago
26c22b0559
bugfixes + starting active users in thread feature
12 years ago
3947b6b6fd
modified ajaxify slightly to make transitions between pages a bit more fluid (although first load doesn't look that awesome); fixed up rooms - resolved DRY failure and properly leave rooms
12 years ago
1fc6e0db2c
added email verification on registration
...
added email header and footer
12 years ago
73e958e627
added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name
12 years ago
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
12 years ago
4807002447
fix for responsive avatar, fix for submit/discard buttons taking you away from the thread
12 years ago
6142225726
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
69565b0ded
fixed a bug where anonymous users couldnt access topics
12 years ago
73fc0a3699
customising markdown parser to allow single line breaks
12 years ago
ebaa69d987
responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
12 years ago
3e96f64191
streaming posts. also moved topics to be entirely client side parsed. made some changes. added block level caching to templates. added a prepare method to templates
12 years ago
bcb672e1fe
socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
12 years ago
5e48b4cdc5
redis updates for sets: added sadd, srem, and sismember; finished basic favouriting/up/down votes - still need to add socket support in future
12 years ago
b5622690e0
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
c73d1237d2
started favourites/rep
12 years ago
2a3ef2408f
fixed post content
12 years ago
2b50c43a5f
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
7db1834182
gravatars in posts
12 years ago
3c86b43ba3
post count is incrementing when replying
12 years ago
430e65a352
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
bceaf67c20
INSTALL build-essential AND RUN npm install!!!!
...
bcrypt integration
12 years ago
d622c9e100
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
edf58693cc
added real username to posts
12 years ago
7dc9fd83c1
account page shows up when logged in and 403 when logged out
12 years ago
e766cc0c64
more style updates to topic + very basic quoting feature in, needs to be looked at in future
12 years ago
ed26728a0f
show username on homepage
12 years ago
6d36df1604
tweaking users/* calls
12 years ago
0ae4e31163
RUN "npm install" AFTER THIS GIT PULL!!
...
Integrated markdown parsing to all post content. Title content by default
not going to be parsed, using default options unless circumstances dictate
otherwise.
12 years ago
7f12d568ff
user name on home.tpl
12 years ago
bff02a7f2e
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
de28d8af55
token bug
12 years ago
9c05a76fcb
facebook integration
12 years ago
c113f4151b
Merge branch 'master' of https://github.com/psychobunny/node-forum
...
Conflicts:
public/css/style.less
src/webserver.js
12 years ago
517b4de2fe
threads look awesome now
12 years ago
44485a2e40
fixed session ids
12 years ago
bef0bd87da
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
8be3b8c05e
accidentally developed on a merge commit... *fingers crossed*
...
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
public/templates/login.tpl
12 years ago
8cedb33c82
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
39b24436d0
removed global.socket, passing in socket to the functions now
12 years ago
32d9b5349e
beginning google integration
12 years ago
c73feeea2a
hide alternate login strategies if config is not set
12 years ago
60c1e937a1
tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
12 years ago
8e5714cab4
skeleton for twitter integration via passport
12 years ago
69bafcf19c
refactoring register to use form post instead of socket (for passport integration)
12 years ago
09fb79d3a2
integrated LESS middleware to static served CSS/less files
12 years ago
c7fb07e2e5
Merge branch 'master' of github.com:psychobunny/node-forum
...
Conflicts:
public/templates/header.tpl
src/webserver.js
12 years ago
3ca880d81e
interim commit
12 years ago
de26a303d4
housekeeping
12 years ago
829dae05c5
updating header to show user label when logged in, and register/login when
...
not
12 years ago
a537c4d805
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
d712f57141
refactored user authentication (passport-local, instead of my own
...
half-baked implementation)
12 years ago
9119a9d104
small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now
12 years ago
1bec9fc5aa
breadcrumbs, and changed home in nav to 'forum'
12 years ago
b2bc967e9b
got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
12 years ago
6471109a25
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
e658531a67
replies are up
12 years ago
70d3105a8e
configuring express session to use a secret defined in the config file,
...
not a hard coded one
12 years ago
a7f4c16140
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
924618fc29
removed account_settings template
12 years ago
1f97fefac0
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
0f3f2bb859
post replies, unfinished
12 years ago
62779ef0dd
relative time on topics and posts
12 years ago
f8345a1223
added timestamp to record users
12 years ago
b762ec275e
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
ab456e07af
fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up)
12 years ago
b93c003251
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
c298e7002e
updated configuration file with redis params, and updated all redis wrapper to read configs from config file instead of defaulting to localhost -- same for express.session store
12 years ago
a655ebb290
most users ever online block
12 years ago
20aa5d439e
log server errors in browser
...
added uid to posts
12 years ago
cb9a110a5d
RUN npm install AFTER PULLING THIS COMMIT!
...
Added user label to header, gravatar support
12 years ago
1fb99ab848
fixed the crash when going between pages, return next() in webserver.js
12 years ago
58642b1e7b
removed requireAuth middleware
12 years ago
2358528880
merging changes for stash pop
12 years ago
19a63bf51b
fix for threads that have 0 posts
12 years ago
1037088643
commented out breaking code regarding user var
12 years ago
303452ef8c
fixed conflicts
12 years ago
126f817f7d
updates to posts
12 years ago
64ca3d7444
properly broadcasting a user.active change
12 years ago
7827534819
tweaking active.register so that it emits an active user change
12 years ago
570dfd9786
updated topics module to use uid as a passed in param, instead of through global.uid
12 years ago
33f155b2d1
updating web sockets so that uid is populated for socket calls
12 years ago
f4b14df195
some more fixes to the session handling to ignore the /api folder, and
...
refactoring how the public directory is set up in webserver.js.
THIS COMMIT ALTERS NODEBB'S DEPENDENCIES!
Please run npm install after pulling.
12 years ago
19cd9e05ed
fixing login and logout sessions
12 years ago
7f4ea6e19b
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
98ca14e31c
started working on threadss, implemented slug url, fixed crashing bug during post creation
12 years ago
2a9c33b9f8
user activity counter (bug present where all users register as same session? this isn't good....)
12 years ago
880d6832be
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
5173498180
client side templates in, fixed home page to parse templates on ajaxify, added footer to the page transition animation for smoothness
12 years ago
81364580ed
new 403 page
12 years ago
7e637a93bb
added login message + ajaxify.go to homepage (should add redirect code to originating page later)
12 years ago
f774974803
logout functionality
12 years ago
8d4fb77565
NEW DEPENDENCY: connect-redis
...
Persistent sessions with connect-redis.
12 years ago
eac3785b29
fixing issue with auth (removed session saving stuff by mistake)
12 years ago
3eb4f0e1a2
commenting out global.uid setting
12 years ago
9e5a7b96b3
fixed broken mget implementation if no topics are present
12 years ago
a16f72e11c
redis - added mget and multi, finished initial topics listview on home page, finished get topics method calls
12 years ago
877219cb58
fixed conflicts
12 years ago
e50e136d83
inbetween some changes but asked to pull so I'll comment better later
12 years ago
0985087f5d
auth...
12 years ago
71e410d571
Merge branch 'master' of github.com:psychobunny/node-forum
...
Conflicts:
src/webserver.js
12 years ago
c1186f396e
some work on session login etc
12 years ago
d711a4e334
added post button, post window, added click handler to toaster alert, started on posts and topics schema and code
12 years ago
dfd5c9960b
finished pw reset page, finally
12 years ago
5792946a16
added DEL support to redis wrapper lib
12 years ago
5369be0397
timing out reset codes, enhancing template replace so that a single placeholder can be used multiple times
12 years ago
dea9a707dc
interim commit for password reset
12 years ago
8f7b295480
integrated dcp templates, changed reset email to use templates
12 years ago
19f9a48a8c
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
e56e7b549b
more stuff on pw reset
12 years ago
a06b3519a1
moved event alert to serverside, now node controls the registration alert. added some transition animation to page changes
12 years ago
9fcbca8da9
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
a73481af8b
more work with reset page
12 years ago
67bf1b6041
updated ajaxify to do a callback after page change, added toaster style notifications (app.alert), changes to webserver to update automatically
12 years ago
0e8c4f35cd
socketing for reset page - started on emailer
12 years ago
f975105176
added email to registration fields, email existence check
12 years ago
2d8725d522
changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)
12 years ago
d035307d8b
changing the way the express app is instantiated
12 years ago
302d1a3131
Merge branch 'master' of github.com:psychobunny/node-forum
12 years ago
f894eae34f
tweaks
12 years ago
65b035c9c9
Merge branch 'master' of https://github.com/psychobunny/node-forum
12 years ago
3d81f129e3
added login, fixed gitignore
12 years ago
1d3d3df73b
optimizing for express, tweaks to config file
12 years ago
2cf0a9045a
Merge branch 'master' of https://github.com/psychobunny/node-forum
...
Conflicts:
src/webserver.js
12 years ago
a2d727dd86
setting up config file for use in app, updated readme
12 years ago
ccc57b0d71
forgot to add redis.js
12 years ago
efa0649081
moved RedisDB.js to src/redis.js
12 years ago
9b973327a0
registration bugfix
12 years ago
b04d262fe4
init, just some testing
12 years ago
Julian Lam
psychobunny
Baris Soner Usakli
Julian Lam