minor tweaks to config default, and text copy update on registration page

updated readme to mention the upload_path option
v1.18.x
Julian Lam 12 years ago
parent eb606855bc
commit 8bb724e994

@ -42,6 +42,10 @@ The server configuration file (located at `/config.js`) contains default options
<td><b>base_url</b></td> <td><b>base_url</b></td>
<td><i>(Default: 'http://localhost')</i> A web-accessible URL to your app, without the port</td> <td><i>(Default: 'http://localhost')</i> A web-accessible URL to your app, without the port</td>
</tr> </tr>
<tr>
<td><b>upload_path</b></td>
<td><i>(Default: '/public/uploads')</i> A relative path (relative to the application's web root) to the uploads folder. Please ensure that Node.js can write to this folder</td>
</tr>
<tr> <tr>
<td><b>use_port</b></td> <td><b>use_port</b></td>
<td><i>(Default: true)</i> Whether or not to include the port number when constructing the url for use in NodeBB. If you are serving NodeBB via a proxy (i.e. nginx), switch this off. <td><i>(Default: true)</i> Whether or not to include the port number when constructing the url for use in NodeBB. If you are serving NodeBB via a proxy (i.e. nginx), switch this off.

@ -6,7 +6,7 @@ var config = {
"base_url": "http://localhost", "base_url": "http://localhost",
// relative path for uploads // relative path for uploads
"upload_path": "/uploads/", "upload_path": "/public/uploads/",
"use_port": true, "use_port": true,
"port": 4567, "port": 4567,

@ -9,7 +9,7 @@
</form> </form>
</div> </div>
<div class="well span6 {alternate_logins:display}"> <div class="well span6 {alternate_logins:display}">
<h4>Alternative Logins</h4> <h4>Alternative Registration</h4>
<ul class="alt-logins"> <ul class="alt-logins">
<li data-url="/auth/twitter" class="twitter {twitter:display}"></li> <li data-url="/auth/twitter" class="twitter {twitter:display}"></li>
<li data-url="/auth/google" class="google {google:display}"></li> <li data-url="/auth/google" class="google {google:display}"></li>

Loading…
Cancel
Save