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 |
|
psychobunny
|
8f80733563
|
fixing #552 overflows properly
|
11 years ago |
|
Baris Usakli
|
aa1451cfbc
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
13ef28118d
|
closes #557
|
11 years ago |
|
Julian Lam
|
34459e7cf1
|
fixing category admin panel integration
|
11 years ago |
|
Baris Usakli
|
798e17a954
|
change loading text to inline
|
11 years ago |
|
Baris Usakli
|
e90e54cec1
|
fixed icons in topic move
|
11 years ago |
|
Baris Usakli
|
d70c688b65
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Usakli
|
541993c80a
|
fontawesome 4 migration, closes #473
|
11 years ago |
|
psychobunny
|
e98d05b1a5
|
closes #556, also removes the newline that was previously inserted
|
11 years ago |
|
Julian Lam
|
0afc7c9761
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
e5c1edd5f5
|
using ajaxifying class for content and footer instead of jquery fadein/out
|
11 years ago |
|
Baris Usakli
|
a5e78aab08
|
closes #554
|
11 years ago |