Baris Soner Usakli
|
48eb6a3f22
|
composer changeS
|
11 years ago |
Julian Lam
|
51abf60b3a
|
Merge branch 'socketAL-fix'
|
11 years ago |
|
Julian Lam
|
17f98804c6
|
commented out "remember me" checkbox because it actually does nothing... :x
|
11 years ago |
|
Baris Soner Usakli
|
31d353ab0e
|
more fixes
|
11 years ago |
|
Barış Soner Uşaklı
|
3a57c3b6d8
|
removed disabled attrib from reset button
|
11 years ago |
|
Baris Soner Usakli
|
ae76bb3928
|
lots of err first fixeS
|
11 years ago |
|
Julian Lam
|
dfd2df99e6
|
removed "mark all as read" language strings and removed button from notifications page -- fixes #785
|
11 years ago |
|
Baris Soner Usakli
|
8f9f5b2849
|
added user images to profile button in mobile view
|
11 years ago |
|
Baris Soner Usakli
|
72fd78ac26
|
fixed indent in chat.tpl
|
11 years ago |
|
Baris Soner Usakli
|
e671f0343e
|
closes #782
|
11 years ago |
|
Baris Soner Usakli
|
b303fdcfd7
|
removed inline css
|
11 years ago |
MrWaffle
|
b78dc3eca8
|
Chat now supports markdown
|
11 years ago |
|
Baris Soner Usakli
|
466c02a886
|
removed teaser_text
|
11 years ago |
psychobunny
|
98d42b0ade
|
moving social sharing parsing code from server side to client side & cleaned up templates
|
11 years ago |
|
Julian Lam
|
acc390f6ef
|
added timeago locales, fixed timeago template error in ACP.
|
11 years ago |
|
Julian Lam
|
0ea09972b4
|
fixed issue where outgoing links warning page would intercept clicks to the search button in the headerbar (thanks @dove)
- linted some files
|
11 years ago |
|
Julian Lam
|
3837841882
|
removed automatic "visible-xs-inline" on links added by static-page or -42
|
11 years ago |
|
Baris Soner Usakli
|
243cb5af61
|
fixed mobile search link
|
11 years ago |
|
Julian Lam
|
5e538ef051
|
fixed #710 - added labels to the top bar (update vanilla!)
merged "loading" and "more_posts" in topic i18n data, changed behaviour so that on mobile, only the spinner shows.
|
11 years ago |
|
Julian Lam
|
e36f92b18e
|
closed #764
|
11 years ago |
|
Barış Soner Uşaklı
|
dea43ee008
|
Merge pull request #763 from bdharrington7/master
added login register selectors to close the nav when clicked
|
11 years ago |
|
Baris Soner Usakli
|
6053a8caa5
|
search icon should be hidden-xs
|
11 years ago |
bdharrington7
|
bf96903d6e
|
removed submenu for login / register in guest menu options
|
11 years ago |
|
bdharrington7
|
2b63b2c52a
|
fixed bug that hid the login menu option
|
11 years ago |
|
bdharrington7
|
0ad1f1576b
|
Fix: login / register collapses on click, Search unavailable if not allowed
|
11 years ago |
|
Baris Soner Usakli
|
1e59147d64
|
closes #760
|
11 years ago |
|
Baris Soner Usakli
|
30ad852492
|
closes #758
|
11 years ago |
|
Julian Lam
|
6d300e1110
|
updated chat i18n strings to use new modules.json file, added said files to language dirs
|
11 years ago |
|
Julian Lam
|
ea8aa3fff2
|
admin stuff, removed deprecated install templates, blah blah
|
11 years ago |
|
Baris Soner Usakli
|
c19d3e8063
|
closes #738
|
11 years ago |
|
Baris Soner Usakli
|
30624d4ad8
|
tabbified the admin settings page
|
11 years ago |
|
Julian Lam
|
cd6af45afb
|
added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
|
11 years ago |
|
Baris Soner Usakli
|
176ac54cdf
|
closes #745
|
11 years ago |
|
Baris Soner Usakli
|
414eaea413
|
username mention auto completes
|
11 years ago |
|
Baris Soner Usakli
|
6f94acd0f2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
8e6606fb5a
|
move post
|
11 years ago |
|
psychobunny
|
cfa4256df5
|
admin - download emails.csv, thanks to @akhoury for the gist
|
11 years ago |
|
Baris Soner Usakli
|
2e575bb2d8
|
closes #524
|
11 years ago |
|
psychobunny
|
6f120ff34a
|
closes #732, custom robots.txt
|
11 years ago |
|
psychobunny
|
7be16eab06
|
closes #722
|
11 years ago |
|
Baris Soner Usakli
|
58580bd866
|
closes #716, also moved chat to its own template
|
11 years ago |
|
Baris Soner Usakli
|
4dc8f2c2e1
|
closes #665
|
11 years ago |
|
psychobunny
|
b131dacf39
|
set external link for categories
|
11 years ago |
|
Julian Lam
|
8aa227b052
|
added note re: third-party emailer pluginses
|
11 years ago |
|
Julian Lam
|
eaf25c4a5f
|
removing SMTP settings fields in email settings portion of settings tab in ACP
|
11 years ago |
|
Baris Soner Usakli
|
e5ec5242c6
|
added relative_path
|
11 years ago |
|
Baris Soner Usakli
|
c3f7faffd3
|
added relative_path in admin site templaets
|
11 years ago |
|
Baris Soner Usakli
|
9da165c1a7
|
added relative_path to templates
|
11 years ago |
|
Baris Soner Usakli
|
680fac0674
|
added relative_path to header.tpl
|
11 years ago |
|
Baris Soner Usakli
|
981719dee1
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
1466e68aa1
|
ssl support 101
|
11 years ago |
|
Julian Lam
|
b6fdc5595d
|
removed handlebars dependency for emailer, using ANDREWBARS now
|
11 years ago |
|
Julian Lam
|
11ed9e8c85
|
tweaks to emailer, implemented emailer hook for password reset
|
11 years ago |
|
Julian Lam
|
0ac9ec6001
|
Merge remote-tracking branch 'origin/master' into email-revamp
|
11 years ago |
|
Baris Soner Usakli
|
f21a98f37f
|
first pass, #524, #667
|
11 years ago |
|
psychobunny
|
98a646fa62
|
changed numRecentTopics to numRecentReplies, that makes more sense now
|
11 years ago |
|
psychobunny
|
fb53e89023
|
upgrade.js - categories.numRecentTopics
|
11 years ago |
|
psychobunny
|
d28beaa4dc
|
admin - add "# recent topics to display" to categories
|
11 years ago |
|
psychobunny
|
ac06567617
|
admin - add custom class to categories (forgot to commit this)
|
11 years ago |
|
psychobunny
|
ebf07626de
|
use categories.class instead of hardcoded columns
|
11 years ago |
|
Julian Lam
|
35d6a99775
|
Merge branch 'AdminButton' of github.com:genderup/NodeBB into genderup-AdminButton
|
11 years ago |
|
Julian Lam
|
cdb0b4b49e
|
Merge branch 'master' into email-revamp
|
11 years ago |
|
Julian Lam
|
e45e86fcc1
|
fixed width icons in ACP. Also, who uses single quotes in HTML? ARGH
|
11 years ago |
|
Julian Lam
|
24944762d7
|
fixing 'back to nodebb' ext, and revamping email confirm logic
|
11 years ago |
|
Julian Lam
|
d6e0625fc8
|
Merge remote-tracking branch 'origin/master' into email-revamp
|
11 years ago |
|
Baris Soner Usakli
|
8bfb338eee
|
#712
|
11 years ago |
|
Julian Lam
|
339ed4e47b
|
implemented emailer for welcome email (though the email confirmation system is horribly broken)
|
11 years ago |
|
Julian Lam
|
3ff550914f
|
Merge remote-tracking branch 'origin/master' into email-revamp
Conflicts:
package.json
|
11 years ago |
|
Baris Soner Usakli
|
742c8fb43c
|
closes #712
|
11 years ago |
|
Baris Soner Usakli
|
d43f3cebc6
|
closes #707, closes #686
|
11 years ago |
|
Baris Soner Usakli
|
a974c6fa99
|
possible fix for mongo crash
|
11 years ago |
|
Baris Soner Usakli
|
6c30437c47
|
closes #706, refactor admin image uploads, fixed gif uploads
|
11 years ago |
|
Julian Lam
|
e4e57ce31f
|
initial commit to emailer system overhaul
|
11 years ago |
|
Baris Soner Usakli
|
21155b1b80
|
recent rss link fix
|
11 years ago |
|
Baris Soner Usakli
|
be3465c5ca
|
display events in admin page events section
|
11 years ago |
|
Baris Soner Usakli
|
a55fc364a0
|
closes #697
|
11 years ago |
|
Baris Soner Usakli
|
2f90949560
|
vanilla color fixes
|
11 years ago |
Michael Mitchell
|
0f0913bfe5
|
add admin button
|
11 years ago |
|
Baris Soner Usakli
|
ba2f47ead6
|
closes #690, closes #691
|
11 years ago |
Julian Lam
|
d8183c056c
|
added cache buster to require.js files - fixes #687
|
11 years ago |
|
Julian Lam
|
6ad28dadd4
|
Merge pull request #685 from akhoury/master
can i haz header-icons pls, merry xmas
|
11 years ago |
|
Baris Soner Usakli
|
2c489c600c
|
closes #675
|
11 years ago |
akhoury
|
abc782f5e6
|
can i haz header-icons pls, merry xmas
|
11 years ago |
|
Baris Soner Usakli
|
e9fbed71ae
|
closes #613, fixed allowRegistration incase its undefined
|
11 years ago |
|
Baris Soner Usakli
|
d068139d81
|
changed header links to icons
|
11 years ago |
|
Baris Soner Usakli
|
764e937c43
|
removed inline style
|
11 years ago |
|
Baris Soner Usakli
|
fe1a75d1fd
|
paginator starts hidden
|
11 years ago |
|
Baris Soner Usakli
|
3bd8cf69a1
|
admins can create users from admin/users panel
|
11 years ago |
|
Baris Soner Usakli
|
f68f02d346
|
closes #679
|
11 years ago |
|
Baris Soner Usakli
|
8bfea656c4
|
Merge branch 'master' of https://github.com/akhoury/NodeBB into akhoury-master
|
11 years ago |
|
Julian Lam
|
0b94297c64
|
Merge remote-tracking branch 'origin/master' into composer-revamp
|
11 years ago |
|
Baris Usakli
|
da9c673ec4
|
closes #651
|
11 years ago |
|
Julian Lam
|
002826d84f
|
resizing the post composer now saves the size for future windows
|
11 years ago |
|
Julian Lam
|
289e081e2e
|
fixed new composer posting (woot)
|
11 years ago |
|
Julian Lam
|
83f20c1cdb
|
OMG SNAPS
|
11 years ago |
|
Julian Lam
|
c4623e2447
|
Merge remote-tracking branch 'origin/master' into composer-revamp
|
11 years ago |
|
Julian Lam
|
99fba3b83a
|
fixing issue where composer pushing didn't wait for the template to
properly render :P
|
11 years ago |
|
Baris Soner Usakli
|
2580caf864
|
fixing #591 again looks like it got overwritter by merge
|
11 years ago |
|
Julian Lam
|
f2d631e42d
|
new composer window template (WIP!)
|
11 years ago |
|
psychobunny
|
3782ae1647
|
don't show profile fields if they are hidden. closes #660. also added missing language keys to EN
|
11 years ago |
psychobunny
|
2e52dd59ee
|
Merge pull request #664 from ifuyivara/master
Adding support for restricting category read access based on user groups
|
11 years ago |
|
psychobunny
|
d7a444d9ab
|
dynamically update post count in post footer on new post
|
11 years ago |
|
psychobunny
|
f9e2b50826
|
dynamically update user rep in post footer if reputation is increased
|
11 years ago |
|
psychobunny
|
32a32fcf5c
|
match login.tpl button to look like register.tpl
|
11 years ago |
root
|
35ad3be969
|
Adding support for restricting category read access based on user groups
|
11 years ago |
|
Baris Soner Usakli
|
30c11a8b42
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
27a01f6c61
|
closes #657
|
11 years ago |
|
psychobunny
|
bf27ade251
|
admin - added ability to remove icon from categories
|
11 years ago |
|
akhoury
|
114294e24a
|
allowGuestSearching config .. second attempt
|
11 years ago |
|
Julian Lam
|
43c05d1d85
|
adding cache busters to client side files (closed #586)
|
11 years ago |
|
psychobunny
|
0f254c0b6c
|
moved theme.css to top
|
11 years ago |
|
psychobunny
|
b27478876e
|
moved favicon link to top of header
|
11 years ago |
|
psychobunny
|
a3734f2e15
|
completed custom favicon upload, closes #643
|
11 years ago |
|
psychobunny
|
1b843fba9c
|
added admin route to upload favicon
|
11 years ago |
|
psychobunny
|
35f17db141
|
added button in admin to upload favicon + show current favicon image
|
11 years ago |
|
psychobunny
|
07a3b3f00b
|
added delete button to category image uploader in case you wanted to revert to bgColor
|
11 years ago |
|
psychobunny
|
4ff8509a0e
|
clean up from the last admin/categories refactor
|
11 years ago |
|
psychobunny
|
e76936abfc
|
added ability to upload category images. closes #638, closes #532
|
11 years ago |
|
psychobunny
|
7db234f958
|
added setting to convert profile iamges to png in control panel
|
11 years ago |
|
psychobunny
|
c0721e105f
|
added setting to disable privilege threshold system
|
11 years ago |
|
psychobunny
|
2a5d6e04fc
|
fixes #583 (aka. "son, we heard you like containers so we put containers inside your containers") -- duly fixed
|
11 years ago |
|
psychobunny
|
202a4c4105
|
added rep + post count metrics to post body, closes #443
|
11 years ago |
|
psychobunny
|
90e1e2436c
|
closes #539
|
11 years ago |
|
Julian Lam
|
6de3dba239
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
|
Julian Lam
|
021cf9b8f6
|
fixes to language template usage
|
11 years ago |
|
psychobunny
|
ca087e6fa7
|
fixes #576
|
11 years ago |
|
Julian Lam
|
347f5c132e
|
updates to language files, capitalizing some values across languages
|
11 years ago |
|
Baris Usakli
|
074d7e7c8d
|
Merge remote-tracking branch 'origin/master' into dbal
|
11 years ago |
|
Barış Soner Uşaklı
|
870d48dc81
|
Merge pull request #603 from Joopmicroop/master
added account class for account template pages for easy styling
|
11 years ago |
|
Baris Usakli
|
6313a5eeb1
|
Merge remote-tracking branch 'origin/master' into dbal
|
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
|
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
|
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
|
5b6f5ebf9d
|
added tinycon lib and changed notif icon to be in CSS instead of in
template
|
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
|
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 |
|
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 |
|
Baris Soner Usakli
|
d5c0ca4a9d
|
closes #595
|
11 years ago |
|
Baris Soner Usakli
|
437379413e
|
closes #592
|
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 Usakli
|
ee63fae803
|
closes #584
|
11 years ago |
|
Baris Usakli
|
6a00ab3782
|
removed btn-large from post topic button
|
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
|
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
|
56ef05a0bf
|
putting category options behind a dropdown, and fixing category enable/disable
|
11 years ago |
|
Baris Usakli
|
293c176053
|
added first to follow button in topic.tpl
|
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
|
fa56eca962
|
fixed fave stars, removed the watch button from normal posts
|
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
|
a87ebb64d8
|
clean up of posts and some template additions
|
11 years ago |
|
Baris Usakli
|
7198110b57
|
closes #573
|
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 |
|
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 |
|
psychobunny
|
62e2aa67d7
|
topics - added back social sharing buttons to OP
|
11 years ago |
|
Baris Soner Usakli
|
a0c3de0273
|
display signature block only if user has signature
|
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 |
|
psychobunny
|
8f80733563
|
fixing #552 overflows properly
|
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
|
541993c80a
|
fontawesome 4 migration, closes #473
|
11 years ago |
|
Baris Usakli
|
a5e78aab08
|
closes #554
|
11 years ago |
|
Baris Soner Usakli
|
1d4ae8fe4d
|
changed the paginator icons to chevron
|
11 years ago |
|
psychobunny
|
4be5ac2c23
|
removed mobile overlay for topics - will reimplement as a plugin
|
11 years ago |
|
psychobunny
|
8d12ecb758
|
moved pagination into header
|
11 years ago |
|
psychobunny
|
905e451455
|
closes #549
|
11 years ago |
|
psychobunny
|
7fb0a616a1
|
refactored topic.tpl and merged main_posts and sub_posts
|
11 years ago |
|
psychobunny
|
181c6eb2e6
|
removed main_posts from noscript
|
11 years ago |
|
psychobunny
|
b90eef6d19
|
use icon-search instead of icon-circle-blank on /users/search
|
11 years ago |
|
Baris Soner Usakli
|
ff50917c29
|
show no replies in recent and unread
|
11 years ago |
|
Baris Soner Usakli
|
48835d8c44
|
used ELSE in template
|
11 years ago |
|
Baris Soner Usakli
|
23eb7824ac
|
closes #513
|
11 years ago |
|
Baris Soner Usakli
|
494b9d23ac
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
|
Baris Soner Usakli
|
64ae9ac033
|
cant delete or restore posts twice, post count goes up or down when posts are deleted or restored in a topic, fixed the post insertion when there is only 1 post in topic
|
11 years ago |
|
Julian Lam
|
a72fc69997
|
added link to RSS for /recent, fixed RSS generation error for /recent
|
11 years ago |
|
Baris Soner Usakli
|
a16f93cbd5
|
loading indicator starts off hidden
|
11 years ago |
|
psychobunny
|
46bad118de
|
if a thread is unreplied, don't show the OP as the last person to reply
|
11 years ago |
|
psychobunny
|
a1839d90fd
|
prevent admin group from being deleted, closes #530
|
11 years ago |