Commit Graph

2529 Commits (3d9a732c4a2f8df4d431a6d58c49ad99057c414f)
 

Author SHA1 Message Date
Julian Lam 3d9a732c4a Merge branch 'master' of github.com:BudickDa/NodeBB into BudickDa-master
Conflicts:
	public/language/en/global.json
Julian Lam 4819bea378 more tweaks to the chat dropdown -- handling null case -- issue
Julian Lam 030ce95dea closed - added "active chats" dropdown to header
- some minor tweaks also, to make taskbar work a little better with chats
Julian Lam 2a1671ba9b whoops
Julian Lam a65c79cb02 minimized the reconnect spinner to icon only, added bootstrap tooltip
Julian Lam 041e77f688 fixing replying (whoops)
Julian Lam d9ee9bf5e3 revamped handling of unread messages, so that a socket call is made to all socket clients whenever a new unread message is available. Prior behaviour had the unread count updated via ajax call on ajaxify (which was clumsy at best and didn't update automagically)
Julian Lam 43b012b32e defactored getUnreadTopics into separate getUnreadTids method -- for no reason, mind you
Julian Lam fe4aee177d lots of tweaks to chat and taskbar
Julian Lam 16e07d475f pushing FA icon for chat taskbar title
Julian Lam 2125bb2223 only minimizing CSS files on non-development
Julian Lam 6bd4a34e69 fixed favicon sometimes updating with a string 0, should always be an int
Julian Lam d27f2eb214 fixed
Julian Lam b176629b44 integrated Tinycon lib and actually fixed notification counts... heh.
closed 
Julian Lam 5b6f5ebf9d added tinycon lib and changed notif icon to be in CSS instead of in
template
Julian Lam 69f453c73c Merge pull request from cnvo/patch-1
Replace notifications icons from fa-circle to fa-bell
Julian Lam dab0435d9b Merge pull request from cnvo/patch-2
Replace notifications icons from fa-circle to fa-bell
Julian Lam e847c015a5 linting notifications.js
BudickDa 8a99eef4fb Update global.json
Julian Lam da66efe7a5 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 1bd94b4e41 closed
psychobunny 8b55920acf plugins - filter:posts.custom_profile_info pass in pid as well
BudickDa 32df811765 i18n for all templates completed, jsons for german added
psychobunny 7c8f857aaf plugins - filter:server.create_routes allows you to define API routes as well now
psychobunny 1f970c3bdb incorrect url was being passed for callback - twitter and g+
Barış Soner Uşaklı 99fbc0dfd5 Update account.js
removed extra s
Baris Usakli 8d3a647d16 fixed hardcoded userslug
Baris Usakli 53afe6cb68 closes
Barış Soner Uşaklı 391b8098a3 Merge pull request from akhoury/master
websockets to follow same pattern, added hook action:user.create
Baris Usakli 190948336a closes
Julian Lam fcda27e251 allowing plugins with no hooks to not cause NodeBB to hang on app start
Trvr a48a07603c Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
Trvr d930e2a1be Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
Baris Soner Usakli 7e2166903f Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli d5c0ca4a9d closes
Julian Lam 7695e76494 removed buildFooter filter
Julian Lam 78af47362c Merge pull request from draco2003/patch-4
Cleanup console.log calls
Dan Rowe 18a890ed51 Cleanup console.log calls
Can't see my debugging inbetween all your debugging ;)
Julian Lam 5f731dd1f6 Merge pull request from draco2003/patch-3
Missed one lcasing
Julian Lam 51990142d5 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam b840169a8c upping markdown minver
Dan Rowe 94fdeb2378 Missed one lcasing
Also anyone else nervous about arbitrary hook execution here?
Julian Lam 68e7ee7f07 signature parsing now calls its own postTools method (with associated plugin hook
Julian Lam 77d5ecc82a added post.buildFooter and post.parseSignature hooks
Baris Soner Usakli 437379413e closes
Baris Soner Usakli ddb7896df1 fixed post count in paginator and post bar when infinite loader kicked in
Baris Soner Usakli 66cdb9a067 just send err
Baris Soner Usakli f5741fd48b fixed conflict
Baris Soner Usakli f405dec4e9
Julian Lam cc242ca667 fixed