mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-10-31 07:43:33 +00:00 
			
		
		
		
	v2.1.0 (#293)
* Fix wrapping when too many hosts are shown (#207) * Update npm packages, fixes CVE-2019-10757 * Revert some breaking packages * Major overhaul - Docker buildx support in CI - Cypress API Testing in CI - Restructured folder layout (insert clean face meme) - Added Swagger documentation and validate API against that (to be completed) - Use common base image for all supported archs, which includes updated nginx with ipv6 support - Updated certbot and changes required for it - Large amount of Hosts names will wrap in UI - Updated packages for frontend - Version bump 2.1.0 * Updated documentation * Fix JWT expire time going crazy. Now set to 1day * Backend JS formatting rules * Remove v1 importer, I doubt anyone is using v1 anymore * Added backend formatting rules and enforce them in Jenkins builds * Fix CI, doesn't need a tty * Thanks bcrypt. Why can't you just be normal. * Cleanup after syntax check Co-authored-by: Marcelo Castagna <margaale@users.noreply.github.com>
This commit is contained in:
		
							
								
								
									
										26
									
								
								frontend/js/lib/helpers.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/js/lib/helpers.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | ||||
| const numeral = require('numeral'); | ||||
| const moment  = require('moment'); | ||||
|  | ||||
| module.exports = { | ||||
|  | ||||
|     /** | ||||
|      * @param   {Integer} number | ||||
|      * @returns {String} | ||||
|      */ | ||||
|     niceNumber: function (number) { | ||||
|         return numeral(number).format('0,0'); | ||||
|     }, | ||||
|  | ||||
|     /** | ||||
|      * @param   {String|Number} date | ||||
|      * @param   {String}        format | ||||
|      * @returns {String} | ||||
|      */ | ||||
|     formatDbDate: function (date, format) { | ||||
|         if (typeof date === 'number') { | ||||
|             return moment.unix(date).format(format); | ||||
|         } | ||||
|  | ||||
|         return moment(date).format(format); | ||||
|     } | ||||
| }; | ||||
							
								
								
									
										15
									
								
								frontend/js/lib/marionette.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								frontend/js/lib/marionette.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| const _             = require('underscore'); | ||||
| const Mn            = require('backbone.marionette'); | ||||
| const i18n          = require('../app/i18n'); | ||||
| const Helpers       = require('./helpers'); | ||||
| const TemplateCache = require('marionette.templatecache'); | ||||
|  | ||||
| Mn.setRenderer(function (template, data, view) { | ||||
|     data              = _.clone(data); | ||||
|     data.i18n         = i18n; | ||||
|     data.formatDbDate = Helpers.formatDbDate; | ||||
|  | ||||
|     return TemplateCache.default.render.call(this, template, data, view); | ||||
| }); | ||||
|  | ||||
| module.exports = Mn; | ||||
		Reference in New Issue
	
	Block a user