upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
15810 commits 1033 branches 1221 tags 8.4 GiB
Commit graph

15810 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
027de54558 don't write file if opening a stream to encrypt the data fails 2014-03-28 15:00:27 +01:00
Jörn Friedrich Dreyer
24274acd6a don't block php session while download is in progress 2014-03-28 11:41:58 +01:00
Morris Jobke
5099caa55a Merge pull request #7901 from owncloud/fixed_position_ocdialogdim 
prevent dimmed ocdialog div from scrolling
 2014-03-28 02:43:08 +01:00
Vincent Petry
17e5c03a02 Fix swift touch operation 
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.

This fixes syncing, as the sync client needs to use touch to update the
object's mtime.

Backport of 2a08e35 from master
 2014-03-27 18:39:57 +01:00
Vincent Petry
a31b37e733 Fixed mtime reading from OpenStack API 
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.

Backport of fa00a18 from master
 2014-03-27 17:59:39 +01:00
Jörn Friedrich Dreyer
35e4784202 prevent dimmed ocdialog div from scrolling 2014-03-26 17:48:33 +01:00
Thomas Tanghus
f464620a65 Fix 'Undefined variable: message' in OCP\Util::logException 2014-03-25 18:07:07 +01:00
Arthur Schiwon
2d639b83ab add test for cloning and keeping configuration seperate 2014-03-21 18:03:05 +01:00
Arthur Schiwon
406747ab30 Use array_key_exists instead of isset, because the latter returns false if the assigned value is null 2014-03-21 18:02:59 +01:00
Arthur Schiwon
b41c1d7655 On clone create a new instance of the Configuration 
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
 2014-03-21 18:02:53 +01:00
Vincent Petry
b10b8a470b Fixed warning when browsing Shared folder 
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.

Backport of 022d76c from master
 2014-03-21 17:56:56 +01:00
Thomas Müller
23ffdcc314 Merge pull request #7840 from owncloud/fix/7839 
fixing wrong html close tags
 2014-03-21 12:54:55 +01:00
Vincent Petry
ffdbdf7496 Merge pull request #7834 from owncloud/stable6-quota-usequotaevenwhenfreespaceunknown 
[stable6] [backport] Still return quota value when free space is unknown
 2014-03-21 12:29:19 +01:00
Thomas Müller
df636371a7 fixing wrong html close tags 2014-03-21 12:15:02 +01:00
Robin McCorkell
ceff4dae61 Fix duplicate ipauniqueid 2014-03-21 11:30:00 +01:00
Robin McCorkell
540d4af8a7 Add FreeIPA UUID compatibility, fixes #7796 
Ability to use ipauniqueid for the UUID of a user
 2014-03-21 11:29:50 +01:00
Vincent Petry
bb995c53c5 Still return quota value when free space is unknown 
Fixed the quota storage wrapper to correctly return the quota value
when the free space is not known (which usually happens when the
disk_free_space function is disabled)

Backport of 66bc0f0 from master
 2014-03-21 10:25:43 +01:00
Vincent Petry
eacb4b3f3e Return unencrypted_size of folder when queried 
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
 2014-03-21 10:23:56 +01:00
Vincent Petry
a70b99ff62 Propagate unencrypted_size up to the file cache root 2014-03-21 10:23:48 +01:00
Vincent Petry
2c2fd5f3a0 Merge pull request #7819 from owncloud/stable6-datafolderexistence 
[stable6] [backport] Added .ocdata file to check for data folder validity
 2014-03-20 15:28:33 +01:00
Vincent Petry
288c40e2a6 Increase version to trigger upgrade related to .ocdata 2014-03-20 11:51:54 +01:00
Vincent Petry
d85d3a4493 Return 503 when a config/data dir error exists 
Backport of b619ff6 from master
 2014-03-20 11:51:14 +01:00
Vincent Petry
a1c0c5e1a2 Added .ocdata file to check for data folder validity 
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.

Backport of 3c46dcd from master
 2014-03-20 11:50:53 +01:00
Robin McCorkell
6ccc8173d3 Fix smb4php to work with home shares 
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
 2014-03-18 21:37:14 +01:00
Vincent Petry
2cb342c3b8 Display admin option for public upload with encryption enabled 
Now that public upload works with encryption, the admin option to toggle
it must be made visible.

Backport of b75ca9f from master
 2014-03-18 13:15:50 +01:00
Vincent Petry
58db31e61e Added warning for trusted_domains after CLI upgrade 
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.

Backport of 1a11682 from master
 2014-03-17 14:27:19 +01:00
Bjoern Schiessle
30cca2524f finally fix the paths for the OCS Share API 2014-03-13 20:28:08 +01:00
Vincent Petry
53ad7ebfea Merge pull request #7690 from owncloud/backport-7683-stable6 
Backport 7683 stable6
 2014-03-13 11:41:46 +01:00
Thomas Müller
bff2c20fce Merge pull request #7701 from owncloud/backport-7681-stable6 
remove Sabre_DAV_Browser_Plugin
 2014-03-13 09:42:28 +01:00
Thomas Müller
e4104e63d9 remove Sabre_DAV_Browser_Plugin 2014-03-12 23:56:28 +01:00
Vincent Petry
bc5145e267 Merge pull request #7698 from owncloud/backport_7631 
only enable drag&drop upload if public upload is allowed
 2014-03-12 23:51:45 +01:00
Vincent Petry
544495563f Merge pull request #7280 from owncloud/tune_legacy_cache_webdav_properties_prefixing_stable6 
Concatenate string in SQL instead of PHP, use doctrine to construct concat expression
 2014-03-12 18:55:11 +01:00
Bjoern Schiessle
112a277998 only enable drag&drop upload if public upload is allowed, backport of #7631 2014-03-12 17:50:26 +01:00
Thomas Müller
46657ad8a6 fixing method names 2014-03-12 15:40:54 +01:00
Thomas Müller
14b9eba428 set content-type on ocs exceptions 2014-03-12 15:40:54 +01:00
Frank Karlitschek
6a31fecca3 increase version number 2014-03-11 19:11:07 +01:00
Bjoern Schiessle
3ccbc25dba add 'received_from' info to the share, so that every share can have a different value 2014-03-11 17:16:04 +01:00
Bjoern Schiessle
c3c255b0ca fix path creation for re-shares, issue #7662 2014-03-11 17:15:56 +01:00
Thomas Müller
2e42b0555a Merge pull request #7672 from owncloud/backport-7659-stable6-2 
Backport 7659 stable6 2
 2014-03-11 16:26:28 +01:00
Thomas Müller
c1c6ce22e8 remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname 2014-03-11 14:41:36 +01:00
Thomas Müller
a3bc3bbf2d backport #7659 2014-03-11 14:40:51 +01:00
Victor Dubiniuk
37e19534f1 Reset time of last update feed polling 2014-03-11 15:36:08 +03:00
Morris Jobke
d290f44fc7 Merge pull request #7608 from owncloud/stable6-publicpagedownloadall 
[stable6] Fixed "select all" + download on public page
 2014-03-11 10:29:08 +01:00
Vincent Petry
4966d632ae Disable XML entities when parsing XML 2014-03-10 20:41:40 +01:00
Thomas Müller
a5871c1811 Merge pull request #7653 from owncloud/backport-7646-stable6 
we need the file_source to delete a share successfully
 2014-03-10 17:55:27 +01:00
Bjoern Schiessle
0f40acb9a8 we need the file_source to delete a share successfully 2014-03-10 16:44:58 +01:00
Thomas Müller
cf2af3ce4d Merge pull request #7633 from owncloud/fix-7582-stable6 
Fix 7582 stable6
 2014-03-10 15:10:07 +01:00
Thomas Müller
d54f314c93 fixing ident 2014-03-07 20:05:11 +01:00
Thomas Müller
ff078db8cb we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth 2014-03-07 20:03:51 +01:00
Björn Schießle
acc35849af Merge pull request #7586 from owncloud/dont_create_shared_folder_stable6 
[oc6] don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-07 10:31:08 +01:00