wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30741 commits 157 branches 562 tags 714 MiB
Commit graph

30741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
6526c122af Merge pull request #22683 from owncloud/fix_22682 
Relax rootfolder check
 2016-02-29 08:53:58 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Thomas Müller
3e8e0049b4 Merge pull request #22673 from owncloud/fix_enforced_expire_date_setting 
Expiration date can only be enforced if default is enabled
 2016-02-29 07:08:57 +01:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Roeland Jago Douma
b116e80c56 Relax rootfolder check 
* Updated unit tests
* Added intergration test
 2016-02-26 16:05:32 +01:00
Thomas Müller
5fa6d3ea58 Merge pull request #22669 from owncloud/fix-email-form 
Fix email form on personal page
 2016-02-26 14:05:29 +01:00
Roeland Jago Douma
bfcdf40a64 Expiration date can only be enforced if default is enabled 
If the default expiration date is not enebaled it can not be enforced.

* Added unit tests
 2016-02-26 11:38:06 +01:00
Thomas Müller
62d7885c3b Merge pull request #22660 from owncloud/fix_22656 
Do not allow sharing of the users root folder
 2016-02-26 10:49:12 +01:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670 
Move the tag filter at the end for now
 2016-02-26 10:48:55 +01:00
Thomas Müller
0795cc373d Merge pull request #22646 from owncloud/fix_22642 
Set default expiration date if none given on share creation
 2016-02-26 10:48:21 +01:00
Thomas Müller
66536f912e Merge pull request #22640 from owncloud/fix_22587 
Remove delete permissions for read-only federated reshares
 2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags 
Rename system tags app to collaborative tags
 2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773 
Allow theming of actions
 2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Thomas Müller
cbde4bb92f Merge pull request #22650 from owncloud/fix_hook 
Fix verifyExpirationDate passwordSet argument
 2016-02-26 09:32:41 +01:00
Joas Schilling
d03c537a26 Email endpoint is controlled by the username setting, not password 2016-02-26 09:28:18 +01:00
Joas Schilling
9a7cb02981 Correctly indent uneditable email/display name fields 2016-02-26 09:27:41 +01:00
Joas Schilling
4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry
867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7 Make more action icons themable + style fixes 
Action icons now appear properly in public link page.
More actions are now CSS icons.
 2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Thomas Müller
cb41b1a863 Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 
Before installing new shipped apps we need to load authentication apps
 2016-02-25 21:43:32 +01:00
Thomas Müller
290f159a97 Merge pull request #22653 from owncloud/integration-tests-for-dav-csrf 
Add integration test for CSRF protection on DAV
 2016-02-25 21:42:20 +01:00
Thomas Müller
84ffc4fbc4 Merge pull request #22654 from owncloud/icon-fixes 
add download icon for image detail view, ref gallery issue 51
 2016-02-25 21:42:03 +01:00
Thomas Müller
f95277481f Merge pull request #22659 from owncloud/fix-formatting 
Fix formatting of response
 2016-02-25 21:41:48 +01:00
Thomas Müller
04c9abf4e5 Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rules 
Exclude ocs-provider from rewrite rule
 2016-02-25 21:41:29 +01:00
Roeland Jago Douma
8213d5df4f Do not allow sharing of the root folder 
Sharing of the users root folder should not be allowed as it is very
weird UX. Also many of our clients have no proper way of displaying
this.

Added unit test

Also added intergration tests to make sure we won't allow it in the
future.
 2016-02-25 20:40:30 +01:00
Lukas Reschke
8b8dcca6c5 Fix typo 2016-02-25 19:55:28 +01:00
Lukas Reschke
0e19c6a3a0 Fix formatting of response 
The elements are expected to be within a `service` array as per specification.
 2016-02-25 19:05:05 +01:00
Lukas Reschke
0a624c0f1e Exclude ocs-provider from rewrite rule 
Otherwise `localhost/ocs-provider/` cannot be accessed if mod_rewrite is install
ed. Only affects master.
 2016-02-25 18:47:09 +01:00
Lukas Reschke
5780ba611e Add integration test for CSRF protection on DAV 
This adds the integration tests for the CSRF protection on the DAV backend introduced with 9.0.

Fixes https://github.com/owncloud/core/issues/22598
 2016-02-25 17:54:27 +01:00
Jan-Christoph Borchardt
91b0c4325d add download icon for image detail view, ref gallery issue 51 2016-02-25 17:26:03 +01:00
Thomas Müller
3772a8acdb Merge pull request #22644 from owncloud/external-share-manager 
inject the correct external share manager into the storage
 2016-02-25 16:58:00 +01:00
Thomas Müller
776d91f3bc Merge pull request #21854 from owncloud/fix-share-hook-group-add 
Fix addUserToGroup hook of the share code
 2016-02-25 16:56:19 +01:00
Thomas Müller
29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob 
Skip users with no trashbin
 2016-02-25 16:55:36 +01:00
Thomas Müller
35423102af Merge pull request #22611 from owncloud/add-uid-on-hover 
Add the uid on hover for sharing autocomplete
 2016-02-25 16:55:17 +01:00
Roeland Jago Douma
9412f69104 Fix verifyExpirationDate passwordSet argument 
Password set should be false if the password is null.

Also updated the unit tests to tests this now.
 2016-02-25 15:39:02 +01:00
Robin Appelman
f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller
914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages 
Fix HTTPS support on external storages
 2016-02-25 14:36:00 +01:00
Thomas Müller
202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption 
Copy into local file
 2016-02-25 14:35:39 +01:00
Thomas Müller
5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault 
Disable sharing by default for external storage mounts
 2016-02-25 14:35:24 +01:00
Thomas Müller
dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname 
take the first result of that array, if present. Fixes 2nd display na…
 2016-02-25 14:35:06 +01:00
Thomas Müller
efc966698f Merge pull request #22579 from owncloud/fix_broken_unencrypted_size 
Heal unencrypted file sizes at download time (second approach)
 2016-02-25 14:34:48 +01:00
Roeland Jago Douma
6d4f80d680 Set default expiration date if none given on share creation 
When we create a share for the first time we should set the default
expiration date. If none is given.

Fixes #22642
 2016-02-25 14:21:46 +01:00
Morris Jobke
d64c20b191 Merge pull request #22639 from owncloud/dont-show-pcntl-warning 
Don't show PCNTL warning if --no-warnings is passed
 2016-02-25 12:54:48 +01:00
Roeland Jago Douma
0c9c7737b4 Remove delete permissions for read-only federated reshares 
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.

However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.

This PR removes the delete permissions if it is a shared storage.

Basically a quick hack.
Fixes #22587
 2016-02-25 12:19:38 +01:00
Vincent Petry
1add45ae6a Tweak tooltip style for recipients 2016-02-25 11:18:30 +01:00