cuts staging from master #918

Merged
jessopb merged 15 commits from master into staging 2019-02-16 22:31:54 +01:00

15 commits

Author SHA1 Message Date
jessopb
5298329832
Merge pull request #906 from jessopb/mdhtml2
styling, markdown settings tied to config
2019-02-16 16:10:42 -05:00
jessop
181b3463b7 styling, markdown settings tied to config 2019-02-15 01:13:02 -05:00
jessopb
00b2f44a4f
Merge pull request #914 from kcseb/master
Updated the instructions to reflect building before starting
2019-02-14 16:39:37 -05:00
jessopb
8830f5e7b1
Merge pull request #912 from jessopb/nsfwSupport
enables nsfw updates
2019-02-13 18:18:46 -05:00
jessop
5e8e22dcad enables nsfw updates 2019-02-13 17:34:23 -05:00
Kenneth C
27cbe26936
Updated the instructions to reflect building before starting
Updated this in a previous pull request but the way I phrased it was a little bit off. 

This provides the instructions that you must BUILD before STARTING the server for it to actually reflect the changes made.
2019-02-13 16:50:27 -05:00
jessopb
0672431563
Merge pull request #909 from jessopb/updateLodash
updates lodash for vulnerabilities
2019-02-12 23:23:31 -05:00
jessop
3de2b3a572 updates lodash for vulnerabilities 2019-02-12 12:32:55 -05:00
jessopb
1d02b6e295
Merge pull request #907 from jessopb/configwallet
updates wallet check in config to address_list
2019-02-10 23:01:55 -05:00
jessopb
b19269509a
Merge pull request #908 from jessopb/accountBal
updates wallet_balance to account_balance
2019-02-10 23:01:35 -05:00
jessop
230a862458 updates wallet_balance to account_balance 2019-02-09 16:18:09 -05:00
jessopb
521c0cc201
Merge pull request #902 from jessopb/refactorPublishValidate
Refactor publish and validation and servability for all file types
2019-02-09 15:41:06 -05:00
jessop
e364dc4024 publishes any file type, handles 99% for download 2019-02-09 15:27:50 -05:00
jessop
2ff0728db4 updates wallet check in config to address_list 2019-02-09 00:03:41 -05:00
jessop
815d0437ac refactors publishValidate 2019-02-05 21:34:45 -05:00