Commit Graph

27470 Commits

Author SHA1 Message Date
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
Roeland Jago Douma c924b6740a Do not return unneeded info 2015-10-02 08:11:50 +02:00
Jenkins for ownCloud 3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Roeland Jago Douma c3e7d324c5 Extend share info
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.

This allows endpoints using this to actually show usefull information.

The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
2015-10-02 07:41:57 +02:00
Roeland Jago Douma 0d3009951f Made routes remote_shares only again
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.

* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
2015-10-02 07:40:53 +02:00
Roeland Jago Douma 7310c4166a Added '../remote_shares' endpoint
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
2015-10-02 07:40:04 +02:00
Roeland Jago Douma 4a62021141 Move OCS endpoint ../remote_share to ../pending_shares 2015-10-02 07:39:58 +02:00
VicDeo f891b91cf8 Merge pull request #19518 from owncloud/checkboxes-file-restore
Display checkboxes properly after file restore
2015-10-02 00:20:40 +03:00
Hendrik Leppelsack d4ce713749 display checkboxes properly after file restore 2015-10-01 22:54:36 +02:00
Bjoern Schiessle b940287ffa first copy to owner and then move to current user because the encryption
wrapper always expect to work on the owner storage
2015-10-01 17:09:17 +02:00
Vincent Petry b6114ba2b6 Reload versions list after revert 2015-10-01 17:06:24 +02:00
Thomas Müller b6591084a1 Merge pull request #19463 from owncloud/fix_18132
encryption: versions should always use the keys of the original file, no need to …
2015-10-01 16:56:28 +02:00
Robin Appelman 8ae4f5bf1a Merge pull request #17703 from owncloud/preview-better-cache-use
Better cache usage for previews
2015-10-01 16:24:29 +02:00
Thomas Müller b2dd5cb616 save excluded groups in json format - fixes #10983 2015-10-01 15:37:55 +02:00
Morris Jobke 7cbdd9b90b setting to skip migration tests by default
* if you install owncloud via package it is not
  possible to skip migration tests
* this also allows to disable migration tests for
  an instance by default
2015-10-01 14:23:25 +02:00
Jörn Friedrich Dreyer 1d617c4bf6 always return float, update doc 2015-10-01 13:45:49 +02:00
Vincent Petry 9e66653fb3 [IE8] Remove non-working ellipsis support
This prevents the name element to be too wide, which would cause users
to mistakenly click on it instead of the empty space when wanting to
focus on a file for the sidebar.

Also fixed the close button on the sidebar (make it appear)
2015-10-01 13:23:56 +02:00
Robin Appelman 1c3e28a73b Add tests 2015-10-01 13:17:22 +02:00
Robin Appelman dc49e76747 stricter check if thumbnail is cached 2015-10-01 13:14:47 +02:00
Robin Appelman 884e2fcd6e to much copy paste 2015-10-01 13:14:47 +02:00
Robin Appelman 9925ff33f1 use cache data we already have to check if a thumbnail of specific size is cached 2015-10-01 13:14:47 +02:00
Robin Appelman 52d4495793 use the fileinfo to check if we have a valid file 2015-10-01 13:14:47 +02:00
Robin Appelman f4d180ee5c allow passing the fileinfo to the preview manager 2015-10-01 13:14:47 +02:00
Vincent Petry 8a34c29b2c [IE8] Fix dangling Delete action when multiselect is enabled
For some reason we need to cancel out the table's top: 95px, but just
for the delete action and not the other ones... whatever, IE8...
2015-10-01 11:50:34 +02:00
Vincent Petry 64994facce Merge pull request #19132 from owncloud/sharing-removebogusexpirationdate
Repair step to remove bogus expiration dates from non-link shares
2015-10-01 10:38:21 +02:00
Bjoern Schiessle e7232a848b versions should always use the keys of the original file, no need to create new one 2015-10-01 10:10:19 +02:00
Joas Schilling 8f2600a0ea Also delete all shares before the test, so the count matches 2015-10-01 08:32:24 +02:00
Morris Jobke cc0812332c add more precise version to also repair git master instances 2015-10-01 08:27:12 +02:00
Vincent Petry 6e104bc933 Repair step to remove bogus expiration dates from non-link shares 2015-10-01 08:27:12 +02:00
Jenkins for ownCloud 50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Thomas Müller d6e3195b38 Merge pull request #19421 from owncloud/fix_19382
Do noy allow empty urls to be submitted in "add to your owncloud"
2015-09-30 22:17:18 +02:00
Thomas Müller ff75652cb7 Merge pull request #19299 from owncloud/fixgetRawPathInfo
Fix get raw path info, always return a string
2015-09-30 22:17:02 +02:00
Robin Appelman be8ad69d35 Merge pull request #19478 from owncloud/cache-found-l10n-per-app
cache found l10n per app and not globally
2015-09-30 19:08:42 +02:00
Robin Appelman 4c5b0316ba Merge pull request #19483 from owncloud/make-the-world-a-bit-less-static
[settings] make it less static
2015-09-30 19:07:13 +02:00
Thomas Müller 34909ec640 Merge pull request #19481 from owncloud/config-markupfixes
Markup fixes to Deleted Items section
2015-09-30 18:04:28 +02:00
Morris Jobke 1f385fba04 [settings] make it less static 2015-09-30 17:58:03 +02:00
Carla Schroder 4e1923816c Markup fixes to trash bin section 2015-09-30 08:50:32 -07:00
Vincent Petry 287fbdf77a [IE8] Fix file list checkboxes 2015-09-30 17:38:35 +02:00
Vincent Petry 509096ca15 [IE8] Make checkbox on login page look less out of place 2015-09-30 17:31:37 +02:00
Morris Jobke 73819c4f05 Fix l10n on master
* $app isn't useful for this case
* kill it with 🔥
2015-09-30 17:29:54 +02:00