Julian Lam
|
2dea93d0fb
|
Merge remote-tracking branch 'origin'
|
12 years ago |
psychobunny
|
1fc596b74b
|
fixed sidebar flashing in on empty category - got rid of javascript control and set the visibility properly from serverside
|
12 years ago |
Julian Lam
|
c0b018cdf4
|
adding noscript parsing for a topic, if accessed by a browser without javascript
|
12 years ago |
|
psychobunny
|
d5f3f3d9fb
|
fixed serverside templates.js bug that prevented blocks from being defined
|
12 years ago |
|
Julian Lam
|
740cf13e8d
|
updated less-middleware to 1.1.12 (fixing odd regression with LESS package update). Fixed issue where editing of posts was wonky because the title was being grabbed incorrectly
|
12 years ago |
|
Julian Lam
|
6df57c4a9b
|
committing the broken template parsing for andrew to see (webserver.js, line 121. Uncomment the commented out object, or substitute in "posts")
|
12 years ago |
|
Julian Lam
|
2914496799
|
fixing bug where an anonymous user could follow a topic... yikes
|
12 years ago |
|
Julian Lam
|
89effc5454
|
auto-subscribing a user to any topic that they create
|
12 years ago |
|
Julian Lam
|
882b9a917f
|
ability for users to now follow/subscribe to threads
|
12 years ago |
|
Julian Lam
|
7e55e7b3d2
|
fixing quoting that broke with the introduction of the new post window
|
12 years ago |
|
Julian Lam
|
a09cfd9304
|
started work on noscript tags in pages (but blocked by template bug with block processing), allowed reverting of theme in ACP
introducing mixins css file
|
12 years ago |
|
Julian Lam
|
49ea40f6ee
|
tweaks to composer pushing, fixed random extra letter in footer js
|
12 years ago |
|
Julian Lam
|
1a104686ac
|
new header for meta title
|
12 years ago |
|
Julian Lam
|
6a91c8a116
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
6f16088cd6
|
cleaning up readme file and fixing bugs in editing of posts ("asdf" anyone?)
|
12 years ago |
|
psychobunny
|
2b3688b6f3
|
updated rss feeds to work on chrome
|
12 years ago |
|
Julian Lam
|
82736d8780
|
editing of posts using new post window
|
12 years ago |
|
Julian Lam
|
061c7a9e66
|
half broken editing
|
12 years ago |
|
Julian Lam
|
1ff77f853c
|
Merge branch 'master' into post_window_refactor
|
12 years ago |
|
Julian Lam
|
676ddcd3e3
|
integrating the new post window into the forum
|
12 years ago |
|
psychobunny
|
9029ed2663
|
limited recent replies to just 5
|
12 years ago |
|
psychobunny
|
3476be6233
|
removed atom-writer (and xml-writer) in favour of node-rss which seems to be better. updated feed.js
|
12 years ago |
|
psychobunny
|
f1f86b1d4f
|
added category rss. added tid to be passed back in getTopicsByTids.
|
12 years ago |
|
Julian Lam
|
0a00eac970
|
added requirejs, new 'composer' module for all posting related functions (client-side)
composer module only has "push" at the moment... doesn't render a window quite yet.
|
12 years ago |
|
Julian Lam
|
1aa4a440a0
|
motd tweaks in admin panel
|
12 years ago |
|
Julian Lam
|
1760cf1e89
|
added motd to admin panel and added colour and transitions to alt-login icons
|
12 years ago |
|
psychobunny
|
4b17f1d4e6
|
wrapped up rss for topics. added a new route to access these feeds from the url topic/tid.rss
|
12 years ago |
|
Julian Lam
|
fd350bbb4e
|
nibbed out and hardcoded uid 1 as an admin... first registered user becomes an admin!!
|
12 years ago |
|
Julian Lam
|
9af39622ed
|
actually using identicon default across the site
|
12 years ago |
|
Julian Lam
|
68b7609ab6
|
identicon integration for twitter + fixing missing social icons for registration page
|
12 years ago |
|
psychobunny
|
9c546c92ad
|
removed alert
|
12 years ago |
|
psychobunny
|
11ad3a867e
|
fixed slug issue with topics
|
12 years ago |
|
psychobunny
|
f9e015f194
|
cid undefined bug
|
12 years ago |
|
Julian Lam
|
c66885af51
|
fixing build_header misdef
|
12 years ago |
|
Julian Lam
|
92aaeca899
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
48bccb3498
|
applying custom theme (if enabled) to all routes
|
12 years ago |
psychobunny
|
82e8b481b8
|
fixed posting bug and moved new topic button to be visible if no topics found
|
12 years ago |
|
Julian Lam
|
7f77ec2c5f
|
committing hotfix to registration
|
12 years ago |
|
Julian Lam
|
dec9a3bef9
|
adding missing admin css file, some other tweaks and cleanup
|
12 years ago |
|
Julian Lam
|
111b9dcf0a
|
moved admin css to its own file for LESS compilation, and adding in
options to update social keys for login
|
12 years ago |
|
Julian Lam
|
0859793b15
|
cleanup
|
12 years ago |
|
Julian Lam
|
f216c7f94a
|
some cleanup and fixing breaking bug introduced by merge
|
12 years ago |
|
Julian Lam
|
878a678643
|
Merge branch 'install_script'
|
12 years ago |
|
psychobunny
|
bc16d530d8
|
feed.js
|
12 years ago |
|
psychobunny
|
bcc903ee1c
|
run npm install. starting rss atom feeds of topics. fixed bug in topics where new topics created were not being saved properly
|
12 years ago |
|
Julian Lam
|
88bf9425db
|
install script + patching up integration with install wizard
|
12 years ago |
|
Julian Lam
|
5d7ec10aae
|
Merge branch 'master' into install_script
|
12 years ago |
|
psychobunny
|
501cda24de
|
schema.js
|
12 years ago |
|
psychobunny
|
523ce61d1f
|
redis schema file for organization; moved new topic button in categories higher
|
12 years ago |
|
Julian Lam
|
65b6010d74
|
installation wizard under /install
|
12 years ago |
|
Julian Lam
|
405318844f
|
allowing multiple less files to compile down to one
|
12 years ago |
|
psychobunny
|
39b46eb125
|
prevent crash on getRecentReplies, and styled recent replies
|
12 years ago |
|
psychobunny
|
8c2b6cda69
|
added timestamp to teaser, continuing work on recent replies block
|
12 years ago |
Baris Usakli
|
8a2499a423
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
a4fd54a0c3
|
topic titles can be edited now
|
12 years ago |
|
Julian Lam
|
00a9ec0f12
|
interim commit
|
12 years ago |
|
psychobunny
|
6db259cf3f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Conflicts:
src/posts.js
|
12 years ago |
|
psychobunny
|
448673b141
|
recent replies part 2
|
12 years ago |
|
Baris Usakli
|
adb52023b8
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
db6bbcc699
|
post every x seconds added it x to config
|
12 years ago |
|
Julian Lam
|
6060f4fbb4
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
33f8ee57bf
|
revamped social auth code so that accounts are merged if they share a common email
also updated auth code so that fbid gplusid and twid are saved in the hash instead of as simple key->value
|
12 years ago |
|
psychobunny
|
55c704c6f9
|
hide category blocks in recent tab
|
12 years ago |
|
psychobunny
|
06aa2337d1
|
admincategories.js
|
12 years ago |
|
psychobunny
|
a02a74604c
|
moved CategoriesAdmin into its own file, hid popular/active, some jslinting + cleanup, renamed some fn calls to be more descriptive
|
12 years ago |
|
psychobunny
|
55cb790d3c
|
potential fix for duplicate chat results, started recent replies block
|
12 years ago |
|
psychobunny
|
deaf8105cc
|
renamed get category to get categories
|
12 years ago |
|
psychobunny
|
43614a5197
|
fixed breaking issue on empty category
|
12 years ago |
|
psychobunny
|
4b67f8573e
|
recent posts done (needs polish/cleanup), and fixed bug where new topic button was not showing up in categories
|
12 years ago |
|
psychobunny
|
c785f06367
|
added 404 tpl, fix for 404 on topics, continuing refactor - categories
|
12 years ago |
|
Julian Lam
|
e6218bb74a
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
2a829a0618
|
derpy globals to get notification pushing working for sockets on new notification event
|
12 years ago |
|
psychobunny
|
4a3ffec29f
|
proof that comments can be misleading
|
12 years ago |
|
Baris Usakli
|
99eb9f8399
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
a4e10076cc
|
assorted
|
12 years ago |
|
psychobunny
|
1f99666d9f
|
moved favourites code out of posts
|
12 years ago |
|
psychobunny
|
d0646ba98f
|
typo
|
12 years ago |
|
Julian Lam
|
bafac00232
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/websockets.js
|
12 years ago |
|
Julian Lam
|
35dae6c0ec
|
updating web sockets so that all connections are stored in a userSockets array
|
12 years ago |
|
Baris Usakli
|
b0be1fab16
|
notifications in chat messages
|
12 years ago |
|
Julian Lam
|
e159d70353
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/websockets.js
|
12 years ago |
|
psychobunny
|
c64b227a9d
|
odd - utils.js
|
12 years ago |
|
Julian Lam
|
7e46f8c6ce
|
uniqueId support in notifications
|
12 years ago |
|
psychobunny
|
044206ad17
|
misc cleanup in categories
|
12 years ago |
|
Julian Lam
|
681bf270a1
|
hotfix to path to utils
|
12 years ago |
|
Julian Lam
|
1f7ab82f78
|
Merge remote-tracking branch 'origin' into notifications
Conflicts:
src/webserver.js
|
12 years ago |
|
psychobunny
|
cd4ca110a1
|
moved utils over to client side for code sharing
|
12 years ago |
|
Julian Lam
|
78713f0599
|
Merge remote-tracking branch 'origin' into notifications
|
12 years ago |
|
Baris Usakli
|
acd797fe20
|
changed github link on home
|
12 years ago |
|
Julian Lam
|
ffbafc99c4
|
Merge remote-tracking branch 'origin' into notifications
Conflicts:
public/css/style.less
public/src/app.js
src/websockets.js
|
12 years ago |
|
Julian Lam
|
c8d48127ad
|
more changes to notification dropdown in header bar
|
12 years ago |
|
psychobunny
|
9503aa9a57
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
psychobunny
|
a9672ab9d8
|
begin refactor of posts/topics + pagination + cleanup + async
|
12 years ago |
|
Julian Lam
|
194793d14d
|
Merge branch 'master' into notifications
Conflicts:
src/websockets.js
|
12 years ago |
|
Julian Lam
|
6bae30336a
|
foundation for user notifications
|
12 years ago |
|
Baris Usakli
|
8d0ac4cb07
|
chat feature
|
12 years ago |
|
Baris Usakli
|
40b2aa2a80
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
9f8c9e8822
|
derp
|
12 years ago |
|
Julian Lam
|
6cd65e6598
|
fixing motd so that it shows default motd if config is empty
|
12 years ago |
|
Julian Lam
|
499f840e1e
|
added toggle in config to switch on and off the motd
|
12 years ago |