Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
555d582
Return whether the file is readable or not in the DAV permissions
danxuliu Nov 2, 2017
e6b74fa
Add proper handling of files without permissions
danxuliu Nov 2, 2017
c047f32
Remove requeriment for read permission on some actions
danxuliu Nov 2, 2017
e2c755a
Fix asserts silently not executed
danxuliu Nov 2, 2017
ec375b3
Fix tests for parsing of permissions
danxuliu Nov 2, 2017
3e844d3
Set read permission for files based on the data returned by the server
danxuliu Nov 2, 2017
67db42e
Add app content list
skjnldsv Nov 16, 2017
627293a
Checkboxes and various design fixes
skjnldsv Nov 16, 2017
3d063e4
Checkboxes and favourite fix
skjnldsv Nov 17, 2017
704a3d9
Re-optimize and clean up settings, social and logo icons
pixelipo Nov 17, 2017
5d85af7
Force breaks on extremely long words
danxuliu Nov 13, 2017
a1d4ac6
only replace permission popupmenu
blizzz Nov 17, 2017
059be95
Merge pull request #7163 from nextcloud/force-breaks-on-extremely-lon…
jancborchardt Nov 17, 2017
2eb2b6e
If there is no internet connection don't try to contact appstore
rullzer Nov 9, 2017
6bbda28
Fix tests
rullzer Nov 17, 2017
07af58d
Merge pull request #7121 from nextcloud/fix_7119
rullzer Nov 17, 2017
39ec541
[tx-robot] updated from transifex
nextcloud-bot Nov 18, 2017
dd53737
[tx-robot] updated from transifex
nextcloud-bot Nov 19, 2017
96b15ce
[tx-robot] updated from transifex
nextcloud-bot Nov 20, 2017
93e34fb
Merge pull request #7211 from nextcloud/fix-5916
MorrisJobke Nov 20, 2017
1dd8746
Reduce size of date in list
jancborchardt Nov 20, 2017
5ea1419
Move star to top right instead of top left, fix checkbox overlay
jancborchardt Nov 20, 2017
a61015d
Increase clickable area of actions to 44*44px
jancborchardt Nov 20, 2017
bca1658
Merge pull request #7195 from nextcloud/app-content-list
MorrisJobke Nov 20, 2017
f347e2e
Merge pull request #7047 from nextcloud/add-support-for-files-with-no…
schiessle Nov 20, 2017
6dd60d2
Make user-related icons bigger.
pixelipo Nov 20, 2017
8615ca8
Re-optimize and clean up settings, social and logo icons
pixelipo Nov 17, 2017
0709f38
Make user-related icons bigger.
pixelipo Nov 20, 2017
955f732
Merge branch 'fix-broken-svg-4' of github.com:nextcloud/server into f…
pixelipo Nov 20, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/comments/css/comments.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#commentsTabView .comment {
position: relative;
margin-bottom: 30px;
word-wrap: break-word;
overflow-wrap: break-word;
}

#commentsTabView .comment .avatar,
Expand Down
11 changes: 11 additions & 0 deletions apps/dav/l10n/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ OC.L10N.register(
"A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
"A calendar <strong>todo</strong> was modified" : "En kalender <strong>opgave</strong> blev ændret",
"Contact birthdays" : "Kontakt fødselsdag",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Invitation annulleret",
"Hello %s," : "Goddag %s,",
"The meeting »%s« with %s was canceled." : "Mødet »%s« med %s blev annulleret.",
"Invitation updated" : "Invitation opdateret ",
"The meeting »%s« with %s was updated." : "Mødet »%s« med %s blev opdateret.",
"%s invited you to »%s«" : "%s inviterede dig til »%s«",
"When:" : "Hvornår:",
"Where:" : "Hvor:",
"Description:" : "Beskrivelse:",
"Link:" : "Link:",
"Contacts" : "Kontakter",
"Technical details" : "Tekniske detaljer",
"Remote Address: %s" : "Fjernadresse: %s",
Expand Down
11 changes: 11 additions & 0 deletions apps/dav/l10n/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@
"A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
"A calendar <strong>todo</strong> was modified" : "En kalender <strong>opgave</strong> blev ændret",
"Contact birthdays" : "Kontakt fødselsdag",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Invitation annulleret",
"Hello %s," : "Goddag %s,",
"The meeting »%s« with %s was canceled." : "Mødet »%s« med %s blev annulleret.",
"Invitation updated" : "Invitation opdateret ",
"The meeting »%s« with %s was updated." : "Mødet »%s« med %s blev opdateret.",
"%s invited you to »%s«" : "%s inviterede dig til »%s«",
"When:" : "Hvornår:",
"Where:" : "Hvor:",
"Description:" : "Beskrivelse:",
"Link:" : "Link:",
"Contacts" : "Kontakter",
"Technical details" : "Tekniske detaljer",
"Remote Address: %s" : "Fjernadresse: %s",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/en_GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OC.L10N.register(
"A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
"A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
"Contact birthdays" : "Contact birthdays",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Invitation canceled",
"Hello %s," : "Hello %s,",
"The meeting »%s« with %s was canceled." : "The meeting »%s« with %s was canceled.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
"A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
"Contact birthdays" : "Contact birthdays",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Invitation canceled",
"Hello %s," : "Hello %s,",
"The meeting »%s« with %s was canceled." : "The meeting »%s« with %s was canceled.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OC.L10N.register(
"A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.",
"A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada",
"Contact birthdays" : "Cumpleaños del contacto",
"%s via %s" : "%s vía %s",
"Invitation canceled" : "Invitación cancelada",
"Hello %s," : "Hola, %s:",
"The meeting »%s« with %s was canceled." : "La reunión »%s« con %s se ha cancelado.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.",
"A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada",
"Contact birthdays" : "Cumpleaños del contacto",
"%s via %s" : "%s vía %s",
"Invitation canceled" : "Invitación cancelada",
"Hello %s," : "Hola, %s:",
"The meeting »%s« with %s was canceled." : "La reunión »%s« con %s se ha cancelado.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/ka_GE.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OC.L10N.register(
"A calendar <strong>event</strong> was modified" : "კალენდრის <strong>მოვლენა</strong> შეიცვალა",
"A calendar <strong>todo</strong> was modified" : "კალენდრის <strong>შესასრულებელი დავალება</strong> შეიცვალა",
"Contact birthdays" : "კონტაქტების დაბადების დღეები",
"%s via %s" : "%s %s-ით",
"Invitation canceled" : "მოწვევა გაუქმდა",
"Hello %s," : "გამარჯობა %s,",
"The meeting »%s« with %s was canceled." : "შეხვედრა »%s« %s-სთან გაუქმდა.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/ka_GE.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"A calendar <strong>event</strong> was modified" : "კალენდრის <strong>მოვლენა</strong> შეიცვალა",
"A calendar <strong>todo</strong> was modified" : "კალენდრის <strong>შესასრულებელი დავალება</strong> შეიცვალა",
"Contact birthdays" : "კონტაქტების დაბადების დღეები",
"%s via %s" : "%s %s-ით",
"Invitation canceled" : "მოწვევა გაუქმდა",
"Hello %s," : "გამარჯობა %s,",
"The meeting »%s« with %s was canceled." : "შეხვედრა »%s« %s-სთან გაუქმდა.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OC.L10N.register(
"A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast",
"A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast",
"Contact birthdays" : "Verjaardagen",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Uitnodiging geannuleerd",
"Hello %s," : "Hallo %s,",
"The meeting »%s« with %s was canceled." : "De vergadering »%s« met %s is geannuleerd.",
Expand Down
1 change: 1 addition & 0 deletions apps/dav/l10n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast",
"A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast",
"Contact birthdays" : "Verjaardagen",
"%s via %s" : "%s via %s",
"Invitation canceled" : "Uitnodiging geannuleerd",
"Hello %s," : "Hallo %s,",
"The meeting »%s« with %s was canceled." : "De vergadering »%s« met %s is geannuleerd.",
Expand Down
3 changes: 3 additions & 0 deletions apps/dav/lib/Connector/Sabre/Node.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ public function getDavPermissions() {
if ($this->info->isMounted()) {
$p .= 'M';
}
if ($this->info->isReadable()) {
$p .= 'G';
}
if ($this->info->isDeletable()) {
$p .= 'D';
}
Expand Down
20 changes: 11 additions & 9 deletions apps/dav/tests/unit/Connector/Sabre/NodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@
class NodeTest extends \Test\TestCase {
public function davPermissionsProvider() {
return array(
array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RDNVW'),
array(\OCP\Constants::PERMISSION_ALL, 'dir', false, false, 'RDNVCK'),
array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'),
array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RD'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'),
array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RGDNVW'),
array(\OCP\Constants::PERMISSION_ALL, 'dir', false, false, 'RGDNVCK'),
array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRGDNVW'),
array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMGDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SGDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RGD'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RGNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RGDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_READ, 'file', false, false, 'RDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RGDNV'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_READ, 'dir', false, false, 'RDNVCK'),
);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/files/js/fileactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
}
var filteredActions = {};
$.each(actions, function (name, action) {
if (action.permissions & permissions) {
if ((action.permissions === OC.PERMISSION_NONE) || (action.permissions & permissions)) {
filteredActions[name] = action;
}
});
Expand Down
9 changes: 7 additions & 2 deletions apps/files/js/filelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
mime: 'all',
order: -50,
iconClass: 'icon-details',
permissions: OC.PERMISSION_READ,
permissions: OC.PERMISSION_NONE,
actionHandler: function(fileName, context) {
self._updateDetailsView(fileName);
}
Expand Down Expand Up @@ -1161,6 +1161,11 @@
}
}

var permissions = fileData.permissions;
if (permissions === undefined || permissions === null) {
permissions = this.getDirectoryPermissions();
}

//containing tr
var tr = $('<tr></tr>').attr({
"data-id" : fileData.id,
Expand All @@ -1170,7 +1175,7 @@
"data-mime": mime,
"data-mtime": mtime,
"data-etag": fileData.etag,
"data-permissions": fileData.permissions || this.getDirectoryPermissions(),
"data-permissions": permissions,
"data-has-preview": fileData.hasPreview !== false
});

Expand Down
2 changes: 1 addition & 1 deletion apps/files/js/tagsplugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
},
mime: 'all',
order: -100,
permissions: OC.PERMISSION_READ,
permissions: OC.PERMISSION_NONE,
iconClass: function(fileName, context) {
var $file = context.$file;
var isFavorite = $file.data('favorite') === true;
Expand Down
2 changes: 2 additions & 0 deletions apps/files/l10n/pl.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ OC.L10N.register(
"Uploading …" : "Wysyłanie...",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
"Target folder does not exist any more" : "Folder docelowy już nie istnieje",
"Error when assembling chunks, status code {status}" : "Błąd podczas łączenia fragmentów, kod statusu {status}",
"Actions" : "Akcje",
"Download" : "Pobierz",
"Rename" : "Zmień nazwę",
Expand Down
2 changes: 2 additions & 0 deletions apps/files/l10n/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"Uploading …" : "Wysyłanie...",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} z {totalSize} ({bitrate})",
"Target folder does not exist any more" : "Folder docelowy już nie istnieje",
"Error when assembling chunks, status code {status}" : "Błąd podczas łączenia fragmentów, kod statusu {status}",
"Actions" : "Akcje",
"Download" : "Pobierz",
"Rename" : "Zmień nazwę",
Expand Down
8 changes: 4 additions & 4 deletions apps/files/l10n/sr.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ OC.L10N.register(
"Storage invalid" : "Неисправно складиште",
"Unknown error" : "Непозната грешка",
"All files" : "Сви фајлови",
"Recent" : "Скорашње",
"Recent" : "Скорашњи",
"File could not be found" : "Фајл није нађен",
"Home" : "Почетна",
"Close" : "Затвори",
Expand Down Expand Up @@ -137,9 +137,9 @@ OC.L10N.register(
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
"No favorites yet" : "Још нема омиљених",
"Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде",
"Shared with you" : "Дељено са вама",
"Shared with others" : "Дељено са осталима",
"Shared by link" : "Дељено путем везе",
"Shared with you" : "Дељени са вама",
"Shared with others" : "Дељени са осталима",
"Shared by link" : "Дељени путем везе",
"Tags" : "Ознаке",
"Deleted files" : "Обрисани фајлови",
"Text file" : "Tекстуални фајл",
Expand Down
8 changes: 4 additions & 4 deletions apps/files/l10n/sr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Storage invalid" : "Неисправно складиште",
"Unknown error" : "Непозната грешка",
"All files" : "Сви фајлови",
"Recent" : "Скорашње",
"Recent" : "Скорашњи",
"File could not be found" : "Фајл није нађен",
"Home" : "Почетна",
"Close" : "Затвори",
Expand Down Expand Up @@ -135,9 +135,9 @@
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
"No favorites yet" : "Још нема омиљених",
"Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде",
"Shared with you" : "Дељено са вама",
"Shared with others" : "Дељено са осталима",
"Shared by link" : "Дељено путем везе",
"Shared with you" : "Дељени са вама",
"Shared with others" : "Дељени са осталима",
"Shared by link" : "Дељени путем везе",
"Tags" : "Ознаке",
"Deleted files" : "Обрисани фајлови",
"Text file" : "Tекстуални фајл",
Expand Down
9 changes: 9 additions & 0 deletions apps/files/tests/js/filelistSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,15 @@ describe('OCA.Files.FileList tests', function() {
expect($tr.find('.filesize').text()).toEqual('Pending');
expect($tr.find('.date').text()).not.toEqual('?');
});
it('generates file element with no permissions when permissions are explicitly none', function() {
var fileData = {
type: 'dir',
name: 'testFolder',
permissions: OC.PERMISSION_NONE
};
var $tr = fileList.add(fileData);
expect($tr.attr('data-permissions')).toEqual('0');
});
it('generates file element with zero size when size is explicitly zero', function() {
var fileData = {
type: 'dir',
Expand Down
4 changes: 2 additions & 2 deletions apps/files_external/l10n/sr.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ OC.L10N.register(
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Дели",
"Domain" : "Домен",
"SMB / CIFS using OC login" : "SMB / CIFS користећи оунКлауд пријаву",
"SMB / CIFS using OC login" : "SMB / CIFS користећи Некстклауд пријаву",
"Username as share" : "Корисничко име као дељење",
"OpenStack Object Storage" : "OpenStack Object Storage",
"Service name" : "Назив услуге",
"Request timeout (seconds)" : "Време захтева истекло (секунде)",
"The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "cURL подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталиран. Монтирање %s није могуће. Затражите од вашег администратора система да га инсталира.",
"No external storage configured" : "Нема подешеног спољашњег складишта",
"You can add external storages in the personal settings" : "Можете додати спољашња складишта у вашим личним подешавањима",
"Name" : "Назив",
Expand Down
4 changes: 2 additions & 2 deletions apps/files_external/l10n/sr.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Дели",
"Domain" : "Домен",
"SMB / CIFS using OC login" : "SMB / CIFS користећи оунКлауд пријаву",
"SMB / CIFS using OC login" : "SMB / CIFS користећи Некстклауд пријаву",
"Username as share" : "Корисничко име као дељење",
"OpenStack Object Storage" : "OpenStack Object Storage",
"Service name" : "Назив услуге",
"Request timeout (seconds)" : "Време захтева истекло (секунде)",
"The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "cURL подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "FTP подршка за PHP није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
"\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "„%s“ није инсталиран. Монтирање %s није могуће. Затражите од вашег администратора система да га инсталира.",
"No external storage configured" : "Нема подешеног спољашњег складишта",
"You can add external storages in the personal settings" : "Можете додати спољашња складишта у вашим личним подешавањима",
"Name" : "Назив",
Expand Down
Loading