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

30924 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Douma
8c8ff0eae7 Merge pull request #22950 from owncloud/fixsharemountrecursion 
Fix share mounting recursion
 2016-03-08 19:28:09 +01:00
Vincent Petry
e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller
15833d9843 Merge pull request #22936 from owncloud/fix-group-share-migration-for-calendars-and-contacts 
Fix migration of group shared calendars and addressbooks
 2016-03-08 14:33:34 +01:00
Thomas Müller
20db92c71a Fix group sharing and sharing permissions - fixes #22932 2016-03-08 11:22:07 +01:00
Thomas Müller
c40cb975a8 Merge pull request #22814 from owncloud/delete-empty-file 
Delete empty file
 2016-03-08 11:02:34 +01:00
Thomas Müller
6acde90e2c Merge pull request #22800 from owncloud/fix-20536 
don't hide server not available exception, fixes #20536
 2016-03-08 09:58:26 +01:00
Thomas Müller
31c89bd3a2 Merge pull request #22885 from owncloud/master-show-version-to-update-to 
Show version to update to properly
 2016-03-08 09:41:52 +01:00
Thomas Müller
2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api 
Cleanup OCS Share Api
 2016-03-08 09:41:20 +01:00
Thomas Müller
21b6bd321d Merge pull request #22918 from owncloud/remove-double-encoding-in-name 
Remove double URL encoding
 2016-03-08 09:40:27 +01:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
Thomas Müller
9f0711004f Merge pull request #22921 from owncloud/add-before-command 
Initialize submodules for Scrutinizer as well
 2016-03-07 22:47:24 +01:00
Lukas Reschke
81cda800be Initialize submodules for Scrutinizer as well 
Scrutinizer otherwise complains about the fact that some classes are undefined etc.

Let's see whether that works 😄
 2016-03-07 20:52:58 +01:00
Lukas Reschke
1fd76b6379 Remove double URL encoding 
ZipStreamer as bundled with 9.0 will properly encode the filename already.

Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
 2016-03-07 19:29:15 +01:00
Thomas Müller
0487b541a0 Merge pull request #22880 from owncloud/fix-21656 
improve log output when no LDAP user was found on login attempt
 2016-03-07 17:12:01 +01:00
Thomas Müller
d43d95e0fd Merge pull request #22911 from owncloud/fix-failing-migration 
Handle calendar migration issue by writing the faulty event to the lo…
 2016-03-07 16:41:12 +01:00
Roeland Jago Douma
b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142 Move common code to function 
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
 2016-03-07 16:14:57 +01:00
Thomas Müller
19dc02b8e0 Merge pull request #22900 from owncloud/diskfreespace-filesworkaround 
Fix call to disk_free_space when a file is provided
 2016-03-07 15:07:31 +01:00
Thomas Müller
deca1979aa Calendar and addressbook migration commands are always available 2016-03-07 15:04:19 +01:00
Thomas Müller
3b25ccef65 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller
d32b35fc7f Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller
a61fa5b526 Merge pull request #22902 from owncloud/share-archivenamedownloadall 
Fix archive file name when downloading public share
 2016-03-07 14:47:35 +01:00
Thomas Müller
8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited 
Fix uploading to fed share when free space is unlimited
 2016-03-07 14:47:01 +01:00
Thomas Müller
4324d302bc Merge pull request #22872 from owncloud/password-change-tooltip-text 
Update error text for link passwords
 2016-03-07 14:46:27 +01:00
Thomas Müller
67a58d663d Merge pull request #22815 from prastut/feature-enhance-loginflow 
Trigger login if remember_login checked
 2016-03-07 14:46:08 +01:00
Thomas Müller
fa436b5b0c Merge pull request #22812 from owncloud/node-lock 
Add locking to the node api
 2016-03-07 14:43:49 +01:00
Thomas Müller
e5b5eca5a9 Merge pull request #22787 from owncloud/versions-fixmtimetooltip 
Fix tooltip for versions mtime
 2016-03-07 14:41:46 +01:00
Thomas Müller
46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401 
Return false on 401 in file list + trash file list
 2016-03-07 14:41:31 +01:00
Thomas Müller
bd4b61f52b Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint 
Correctly default to null and add type hint
 2016-03-07 13:50:53 +01:00
Thomas Müller
3b7a59f66b Merge pull request #22904 from owncloud/get-user-groups-should-return-an-array 
Make sure that the return value is an array
 2016-03-07 12:52:25 +01:00
Thomas Müller
296a46cc38 Merge pull request #22244 from owncloud/dont-update-shared-resource-properties 
For 9.0 we don't have the possibility to store calendar and addressbo…
 2016-03-07 12:42:52 +01:00
Joas Schilling
69d7097a1a Make sure that the return value is an array 2016-03-07 11:57:05 +01:00
Vincent Petry
dbea268332 Remove "files" arg from download URL in public link page 
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
 2016-03-07 11:55:55 +01:00
Vincent Petry
d8e592d670 Fix archive file name when downloading public share 
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
 2016-03-07 11:37:49 +01:00
Vincent Petry
89881ed511 Fix call to disk_free_space when a file is provided 
In the case of shared files, we have to call free_space() on the file
name. This has the side-effect that when uploading to a local storage
without quota set, it will call disk_free_space with the file name,
which fails.

This fix uses the parent folder in case the given path is a file.
 2016-03-07 11:01:24 +01:00
Joas Schilling
c99ae62c33 Correctly default to null and add type hint 2016-03-07 10:48:16 +01:00
Vincent Petry
60d8046c35 Fix uploading when free space is unlimited 
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
 2016-03-07 10:42:36 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
f2088cafb8 Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud 
Cache results of testRemoteUrl
 2016-03-06 20:00:47 +01:00
Thomas Müller
6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations 
ne, or_IN, uz and yo have been removed from transifex and will be rem…
 2016-03-06 19:59:57 +01:00
Thomas Müller
6f6d659f56 Merge pull request #22888 from owncloud/use-custom-header 
Use custom header
 2016-03-06 19:53:35 +01:00
Jenkins for ownCloud
05d0d9e9e2 [tx-robot] updated from transifex 2016-03-06 01:55:08 -05:00
Lukas Reschke
4301e30741 Use custom header 
PHP in CGI mode eats the Authorization header => 💣
 2016-03-05 23:04:49 +01:00
Lukas Reschke
4caa9e18b0 Show version to update to properly 
Properly shows the version that will be updated to.
 2016-03-05 21:58:58 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Arthur Schiwon
5d3183afcd improve log output when no LDAP user was found on login attempt 2016-03-05 00:18:34 +01:00
C. Montero Luque
b3656f1434 Merge pull request #22878 from owncloud/use-clob-for-timezone 
Use CLOB for timezone
 2016-03-04 18:00:48 -05:00
C. Montero Luque
fe86e0c2f8 Merge pull request #22870 from owncloud/autoenable-federation-app 
Automatically enable "federation" app
 2016-03-04 17:44:50 -05:00
Lukas Reschke
b302ec8381 Use CLOB for timezone 
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.

This changes it back to a CLOB as it has been before as well: 8d8bb68b01. I'm not super convinced that CLOB is the best choice here but at least it seems to work.

Fixes https://github.com/owncloud/core/issues/22876
 2016-03-04 21:59:08 +01:00
C. Montero Luque
4dda119137 Merge pull request #22865 from owncloud/fix-db-locking-cleanup 
Run cleanup of expired DB file locks to background job
 2016-03-04 15:43:08 -05:00