Baris Usakli
|
6ca3d0c4af
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
b2074c6dda
|
fixes to infinite load and paginator
|
12 years ago |
Julian Lam
|
d7c0e1c62e
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
56ef05a0bf
|
putting category options behind a dropdown, and fixing category enable/disable
|
12 years ago |
|
Baris Usakli
|
dd36cce329
|
closes #582
|
12 years ago |
|
Baris Soner Usakli
|
dba47e4bef
|
removed console.log
|
12 years ago |
|
Baris Soner Usakli
|
2a46ead29f
|
removed container div, removed second if first, it breaks templates
|
12 years ago |
Julian Lam
|
707179edf3
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
53164e96ab
|
removed non-functional save button from category whitelist modal
|
12 years ago |
|
Baris Soner Usakli
|
9702e28a07
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
fa56eca962
|
fixed fave stars, removed the watch button from normal posts
|
12 years ago |
|
Julian Lam
|
684839f04a
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
0188ea9a3b
|
setting cache headers to 0 on development mode
|
12 years ago |
psychobunny
|
85aa587749
|
merge conflicts
|
12 years ago |
|
psychobunny
|
48e36e3c31
|
templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3
|
12 years ago |
|
Baris Usakli
|
f2bf65252d
|
removed the fields
|
12 years ago |
|
Baris Usakli
|
a87ebb64d8
|
clean up of posts and some template additions
|
12 years ago |
|
Julian Lam
|
38da65ee58
|
tweaks to category permission modal
|
12 years ago |
|
Baris Usakli
|
7198110b57
|
closes #573
|
12 years ago |
|
Baris Usakli
|
0742590c0c
|
added pid to share links, removed unused vars
|
12 years ago |
|
Julian Lam
|
670986f7ef
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 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...
|
12 years ago |
|
psychobunny
|
89c5d01efa
|
modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
|
12 years ago |
|
Julian Lam
|
0a06f1ac7d
|
Merge remote-tracking branch 'origin/master' into category-whitelisting
|
12 years ago |
|
Julian Lam
|
df2e9b4b47
|
admin panel integration for category whitelisting
|
12 years ago |
|
Baris Usakli
|
7d7ead3f47
|
fixed js error in recent.js, remove content assignment
|
12 years ago |
|
Julian Lam
|
4855131652
|
category read restrictions
|
12 years ago |
|
Baris Soner Usakli
|
3a8dca6fb9
|
closes #560
|
12 years ago |
|
Baris Soner Usakli
|
32b191fa62
|
removed global.io
|
12 years ago |
|
Baris Usakli
|
f616125d02
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
e1f6e064a9
|
removed io from user.js, figure out why notifications are breaking when websockets.js is required from it
|
12 years ago |
|
Julian Lam
|
633be7ff3c
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
6b3863bfbf
|
updated category manager in admin panel
|
12 years ago |
|
Baris Usakli
|
48a7f9058f
|
closes #558
|
12 years ago |
|
Baris Usakli
|
aa1451cfbc
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
13ef28118d
|
closes #557
|
12 years ago |
|
Julian Lam
|
34459e7cf1
|
fixing category admin panel integration
|
12 years ago |
|
Baris Usakli
|
e90e54cec1
|
fixed icons in topic move
|
12 years ago |
|
Baris Usakli
|
d70c688b65
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Usakli
|
541993c80a
|
fontawesome 4 migration, closes #473
|
12 years ago |
|
psychobunny
|
e98d05b1a5
|
closes #556, also removes the newline that was previously inserted
|
12 years ago |
|
Julian Lam
|
0afc7c9761
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
e5c1edd5f5
|
using ajaxifying class for content and footer instead of jquery fadein/out
|
12 years ago |
|
Baris Usakli
|
bc8815cb94
|
closes #555
|
12 years ago |
|
Julian Lam
|
08d130893c
|
fixing dropdown support in Settings.prepare
|
12 years ago |
|
psychobunny
|
561ee9e4f1
|
closes #519
|
12 years ago |
|
psychobunny
|
4be5ac2c23
|
removed mobile overlay for topics - will reimplement as a plugin
|
12 years ago |
|
psychobunny
|
070c95d8de
|
fixed regression from main_posts deprecation - bottom post bar restored
|
12 years ago |
|
psychobunny
|
8d12ecb758
|
moved pagination into header
|
12 years ago |
|
Julian Lam
|
b16e1a0113
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |