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

7008 commits

Author SHA1 Message Date
Vincent Petry
c62cce8269 Moved default isReadable/isUpdatable impl into Common class 
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
 2013-11-22 18:21:17 +01:00
Vincent Petry
a49e873d3f Return plausible isReadable() default impl for ext storage 
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.

This fix makes the default impl of isReadable() use file_exists().

Fixes #5940
 2013-11-22 18:21:17 +01:00
Bjoern Schiessle
acf74b24f2 remove unused variable 2013-11-22 16:10:30 +01:00
Thomas Müller
c67b8f2b22 fixed documentation 2013-11-22 14:58:36 +01:00
Arthur Schiwon
6fdce3b7e9 LDAP: user proxy must support canChangeAvatar too 2013-11-22 13:25:20 +01:00
Arthur Schiwon
54f0deff2a LDAP: get user photo from LDAP and set it as avatar if available 2013-11-22 13:25:20 +01:00
Jenkins for ownCloud
60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Vincent Petry
3b48d23478 Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix 
Fixed path normalization to prevent dot dirs
 2013-11-21 09:01:47 -08:00
Vincent Petry
476d8e6de0 Added unit test for root mount point validation 2013-11-21 17:26:13 +01:00
Vincent Petry
0b2c9b823c Prevent using root as mount point for external storage 
Fixes #5981
 2013-11-21 17:22:12 +01:00
Vincent Petry
39cbdca429 Fixed path normalization to prevent dot dirs 
Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir
(only in older versions)
 2013-11-21 16:07:01 +01:00
Jenkins for ownCloud
5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Bjoern Schiessle
6443e570c2 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 16:00:21 +01:00
Vincent Petry
d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome 
Quota storage wrapper is now used for all users in sharing mode
 2013-11-21 06:59:50 -08:00
Bjoern Schiessle
d2e6f7d979 check HTTP Referer to check if we come from public.php or from a internal page. 
Necessary to detect public access also if a user is logged in.
 2013-11-21 15:57:49 +01:00
Morris Jobke
3e1ade4397 Merge pull request #5988 from owncloud/files-mobilequickfix 
Added min width to files table
 2013-11-21 06:09:11 -08:00
Vincent Petry
14ad1ebf53 Added min width to files table 
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.

The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
 2013-11-21 14:45:24 +01:00
blizzz
a20c6049c3 Merge pull request #5979 from owncloud/fix5881 
LDAP Wizard: add objectclass for group detection in Zimbra
 2013-11-21 04:03:33 -08:00
Bjoern Schiessle
9d16353e09 disable trahs in files_sharing/public.php 2013-11-21 12:06:35 +01:00
Vincent Petry
356eef0739 Quota storage wrapper is now used for all users in sharing mode 
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
 2013-11-21 12:04:54 +01:00
Bjoern Schiessle
c9646ddc4c fix undefined index errors if public share view 2013-11-21 12:03:27 +01:00
Arthur Schiwon
dd5e1092c7 LDAP Wizard: add objectclass for group detection in Zimbra 2013-11-21 11:20:31 +01:00
Bjoern Schiessle
87f2696e6a Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 11:18:53 +01:00
Bjoern Schiessle
c7dc6dc2c2 fix getFileKey() call 2013-11-21 11:11:15 +01:00
Bjoern Schiessle
009bbef17e Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 10:34:25 +01:00
Bjoern Schiessle
16b484209c Merge branch 'master' into encryption_work_with_public_gallery 
Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
 2013-11-21 10:33:37 +01:00
Bjoern Schiessle
18c80e47b6 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-11-21 10:24:47 +01:00
Vincent Petry
391f267d38 Merge pull request #5897 from hkjolhede/master 
Fixed error-checking error in sftp.php
 2013-11-21 01:22:05 -08:00
Bjoern Schiessle
2b361ea085 better distinction between userID and keyId 2013-11-21 10:09:07 +01:00
Bjoern Schiessle
b27fc42e1f public upload now also works with encryption enabled 2013-11-21 00:23:38 +01:00
Bjoern Schiessle
318db64b2d adapt tests to the new code 2013-11-20 23:27:42 +01:00
Bjoern Schiessle
b9c18d16fe make sure that we always use the correct user id 2013-11-20 23:23:23 +01:00
Bjoern Schiessle
e11afd3066 fix some getShareKey() and getFileKey() calls 2013-11-20 22:44:23 +01:00
Vincent Petry
e26500045f Fixed move operation to pass the whole URL as expected 
The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.

Fixes #5942
 2013-11-20 18:59:02 +01:00
Bjoern Schiessle
c5cb4206f5 [wip] make encryption work with public gallery sharing 2013-11-20 18:10:56 +01:00
Vincent Petry
5de5c317c1 Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset 
Fix for extstorage + encryption where unencrypted size is not kept
 2013-11-20 09:04:37 -08:00
Vincent Petry
fe44024868 Fix for extstorage + encryption where unencrypted size is not kept 
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
 2013-11-20 16:22:55 +01:00
Arthur Schiwon
ce1318c9f1 LDAP Wizard: clear the cache on save so changes have immediate effect 2013-11-20 15:56:25 +01:00
Bjoern Schiessle
f3e2a63712 check if it is a cached file or a version to resolve the correct path to the file key 2013-11-20 12:34:23 +01:00
Bjoern Schiessle
0c24c7c420 only check if the key file exists to decide if it is an encrypted file or not. 
This solves problems with external storage which doesn't support fseek
 2013-11-20 11:02:22 +01:00
Arthur Schiwon
ff9ecc8a51 LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired. 2013-11-19 23:58:08 +01:00
Bjoern Schiessle
b823505bd1 make sure that the owners home is mounted correctly 2013-11-19 18:28:51 +01:00
Vincent Petry
5b6d1d79d0 Fixed SMB file deletion success detection 
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866
 2013-11-19 15:05:11 +01:00
Vincent Petry
8ab40f1959 Removing trailing dot in path that samba doesn't seem to like 
Fixes #5778
Added unit test for getId() and constructUrl()
 2013-11-19 15:05:11 +01:00
Vincent Petry
a7962faa56 Fixed delete action to show error message as notification 2013-11-19 15:05:11 +01:00
Bjoern Schiessle
c309067c81 use oc filesystem operations to calc the versions size. This makes sure that we can handle missing directories correctly 2013-11-19 12:23:14 +01:00
Morris Jobke
b55a66187c Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror 
SMB ignore connection errors when NetBIOS is disabled
 2013-11-18 15:23:11 -08:00
Jan-Christoph Borchardt
b51d405852 Merge pull request #5923 from owncloud/font-weight 
change bold 'deleted files' button to normal for less focus
 2013-11-18 08:39:46 -08:00
Jörn Friedrich Dreyer
5da2929180 fix filtering number like filenames in filelist 
forward port of 847ad6c40b
 2013-11-18 17:18:31 +01:00
Jan-Christoph Borchardt
f2d18867af change bold 'deleted files' button to normal for less focus 2013-11-18 15:06:38 +01:00
Vincent Petry
d306f5c4cf Merge pull request #5908 from owncloud/fix_errorpage_call 
[encryption] fix redirectToErrorPage() call
 2013-11-18 05:17:28 -08:00
Vincent Petry
7e6f3817d0 SMB ignore connection errors when NetBIOS is disabled 
When NetBIOS is blocked or disabled, a smb::look() call can still get
the list of shares from smbclient, even though the name resolution at
the end of the command fails.

This fix makes it ignore the connection error if we already got the list
of shares.

Fixed #5860
 2013-11-18 12:31:55 +01:00
Bjoern Schiessle
82f30d37ca call error page with session as parameter 2013-11-17 13:23:07 +01:00
Jenkins for ownCloud
c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
hkjolhede
3e2d4c1bc1 Fixed error-checking error in sftp.php 2013-11-15 21:10:09 +01:00
Vincent Petry
68f278025c Merge pull request #5894 from owncloud/readd_sharing_token 
readd sharing token to public template
 2013-11-15 09:25:46 -08:00
blizzz
cb968c77d1 Merge pull request #5772 from owncloud/fix5741 
LDAP Wizard: introduce configuration status indicator, fixes #5741
 2013-11-15 08:52:41 -08:00
Björn Schießle
3ad546002f Merge pull request #5833 from owncloud/encryption_fixes 
[encryption] preserve timestamps and etags during encryption/decryption
 2013-11-15 08:47:22 -08:00
Vincent Petry
6355af162c Merge pull request #5880 from owncloud/replace_etmp_files 
write encryption tmp files to the cache folder
 2013-11-15 07:53:23 -08:00
Bjoern Schiessle
f36ee69855 tests added 2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer
11425d142d readd sharing token to public template 
necessary for https://github.com/owncloud/apps/pull/1476
 2013-11-15 16:27:41 +01:00
Vincent Petry
f9a64d2b27 Fix for smb4php fseek 
The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.

This patch fixes stream_fseek of smb4php to also respect this
convention.

Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
 2013-11-15 14:23:24 +01:00
Thomas Müller
1e863cd959 Merge pull request #5700 from owncloud/ldapWizSetDisplayNames 
LDAP Wizard: do not forget to set display name attributes for user and g...
 2013-11-15 01:12:54 -08:00
Thomas Müller
2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs 
Files singledotdirs
 2013-11-14 11:40:21 -08:00
Arthur Schiwon
98c9334175 LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency 2013-11-14 18:29:18 +01:00
Bjoern Schiessle
faa08da944 instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list 2013-11-14 17:32:21 +01:00
Frank Karlitschek
29e9f2833d Merge pull request #5214 from owncloud/no_extra_slashes 
Don't double-slash filenames at the root.
 2013-11-14 07:53:51 -08:00
Vincent Petry
008c3b80d6 Files app backend now normalizes paths before rendering templates 
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"

Fixes #5848
 2013-11-14 13:24:05 +01:00
Bjoern Schiessle
2624a6cb32 remove debug output 2013-11-14 12:13:22 +01:00
Bjoern Schiessle
2df3763675 test encryptAll() and decryptAll() to make sure that mtime and etag stay the same 2013-11-14 12:11:21 +01:00
Frank Karlitschek
58ff8a8673 Merge pull request #5805 from owncloud/shared-storage-copy-folder 
Use View::copy and View::rename when copying or renaming files in the shared storage
 2013-11-13 10:17:37 -08:00
Arthur Schiwon
84a882c651 LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness 2013-11-13 19:07:28 +01:00
Arthur Schiwon
7a61dcadd2 LDAP Wizard: move status indicator in one line with back and continue buttons 2013-11-13 19:07:28 +01:00
Arthur Schiwon
4ee296051b LDAP Wizard: introduce configuration status indicator, fixes #5741 2013-11-13 19:07:28 +01:00
Frank Karlitschek
15c4e4ed09 Merge pull request #5806 from owncloud/styles-fix-external_storage 
Fix spacing issue for checkboxes, vertically center checkboxes on person...
 2013-11-13 07:43:59 -08:00
Morris Jobke
5aae550b11 Merge pull request #5809 from owncloud/fix5753 
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
 2013-11-13 06:52:07 -08:00
Morris Jobke
ac0e87b1cc Merge pull request #5831 from owncloud/files-charatissue 
Fixed total dirs/files message hiding condition
 2013-11-13 05:22:48 -08:00
Bjoern Schiessle
222fa88eec Merge branch 'master' into encryption_fixes 2013-11-13 12:11:12 +01:00
Vincent Petry
3fa651f2b1 Merge pull request #5447 from owncloud/fixing-5117-master 
No data corruption duriing parallel upload
 2013-11-13 02:59:34 -08:00
Vincent Petry
5bdfccfc47 Fixed total dirs/files message hiding condition 
Fixes #5829
 2013-11-13 10:53:16 +01:00
Bjoern Schiessle
dd0ebcede2 fixPartialFilePath() is now stripPartialFileExtension() 2013-11-12 18:48:31 +01:00
Bjoern Schiessle
77429c28fd rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does 2013-11-12 16:48:24 +01:00
Bjoern Schiessle
e2fb8d7128 only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry 2013-11-12 15:55:59 +01:00
Bjoern Schiessle
894856ce01 make sure that we keep the correct timestamp and etag after encryoption/decryption 2013-11-12 15:51:51 +01:00
Georg Ehrke
238e4bc3eb implement delete hooks in file versions lib 2013-11-12 14:06:32 +01:00
Georg Ehrke
90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke
feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Bjoern Schiessle
fcbb5d6cb3 missed some replacements... now tests should work 2013-11-12 11:17:34 +01:00
Bjoern Schiessle
9f10f15fd4 fixing tests for the new part file handling 2013-11-12 10:24:10 +01:00
Arthur Schiwon
550f2d0089 LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN 2013-11-11 19:27:38 +01:00
Arthur Schiwon
082357a670 LDAP Wizard: remove ugly whitespace where it should not be 2013-11-11 19:25:20 +01:00
Morris Jobke
913cde816f Fix spacing issue for checkboxes, vertically center checkboxes on personal page 2013-11-11 18:03:57 +01:00
Vincent Petry
80c8666d3a Deleting all files in trash now only sends a single flag 
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.

Also fixes some "empty trash" message issues.
 2013-11-11 17:58:33 +01:00
Robin Appelman
a2015ee065 Use View::copy and View::rename when copying or renaming files in the shared storage 2013-11-11 17:58:20 +01:00
Bjoern Schiessle
802213f7ec let encryption app detect transfer id in path and handle it correctly 2013-11-11 17:47:59 +01:00
Morris Jobke
808634ac00 Merge pull request #5804 from owncloud/files-selectionsummary 
Selection summary is now displayed properly
 2013-11-11 08:41:53 -08:00
Vincent Petry
e285e84e18 Selection summary is now displayed properly 
Fixes #5775
 2013-11-11 17:14:40 +01:00
Morris Jobke
43230f11f6 Merge pull request #5769 from owncloud/files-changedirjsevent 
Added JS event for when the user changes the directory
 2013-11-11 06:22:44 -08:00
Arthur Schiwon
da61c6ef72 LDAP Wizard: determine port without credentials. don't hide the port input field 2013-11-11 15:16:54 +01:00
Morris Jobke
55331479cd Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes 
Fixed watcher to also update the owner's folder sizes
 2013-11-11 06:16:51 -08:00
Arthur Schiwon
ea9f392f4e LDAP Wizard: improve check for Agent DN and Credentials 2013-11-11 13:36:28 +01:00
Jenkins for ownCloud
e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud
3428c03b80 [tx-robot] updated from transifex 2013-11-09 01:45:32 -05:00
Arthur Schiwon
58aad1096f LDAP Wizard: keep Base DN always visible 2013-11-08 17:48:29 +01:00
Vincent Petry
4998faf343 Added JS event for when the user changes the directory 
This enables apps to detect directory changes which might be caused by
the user using the browser back button.
 2013-11-08 13:16:28 +01:00
Vincent Petry
c16fbbf386 Increased upload error delay to 10 seconds 
Fixes #5662

Also made it use OC.Notification instead of directly access the
notification HTML element.
 2013-11-08 11:22:08 +01:00
Morris Jobke
3e916a9f1d Merge pull request #5737 from owncloud/files-totaldirsnotfoundfix 
Fixed totalDirs JS error
 2013-11-07 05:02:43 -08:00
blizzz
0b1749e581 Merge pull request #5682 from owncloud/fix5585 
LDAP: make buttons on Expert page work again, fixes #5585
 2013-11-07 03:34:49 -08:00
Vincent Petry
bdc75e497b Fixed totalDirs JS error 2013-11-07 10:11:18 +01:00
Jenkins for ownCloud
263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
Morris Jobke
a0ee6aef29 Merge pull request #5399 from frisco82/fixDownloadOverQuota 
Do not count the size of shared folder on total
 2013-11-06 13:59:27 -08:00
Arthur Schiwon
95a5ff63b8 LDAP: resolve namespace harakiri, fixes background job 2013-11-06 16:25:31 +01:00
Morris Jobke
1fa1cf46bd Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations 
Fixes for "max upload size" value showed in the UI
 2013-11-06 06:49:42 -08:00
Vincent Petry
5d698b72fc Fixed folder icon for home storage 
Fixes #5713
 2013-11-06 15:11:14 +01:00
Ramiro Aparicio
b49530f80b Do not count the size of shared folder on total 
Changed all array access to dot notation

Split comment in a second line
 2013-11-06 13:47:03 +01:00
Arthur Schiwon
8b3da23368 LDAP Wizard: l10ned Save button 2013-11-06 12:40:07 +01:00
Vincent Petry
31181e4348 Fixed storage stats to be based on current directory 
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.

This fix adds a "dir" argument to getstoragestats.php.
 2013-11-06 10:55:19 +01:00
Vincent Petry
5d9ab6e7ac Update quota value in client after scan and upload 
After uploading, the quota value wasn't refreshed.
This fix refreshes the quota value after files have been scanned or
uploaded.
 2013-11-06 10:15:05 +01:00
Vincent Petry
da126f1692 Fixed unit tests for files sharing watcher 2013-11-06 09:39:52 +01:00
VicDeo
3e5a5567eb Merge pull request #5692 from miicha/patch-2 
allow empty user-dn and password
 2013-11-05 12:19:27 -08:00
Vincent Petry
9f4fd0161e Added unit tests for shared files watcher 
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
  propagation
 2013-11-05 19:30:52 +01:00
Vincent Petry
eb6fc14f84 Removed unused method 2013-11-05 17:14:19 +01:00
Vincent Petry
e3868ba118 Fixed watcher to also update the owner's folder sizes 
Note that the root folder size is mandatory for quota calculation.
 2013-11-05 13:58:14 +01:00
Thomas Müller
a438abe2fe Merge pull request #5699 from owncloud/fixing-4606-master 
calling getstoragestats.php only if a user is logged in because this cal...
 2013-11-05 04:30:35 -08:00
Arthur Schiwon
fc040755c1 LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed 2013-11-05 13:19:32 +01:00
Thomas Müller
ad336c94dc Merge pull request #5695 from owncloud/fixing-dropbox-master 
fixing dropbox require path
 2013-11-05 04:15:20 -08:00
Thomas Müller
b869fb2a09 calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in 2013-11-05 12:18:25 +01:00
miicha
ef1183bf86 allows agent and password or neither agent nor password 
this contribution is MIT licensed
 2013-11-05 11:51:53 +01:00
Thomas Müller
b75c724cc4 fixing dropbox require path 2013-11-05 10:33:21 +01:00
Thomas Müller
3488202f67 Merge pull request #5582 from owncloud/files-previewcaching 
Append file etag to preview URLs
 2013-11-05 01:21:51 -08:00
Thomas Müller
d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master 
Scanner enhancments master
 2013-11-04 23:58:42 -08:00
miicha
5b9bdaadaa allow empty user-dn and password 
help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...
 2013-11-05 01:24:20 +01:00
Thomas Müller
a7cb16aab1 use === 2013-11-04 21:23:10 +01:00
Arthur Schiwon
3d6030b2ae LDAP: improve design and placement of Save button 2013-11-04 16:54:48 +01:00
Arthur Schiwon
17820fbef6 LDAP: make buttons on Expert page work again, fixes #5585 2013-11-04 16:48:40 +01:00
Andreas Fischer
26ecf2062c Merge pull request #5656 from owncloud/fix-wizard-typo 
Fix typo in LDAP wizard

* owncloud/fix-wizard-typo:
  Excpetion->Exception
 2013-11-04 09:39:19 +01:00
Jenkins for ownCloud
e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e [tx-robot] updated from transifex 2013-11-03 12:44:12 -05:00
VicDeo
4e9a23dffe Excpetion->Exception 2013-11-01 12:19:44 +03:00
Morris Jobke
be07e828ef Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode 
Corretly hide "no permissions" message in controls in viewer mode
 2013-10-31 08:08:04 -07:00
Jörn Friedrich Dreyer
adb5de4a88 prefer closest over parent 
closest will search up the tree
 2013-10-31 15:56:02 +01:00
Vincent Petry
35dd568f8f Added missing comma to make the next diff cleaner 2013-10-31 15:12:26 +01:00
Jörn Friedrich Dreyer
a4be1ebeb8 use data-file to retrieve filename 
forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163
trust me, I know what I'm doing
 2013-10-31 14:31:57 +01:00
Vincent Petry
1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode 
Fixes #5622
 2013-10-31 12:34:15 +01:00
VicDeo
257084444b Merge pull request #5628 from owncloud/files-fixsummary 
Fixed summary visibility check
 2013-10-30 12:11:01 -07:00
Vincent Petry
cdb3c74632 Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick 
Prevent closing the create dropdown when right clicking in Firefox
 2013-10-30 10:38:03 -07:00
Vincent Petry
19eeb618ff Prevent closing the create dropdown when right clicking in Firefox 
Firefox sends a click event on the document when right clicking which
makes pasting with right click into the field impossible.

Fixes #5498
 2013-10-30 17:55:41 +01:00
Jörn Friedrich Dreyer
fdaac99526 Merge pull request #5626 from owncloud/fix_search_in_shared_files 
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
 2013-10-30 09:02:39 -07:00
Vincent Petry
aeac3186ee Fixed summary visibility check 
Now using the integer values to check whether to show the summary parts
instead of trying to parse the html code.
 2013-10-30 16:14:08 +01:00
Vincent Petry
d21a5b45f3 Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmissing 
Fixed encryption migration when entry is missing in DB
 2013-10-30 07:49:49 -07:00
Jörn Friedrich Dreyer
68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Bjoern Schiessle
abbacbacb4 remove unused variable 2013-10-30 11:39:30 +01:00
Bjoern Schiessle
6e77fa46f2 if the database doesn't contain any information about the recovery mode than we assume that it is disabled 2013-10-30 11:28:36 +01:00
Vincent Petry
4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master 
Fixing l10n master
 2013-10-30 02:44:54 -07:00
Vincent Petry
de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master 
Fix file cache updater (backport to master of #5513)
 2013-10-30 02:31:08 -07:00
Jenkins for ownCloud
54ae799cd9 [tx-robot] updated from transifex 2013-10-30 03:33:25 -04:00
Thomas Müller
ffb0e14d7b replacing ownCloud by theme-able name or avoid it's usage 2013-10-29 23:29:16 +01:00
Bjoern Schiessle
e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Thomas Müller
2534c3bc78 Merge pull request #5606 from owncloud/files-uploaderrorparsingfix 
Added fix to correctly parse non-array error messages
 2013-10-29 09:23:19 -07:00
Morris Jobke
404e9c0053 fix style of public share page 2013-10-29 16:08:11 +01:00
Vincent Petry
71cf83b314 Added fix to correctly parse non-array error messages 
Some apps like the antivirus app return messages in a non-array format.
 2013-10-29 16:00:34 +01:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Thomas Müller
a90cefcea2 avoid usage of brand name 'ownCloud' 2013-10-28 21:42:48 +01:00
Vincent Petry
e41ea20ce4 Fixed clicking on the "Home" breadcrumb in the trash app 
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
 2013-10-28 20:24:06 +01:00
Thomas Müller
ffc3bc1914 Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift 
Reworking \OC\Files\Storage\Swift
 2013-10-29 13:49:24 -07:00
Christian Berendt
70276ca520 settings tags for optional parameters 2013-10-29 10:21:50 +01:00
Christian Berendt
235bf5269d extended parameter descriptions for Swift 2013-10-29 09:19:43 +01:00
Vincent Petry
efbd79198b Fixed preview URL + size while dragging an existing file 2013-10-28 15:41:52 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Jenkins for ownCloud
8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Andreas Fischer
eb2d66d1a0 Fix double not in newfile/newfolder language. 2013-10-27 11:53:14 +01:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Vincent Petry
e246e2b669 Fixed encryption migration when entry is missing in DB 
When resetting the DB and some users still have encrypted files, the
migration state isn't read properly becaue the migration entries are
missing. This causes the wrong file size to be returned.

This fix inserts the missing migration entry when this condition is met.

Fixes #5541
 2013-10-25 15:38:35 +02:00
Arthur Schiwon
81dbe7dab7 Port PR #5457 to master 2013-10-25 14:15:05 +02:00
Thomas Müller
f91a4c89ca adding storage_mtime handling to SharedCache 2013-10-25 12:39:21 +02:00
Donald Buczek
3fc232370e make sure the shared ldap connection is rebound to the configured user after being used for password checking. 2013-10-25 11:12:18 +02:00
Thomas Müller
5fd1f552a3 Merge pull request #5532 from owncloud/ldap_fixes 
Ldap fixes
 2013-10-24 23:24:39 -07:00
Arthur Schiwon
c48157e3b8 LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 2013-10-24 20:26:05 +02:00
Thomas Müller
222f1b8da2 Merge pull request #5494 from owncloud/fixing-3593-master 
introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
 2013-10-24 09:41:56 -07:00
Arthur Schiwon
7fa418c81a LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 2013-10-24 18:21:02 +02:00
Christian Berendt
dd82481f59 add configuration parameter to manually set the timeout of HTTP requests 2013-10-24 16:19:17 +02:00
Arthur Schiwon
20f46602bd LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521 2013-10-24 14:27:33 +02:00
Arthur Schiwon
6284e95e2b typo, fixes #5517 2013-10-24 14:16:58 +02:00
Thomas Müller
535bc7b664 Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename 
prevent user from creating or renaming sth. to an existing filename
 2013-10-23 13:45:27 -07:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Jörn Friedrich Dreyer
4991a7bd06 fix translations 2013-10-23 17:02:41 +02:00
Bjoern Schiessle
2221aa9ca4 run first getUsersItemShared() with the owner 2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43 update etags for user we haven't checked yet 2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946 keep a list of users we already checked to avoid loops 2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8 fix infinite loop while updating etags, fix for #4365 2013-10-23 16:33:28 +02:00
Markus Goetz
af58360434 files_encryption: Fix getFileSize() 
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009

Conflicts:
	apps/files_encryption/tests/util.php
 2013-10-23 16:28:43 +02:00
Thomas Müller
b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02:00
Arthur Schiwon
30c0f5dee6 LDAP Wizard: proper strings and translations for user and group count text 2013-10-23 12:20:13 +02:00
Jörn Friedrich Dreyer
3121dc8cb5 Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 
Conflicts:
	apps/files/js/filelist.js
 2013-10-23 12:02:06 +02:00
Arthur Schiwon
d78a80a689 merge master with resolved conflicts 2013-10-23 12:01:45 +02:00
Jörn Friedrich Dreyer
8ed73e5ced use a more descriptive error message when the user tries to create '/Shared' 2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer
a9735c8a6f cleanup array value assignment 2013-10-23 11:01:05 +02:00