Commit Graph

14885 Commits

Author SHA1 Message Date
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
Frank Karlitschek b9aec16037 ownCloud 6 beta 3 2013-11-06 23:07:26 +01: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
Vincent Petry f2eef69047 Merge pull request #5718 from owncloud/fixLdapBgJob
LDAP: resolve namespace harakiri, fixes background job
2013-11-06 08:58:29 -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 6b6a46589e Merge pull request #5717 from owncloud/files-foldericonforhomestorage
Fixed folder icon for home storage
2013-11-06 06:39:48 -08:00
Vincent Petry 5d698b72fc Fixed folder icon for home storage
Fixes #5713
2013-11-06 15:11:14 +01:00
Vincent Petry 6e47828b45 Merge pull request #5716 from owncloud/full-name
change 'Display Name' to more understandable 'Full Name', fix #5612
2013-11-06 05:25:13 -08:00
Jan-Christoph Borchardt d62b683c6a change 'Display Name' to more understandable 'Full Name', fix #5612 2013-11-06 14:20:43 +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
VicDeo 3e5a5567eb Merge pull request #5692 from miicha/patch-2
allow empty user-dn and password
2013-11-05 12:19:27 -08:00
blizzz 7c89309e26 Merge pull request #5691 from owncloud/switch-to-oc6-documentation
move to oc6 documentation
2013-11-05 08:22:26 -08:00
Andreas Fischer d428b0d980 Merge pull request #5696 from owncloud/fixing-5670-master
decode arguments as array

* owncloud/fixing-5670-master:
  decode arguments as array
2013-11-05 13:32:27 +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
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 08c8bf5a7b decode arguments as array 2013-11-05 10:30:18 +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 f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
Oc6 windows server mssql master
2013-11-05 00:41:11 -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 01f2b7eb3a move to oc6 documentation 2013-11-04 22:50:12 +01:00
Andreas Fischer 8274d9f91c Inherit lastInsertId() from Adapter. 2013-11-04 22:28:41 +01:00
Thomas Müller a7cb16aab1 use === 2013-11-04 21:23:10 +01:00
Thomas Müller b767bbcdda Merge pull request #5683 from owncloud/no-coverage-with-php-v53-master
adding environment variable to control coverage reporting
2013-11-04 10:24:40 -08:00
Thomas Müller 4025f39324 keep junit xml reports 2013-11-04 17:25:07 +01:00
Thomas Mueller 665b7571f4 adding test for binary file to test \OC_Helper::streamCopy() 2013-11-04 17:19:04 +01:00
Thomas Mueller 2e6f339886 ignore test files 2013-11-04 17:17:32 +01:00
Thomas Müller 99933b2ca3 adding environment variable to control coverage reporting 2013-11-04 17:04:54 +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
Thomas Müller c3898061a8 Merge pull request #5544 from owncloud/fixing-3593-2-master
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
Thomas Müller 0f266d0f62 set log level to DEBUG 2013-11-04 12:58:30 +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
Thomas Müller 7125bfba21 Merge pull request #5678 from owncloud/fix-api-documentation
Fix api documentation
2013-11-03 06:38:44 -08:00
Morris Jobke ba2dd3b37c Merge pull request #5671 from owncloud/fixing-5668-master
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-03 05:08:56 -08:00
Morris Jobke ef592981ea unify license headers for public API files 2013-11-03 13:51:39 +01:00
Morris Jobke d2a48d58ce fix "No page-level DocBlock" 2013-11-03 13:38:25 +01:00
Morris Jobke 2dcaa4ddbf Merge pull request #4961 from owncloud/unshare-over-delete
Use OCP\Share::unshare() instead of directly using OCP\Share::delete()
2013-11-03 04:07:42 -08:00