diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
| commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
| tree | a66a930783de938deaa3d2362dcf779e5c2b45af /apps/files_versions | |
| parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
| parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
| download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip | |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/history.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/l10n/.gitkeep | 0 | ||||
| -rw-r--r-- | apps/files_versions/l10n/ca.php | 4 | ||||
| -rw-r--r-- | apps/files_versions/l10n/pl.php | 4 | ||||
| -rw-r--r-- | apps/files_versions/l10n/sv.php | 4 | ||||
| -rw-r--r-- | apps/files_versions/templates/settings-personal.php | 4 |
6 files changed, 15 insertions, 3 deletions
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index a34c92ee422..27dc8bfc382 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -28,7 +28,7 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); if ( isset( $_GET['path'] ) ) { $path = $_GET['path']; - $path = strip_tags( $path ); + $path = $path; $tmpl->assign( 'path', $path ); $versions = new OCA_Versions\Storage(); diff --git a/apps/files_versions/l10n/.gitkeep b/apps/files_versions/l10n/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/apps/files_versions/l10n/.gitkeep diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php new file mode 100644 index 00000000000..8388556bec6 --- /dev/null +++ b/apps/files_versions/l10n/ca.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Expire all versions" => "Expira totes les versions", +"Enable Files Versioning" => "Habilita les versions de fitxers" +); diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php new file mode 100644 index 00000000000..faf2d39e709 --- /dev/null +++ b/apps/files_versions/l10n/pl.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Expire all versions" => "Wygasają wszystkie wersje", +"Enable Files Versioning" => "Włącz wersjonowanie plików" +); diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php new file mode 100644 index 00000000000..03d4d54d0b9 --- /dev/null +++ b/apps/files_versions/l10n/sv.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Expire all versions" => "Upphör alla versioner", +"Enable Files Versioning" => "Aktivera versionshantering" +); diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php index 7ff016b585e..fe9ba381e58 100644 --- a/apps/files_versions/templates/settings-personal.php +++ b/apps/files_versions/templates/settings-personal.php @@ -4,6 +4,6 @@ <strong>Versions</strong><!-- translate using echo $l->t('foo'); --> </legend> <p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); --> - <button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button> + <button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button> </fieldset> -</form>
\ No newline at end of file +</form> |