mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server into master
This commit is contained in:
@@ -39,7 +39,7 @@ module.exports = function (options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FIXME Allowing all urls with _next in it, but not in params
|
// FIXME Allowing all urls with _next in it, but not in params
|
||||||
if (req.url.split('?')[0].includes('_next')) {
|
if (req.url.split('?')[0].includes('_next') || req.url.split('?')[0].includes('well-known/acme-challenge')) {
|
||||||
req.session = { isException: true }
|
req.session = { isException: true }
|
||||||
next()
|
next()
|
||||||
return
|
return
|
||||||
|
@@ -45,7 +45,7 @@ const testUsersFile = 'data/testUsers.json'
|
|||||||
|
|
||||||
// other constants
|
// other constants
|
||||||
const maxVeteranPwGetCount = 10
|
const maxVeteranPwGetCount = 10
|
||||||
const addPWPerDay = 1 // every x day a user can give a pw
|
const addPWPerDay = 3 // every x day a user can give a pw
|
||||||
const maxPWCount = 6 // maximum pw give opportunities a user can have at once
|
const maxPWCount = 6 // maximum pw give opportunities a user can have at once
|
||||||
// const daysAfterUserGetsPWs = 2 // days after user gets pw-s
|
// const daysAfterUserGetsPWs = 2 // days after user gets pw-s
|
||||||
|
|
||||||
|
Submodule modules/qmining/qmining-page updated: 8ae3e7865d...7ac65348e4
@@ -171,7 +171,13 @@ function GetApp () {
|
|||||||
|
|
||||||
let f = []
|
let f = []
|
||||||
|
|
||||||
fs.readdirSync(curr).forEach((item) => {
|
let files = fs.readdirSync(curr)
|
||||||
|
files.sort(function (a, b) {
|
||||||
|
return fs.statSync(curr + b).mtime.getTime() -
|
||||||
|
fs.statSync(curr + a).mtime.getTime()
|
||||||
|
})
|
||||||
|
|
||||||
|
files.forEach((item) => {
|
||||||
if (item[0] !== '.') {
|
if (item[0] !== '.') {
|
||||||
let res = { name: item }
|
let res = { name: item }
|
||||||
let stat = fs.statSync(curr + '/' + item)
|
let stat = fs.statSync(curr + '/' + item)
|
||||||
|
Submodule qminingPublic/moodle-test-userscript updated: f8d4bf2a41...cbaaa7a376
@@ -91,6 +91,7 @@ function jsonStats () {
|
|||||||
-e "s,/dataCount,${G}&${NC},g" \
|
-e "s,/dataCount,${G}&${NC},g" \
|
||||||
-e "s,/menuClick,${G}&${NC},g" \
|
-e "s,/menuClick,${G}&${NC},g" \
|
||||||
-e "s,/allqr,${G}&${NC},g" \
|
-e "s,/allqr,${G}&${NC},g" \
|
||||||
|
-e "s,/uploaddata,${G}&${NC},g" \
|
||||||
-e "s,/legacy,${G}&${NC},g" \
|
-e "s,/legacy,${G}&${NC},g" \
|
||||||
-e "s,/donate,${P}&${NC},g" \
|
-e "s,/donate,${P}&${NC},g" \
|
||||||
-e "s,/tiszai,${P}&${NC},g" \
|
-e "s,/tiszai,${P}&${NC},g" \
|
||||||
|
@@ -29,6 +29,7 @@
|
|||||||
margin: 20px;
|
margin: 20px;
|
||||||
}
|
}
|
||||||
.title {
|
.title {
|
||||||
|
margin: 20px;
|
||||||
font-size: 50px;
|
font-size: 50px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: white;
|
color: white;
|
||||||
@@ -89,9 +90,6 @@
|
|||||||
<div class='title'>
|
<div class='title'>
|
||||||
Frylabs
|
Frylabs
|
||||||
</div>
|
</div>
|
||||||
<div id='text' class='text'>
|
|
||||||
Új jelszót a meglévő felhasználóktól lehet kérni
|
|
||||||
</div>
|
|
||||||
<div id='feedback'>
|
<div id='feedback'>
|
||||||
<textarea placeholder='Feedback' id='feedbackTextArea'></textarea>
|
<textarea placeholder='Feedback' id='feedbackTextArea'></textarea>
|
||||||
<div class='ircLinkContainer' >
|
<div class='ircLinkContainer' >
|
||||||
|
Reference in New Issue
Block a user