Commit Graph

27456 Commits

Author SHA1 Message Date
Lukas Reschke 94f2121980 Add notice about X-Forwarded-For 2015-10-05 09:10:07 +02:00
Jenkins for ownCloud bc593f7921 [tx-robot] updated from transifex 2015-10-05 01:54:55 -04:00
Jenkins for ownCloud 2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Thomas Müller 122141be92 Merge pull request #19543 from owncloud/fix-19542
Check if decoded JSON returned null
2015-10-03 12:20:33 +02:00
Thomas Müller 99d7352ef9 Merge pull request #19545 from owncloud/fix-16908
Add remark that $run is not supported anymore
2015-10-03 10:17:36 +02:00
Jenkins for ownCloud e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Lukas Reschke f6e055b2fd Add remark that $run is not supported anymore
Fixes https://github.com/owncloud/core/issues/16908
2015-10-02 23:19:26 +02:00
Lukas Reschke 8f4611e21d Check if decoded JSON returned null
The value might return null resulting in a PHP error.

Fixes https://github.com/owncloud/core/issues/19542
2015-10-02 21:56:20 +02:00
Thomas Müller 94013ffb82 Merge pull request #19534 from owncloud/fix_19532
if the mountpoint is accessible for all user the array should contain 'all'
2015-10-02 18:40:50 +02:00
Thomas Müller 60c776070e Merge pull request #19538 from owncloud/versions-lock
Lock files when rolling back version
2015-10-02 18:40:34 +02:00
Thomas Müller ff89824135 Merge pull request #19272 from owncloud/mimetypes-enhanced
Introduce a few new mimetypes for code, fix recursive mimetype aliases
2015-10-02 17:50:34 +02:00
Thomas Müller fee8486b7f Merge pull request #19536 from owncloud/share-focusonsharefield
Focus on share field after first display
2015-10-02 17:50:04 +02:00
Robin Appelman 943c5069d4 Lock files when rolling back version 2015-10-02 17:08:39 +02:00
Robin Appelman 8bdffb5ed3 Merge pull request #19525 from owncloud/share-preventmovemountpointintosharedfolder
Prevent moving mount point into already shared folder (outgoing)
2015-10-02 16:50:38 +02:00
Vincent Petry 1562da3691 Focus on share field after first display 2015-10-02 16:39:27 +02:00
Bjoern Schiessle 0ce28a574a if mountpoint is applicable to all users the old API expects a array with 'all' 2015-10-02 16:17:28 +02:00
Vincent Petry 64ca00925b Prevent moving mount point into already shared folder (outgoing)
It is already not allowed to share a folder containing mount points /
incoming shares.

This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
2015-10-02 16:14:42 +02:00
Roeland Jago Douma c80dd82fe4 Added mimetype repair step
* Version number increased
2015-10-02 16:06:56 +02:00
Roeland Jago Douma 57ceee13a9 Updated some mimetypes
* c++ and cpp now both map to code
2015-10-02 15:28:23 +02:00
Robin McCorkell aeb20675dd Allow recursive mimetype aliases
application/xml -> text/html -> text/code
2015-10-02 15:28:23 +02:00
Robin McCorkell cd7aff47e1 Introduce a few new mimetypes for code 2015-10-02 15:28:23 +02:00
Robin Appelman af01c04360 Merge pull request #19533 from owncloud/free-space-inf
Work around INF=0 on some shared hosts
2015-10-02 15:04:28 +02:00
Thomas Müller 54e19d7ca3 Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you
List remote shares in shared with you
2015-10-02 14:48:12 +02:00
Thomas Müller c64101ff6e Merge pull request #19482 from owncloud/kill-unused-method
[l10n] remove unused static methods
2015-10-02 14:21:08 +02:00
Robin Appelman a1d0d23b6a Work around INF=0 on some shared hosts 2015-10-02 14:16:13 +02:00
Thomas Müller 594a3e4e22 Merge pull request #19523 from owncloud/fix-seconds-ago
Fix moment.js "a few seconds ago" with "seconds ago"
2015-10-02 14:11:46 +02:00
Morris Jobke 6b53f7c40e [l10n] remove unused static methods 2015-10-02 12:51:45 +02:00
Roeland Jago Douma 4adc78b78b Fix and extend unit tests 2015-10-02 12:45:52 +02:00
Roeland Jago Douma 40dd2d9dbe More fileinfo 2015-10-02 12:45:52 +02:00
Roeland Jago Douma eeafccb3a6 Start to show remote shares in shared with you section 2015-10-02 12:45:47 +02:00
Thomas Müller 4fb2ef3bac Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke
[IE8] Fix dangling Delete action when multiselect is enabled
2015-10-02 12:16:31 +02:00
Thomas Müller 2912d0e3e3 Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert
Reload versions list after revert
2015-10-02 12:16:10 +02:00
Thomas Müller f9093688cc Merge pull request #19500 from owncloud/fix_trash_with_encryption2
[trashbin] fix broken versions on restore
2015-10-02 12:15:58 +02:00
Thomas Müller 3564a837d8 Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 12:15:44 +02:00
Thomas Müller d0f6bfe7b6 Merge pull request #19508 from owncloud/setting-to-skip-migration-tests
setting to skip migration tests by default
2015-10-02 12:15:23 +02:00
Thomas Müller 8944cb539e Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude
save excluded groups in json format
2015-10-02 12:14:36 +02:00
Thomas Müller ccbdcf0ab3 Merge pull request #19522 from owncloud/activity-395-less-sidebar-text
Activity 395 less sidebar text
2015-10-02 12:13:53 +02:00
Thomas Müller daf9a63d43 Merge pull request #19386 from owncloud/ocs_shareapi_extenstion
OCS endpoint to list remote shares
2015-10-02 12:13:36 +02:00
Morris Jobke 4b3a5a257f Fix moment.js "a few seconds ago" with "seconds ago"
* fixes #18627
2015-10-02 10:51:51 +02:00
Jörn Friedrich Dreyer aaabe356b5 Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-changing-memberships
Modify the group user count when changing membership of a user
2015-10-02 10:34:57 +02:00
Joas Schilling e478d925c3 Fix intendation 2015-10-02 10:01:33 +02:00
Joas Schilling 17ab8e6c39 Use shorter text on the sidebar for files_sharing activities 2015-10-02 10:01:33 +02:00
Vincent Petry 5dff9d88cb Make sure the conflict dialog is loaded before adding conflicts 2015-10-02 09:55:43 +02:00
Joas Schilling f3864c5444 Use shorter text on the sidebar for files activities 2015-10-02 09:54:07 +02:00
Joas Schilling 7707bbe648 Allow identifying whether the current item is the filtered one 2015-10-02 09:53:39 +02:00
Jörn Friedrich Dreyer 3dec30d0e0 Merge pull request #19484 from owncloud/ie8-checkbox-rage
[IE8] Fix checkboxes in login page and file list
2015-10-02 08:58:16 +02:00
Jörn Friedrich Dreyer bf4c3ce134 Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness
[IE8] Remove non-working ellipsis support
2015-10-02 08:57:51 +02:00
Jörn Friedrich Dreyer 3098fd0d30 Merge pull request #19505 from owncloud/returnfloatforquota
always return float, update doc
2015-10-02 08:57:04 +02:00
Jörn Friedrich Dreyer b18307aafb Merge pull request #19480 from owncloud/fix-l10n
Fix l10n on master
2015-10-02 08:56:33 +02:00
Joas Schilling 3ce45863ab Modify the group user count when changing membership of a user 2015-10-02 08:55:53 +02:00