mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mambojuice/pretty-ui' into fileentryindex

Browse Source 
Conflicts:
	urbackupserver/www/index.htm
	urbackupserver/www/templates/compile_templates.sh
	urbackupserver/www/templates/node_modules/.bin/dustc
	urbackupserver/www/urbackup.js
This commit is contained in:
Martin 2014-11-16 14:24:21 +01:00
commit e9caaf36fe
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -201,7 +201,6 @@ urbackup/sqlite.exe
urbackup/sqlite3_analyzer.exe
urbackupserver/www/jquery.dataTables.js
urbackupserver/www/dust-full.js
urbackupserver/www/templates/node_modules/*
pw_change.txt
urbackup/backup_client.db-journal
session_idents.txt
@ -217,3 +216,4 @@ debug.log.*
urbackup/old_version_db/*
urbackup/new_version_db/*
urbackup/old_version_db/*
urbackupserver/www/templates/node_modules/*

38
urbackupserver/www/templates.js
View File

File diff suppressed because one or more lines are too long

8
urbackupserver/www/urbackup.js
View File

@ -10,7 +10,7 @@ g.status_show_all=false;
g.datatable_default_config={};
g.languages=[
{ l: "Deutsch", s: "de" },
{ l: "Deutsch", s: "de" },
{ l: "English", s: "en" },
{ l: "Español", s: "es" },
{ l: "Français", s: "fr" },
@ -22,9 +22,9 @@ g.languages=[
{ l: "Português do Brasil", s: "pt_BR" },
{ l: "slovenský jazyk", s: "sk"},
{ l: "Nederlands", s: "nl" },
{ l: "norsk", s: "no_NO" },
{ l: "Italiano", s: "it_IT" },
{ l: "Ceské", s: "cs_CZ" }
{ l: "norsk", s: "no_NO" }
];