Julian Lam
|
bfbc596348
|
fixing extra comma in es language file
|
11 years ago |
Pablo Macaluso
|
8cfc5dda37
|
added spanish language files (courtesy of Pablo Macaluso)
|
11 years ago |
|
Julian Lam
|
b81737bc0f
|
moved refreshTitle into app.js, messaging someone now invokes an alternating title, hehe
|
11 years ago |
|
Julian Lam
|
385aa6df92
|
fixed last couple tweaks, ready t'merge
|
11 years ago |
Baris Soner Usakli
|
95bb838699
|
Merge remote-tracking branch 'origin/master' into dbal
|
11 years ago |
Julian Lam
|
2c131f172a
|
fixing up some translations - WIP
|
11 years ago |
|
Julian Lam
|
3d9a732c4a
|
Merge branch 'master' of github.com:BudickDa/NodeBB into BudickDa-master
Conflicts:
public/language/en/global.json
|
11 years ago |
|
Julian Lam
|
4819bea378
|
more tweaks to the chat dropdown -- handling null case -- issue #615
|
11 years ago |
|
Julian Lam
|
030ce95dea
|
closed #615 - added "active chats" dropdown to header
- some minor tweaks also, to make taskbar work a little better with chats
|
11 years ago |
|
Julian Lam
|
a65c79cb02
|
minimized the reconnect spinner to icon only, added bootstrap tooltip
|
11 years ago |
|
Baris Usakli
|
705754e823
|
merged master
|
11 years ago |
|
Julian Lam
|
041e77f688
|
fixing replying (whoops)
|
11 years ago |
|
Baris Usakli
|
b927f6ce29
|
added raw info
|
11 years ago |
|
Baris Usakli
|
519d376071
|
added mongo info function, change admin redis template to database template
|
11 years ago |
|
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)
|
11 years ago |
|
Baris Usakli
|
7875138c08
|
added parseInt
|
11 years ago |
|
Julian Lam
|
fe4aee177d
|
lots of tweaks to chat and taskbar
|
11 years ago |
|
Julian Lam
|
16e07d475f
|
pushing FA icon for chat taskbar title
|
11 years ago |
|
Julian Lam
|
6bd4a34e69
|
fixed favicon sometimes updating with a string 0, should always be an int
|
11 years ago |
|
Julian Lam
|
b176629b44
|
integrated Tinycon lib and actually fixed notification counts... heh.
closed #610
|
11 years ago |
|
Julian Lam
|
5b6f5ebf9d
|
added tinycon lib and changed notif icon to be in CSS instead of in
template
|
11 years ago |
|
Julian Lam
|
69f453c73c
|
Merge pull request #601 from cnvo/patch-1
Replace notifications icons from fa-circle to fa-bell
|
11 years ago |
|
Julian Lam
|
dab0435d9b
|
Merge pull request #600 from cnvo/patch-2
Replace notifications icons from fa-circle to fa-bell
|
11 years ago |
BudickDa
|
8a99eef4fb
|
Update global.json
|
11 years ago |
BudickDa
|
32df811765
|
i18n for all templates completed, jsons for german added
|
11 years ago |
Joopmicroop
|
700cab686b
|
Update following.tpl
|
11 years ago |
|
Joopmicroop
|
af06e0335a
|
Update followers.tpl
|
11 years ago |
|
Joopmicroop
|
4a8dc82bd2
|
Update accountedit.tpl
|
11 years ago |
|
Joopmicroop
|
8a4e2b1ea0
|
Update accountsettings.tpl
|
11 years ago |
|
Barış Soner Uşaklı
|
99fbc0dfd5
|
Update account.js
removed extra s
|
11 years ago |
|
Baris Usakli
|
8d3a647d16
|
fixed hardcoded userslug
|
11 years ago |
|
Baris Usakli
|
53afe6cb68
|
closes #591
|
11 years ago |
|
Baris Usakli
|
190948336a
|
closes #590
|
11 years ago |
Trvr
|
a48a07603c
|
Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
|
11 years ago |
|
Trvr
|
d930e2a1be
|
Replace notifications icons from fa-circle to fa-bell
We should change this icon to utilize the icons better.
|
11 years ago |
|
Baris Soner Usakli
|
d5c0ca4a9d
|
closes #595
|
11 years ago |
|
Baris Soner Usakli
|
437379413e
|
closes #592
|
11 years ago |
|
Baris Soner Usakli
|
ddb7896df1
|
fixed post count in paginator and post bar when infinite loader kicked in
|
11 years ago |
|
Julian Lam
|
cc242ca667
|
fixed #589
|
11 years ago |
|
Julian Lam
|
b9f1176ec1
|
moved paginator progress bar into paginator block, better mobile handling, and hiding it on page load
|
11 years ago |
|
Baris Soner Usakli
|
46a14715e3
|
fixed logout in admin site, cleaned up topics.post, anon users can post topics now if allowed
|
11 years ago |
|
Baris Soner Usakli
|
c1da56ce45
|
added auto mention if u click post reply
|
11 years ago |
|
Baris Usakli
|
ee63fae803
|
closes #584
|
11 years ago |
|
Baris Usakli
|
720711756f
|
show bottom post bar after new post, fixed the insertion of new posts
|
11 years ago |
|
Baris Usakli
|
90a12c3253
|
fixed index to int
|
11 years ago |
|
Baris Usakli
|
6a00ab3782
|
removed btn-large from post topic button
|
11 years ago |
|
Baris Usakli
|
9ccfa3f18c
|
fixed js error
|
11 years ago |
|
Baris Usakli
|
1660d75205
|
stricter selector for human readable numbers
|
11 years ago |
|
Baris Usakli
|
f6d57a241d
|
fixed human readable view post counts
|
11 years ago |
|
Julian Lam
|
bcfb4ca0e4
|
off by one error
|
11 years ago |
|
Julian Lam
|
0159a43a20
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
public/src/forum/topic.js
|
11 years ago |
|
Julian Lam
|
86b019ec89
|
paginator progress bar
|
11 years ago |
psychobunny
|
98a12cd1e1
|
clearing first blocks from dynamically inserted templates - made regex less greedy
|
11 years ago |
|
psychobunny
|
30a7f1a816
|
removed .main-post from follow class (now using conditionals to show/hide)
|
11 years ago |
|
Baris Usakli
|
6ca3d0c4af
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
b2074c6dda
|
fixes to infinite load and paginator
|
11 years ago |
|
Julian Lam
|
d7c0e1c62e
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
56ef05a0bf
|
putting category options behind a dropdown, and fixing category enable/disable
|
11 years ago |
|
Baris Usakli
|
dd36cce329
|
closes #582
|
11 years ago |
|
Baris Usakli
|
293c176053
|
added first to follow button in topic.tpl
|
11 years ago |
|
Baris Soner Usakli
|
dba47e4bef
|
removed console.log
|
11 years ago |
|
Baris Soner Usakli
|
2a46ead29f
|
removed container div, removed second if first, it breaks templates
|
11 years ago |
|
Julian Lam
|
707179edf3
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
53164e96ab
|
removed non-functional save button from category whitelist modal
|
11 years ago |
|
Baris Soner Usakli
|
9702e28a07
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
fa56eca962
|
fixed fave stars, removed the watch button from normal posts
|
11 years ago |
|
Julian Lam
|
684839f04a
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
0188ea9a3b
|
setting cache headers to 0 on development mode
|
11 years ago |
|
psychobunny
|
85aa587749
|
merge conflicts
|
11 years ago |
|
psychobunny
|
48e36e3c31
|
templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3
|
11 years ago |
|
Baris Usakli
|
0b6d018f8d
|
oops removed by mistage
|
11 years ago |
|
Baris Usakli
|
f2bf65252d
|
removed the fields
|
11 years ago |
|
Baris Usakli
|
a87ebb64d8
|
clean up of posts and some template additions
|
11 years ago |
|
Julian Lam
|
38da65ee58
|
tweaks to category permission modal
|
11 years ago |
|
Baris Usakli
|
7198110b57
|
closes #573
|
11 years ago |
|
Baris Usakli
|
78b65c0b12
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
0742590c0c
|
added pid to share links, removed unused vars
|
11 years ago |
|
psychobunny
|
c16f04bbcf
|
plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well
|
11 years ago |
|
Julian Lam
|
69427fa10e
|
tweaks to make the ACP work better on tablets, some work on hidden groups
|
11 years ago |
|
Julian Lam
|
670986f7ef
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
8b62041d28
|
refactored groups and categories, groups no longer explodes when
attempting to add members to a whitelist that doesn't exist, isEmpty
checks (new methods!) and such...
|
11 years ago |
|
psychobunny
|
89c5d01efa
|
modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
|
11 years ago |
|
Julian Lam
|
0a06f1ac7d
|
Merge remote-tracking branch 'origin/master' into category-whitelisting
|
11 years ago |
|
Julian Lam
|
df2e9b4b47
|
admin panel integration for category whitelisting
|
11 years ago |
|
Baris Soner Usakli
|
2d05a06e37
|
fixed template var, oops
|
11 years ago |
|
Baris Soner Usakli
|
e3da005780
|
grouped the social buttons
|
11 years ago |
|
Baris Usakli
|
590208f0c7
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
7d7ead3f47
|
fixed js error in recent.js, remove content assignment
|
11 years ago |
|
Julian Lam
|
72ef8c839f
|
Merge remote-tracking branch 'origin/master' into category-whitelisting
Conflicts:
src/groups.js
|
11 years ago |
|
psychobunny
|
62e2aa67d7
|
topics - added back social sharing buttons to OP
|
11 years ago |
|
Julian Lam
|
4855131652
|
category read restrictions
|
11 years ago |
|
Baris Soner Usakli
|
3a8dca6fb9
|
closes #560
|
11 years ago |
|
Baris Soner Usakli
|
a0c3de0273
|
display signature block only if user has signature
|
11 years ago |
|
Baris Soner Usakli
|
32b191fa62
|
removed global.io
|
11 years ago |
|
Baris Usakli
|
f616125d02
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
e1f6e064a9
|
removed io from user.js, figure out why notifications are breaking when websockets.js is required from it
|
11 years ago |
|
Julian Lam
|
633be7ff3c
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
6b3863bfbf
|
updated category manager in admin panel
|
11 years ago |
|
Baris Usakli
|
b66ca703b8
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
48a7f9058f
|
closes #558
|
11 years ago |