mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,664 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

16664 Commits

Author SHA1 Message Date
Joas Schilling efbca04ab4 Use command -v to check for sendmail 
Fix #7559
 2014-03-12 11:47:21 +01:00
Vincent Petry ce790119ae Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions 
set content-type on ocs exceptions
 2014-03-12 10:19:40 +01:00
Thomas Müller 88f6dd7db1 fixing method names 2014-03-12 10:00:22 +01:00
Lukas Reschke 942d5fcff3 Merge pull request #7682 from owncloud/sanitize-fallbackid-master 
sanitize fallbackId
 2014-03-12 09:22:46 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller 743addd1e3 set content-type on ocs exceptions 2014-03-12 00:35:19 +01:00
Thomas Müller 7c78368e8b sanitize fallbackId 2014-03-12 00:18:51 +01:00
Thomas Müller ae13ff112f remove Sabre_DAV_Browser_Plugin 2014-03-12 00:10:16 +01:00
Thomas Müller 364e1f852f Merge pull request #7674 from owncloud/fix-spelling-master 
Authentification -> Authentication
 2014-03-11 17:14:10 +01:00
Björn Schießle 03f40116e1 Merge pull request #7665 from owncloud/fix_ocs_share_api_paths 
Fix ocs share api paths
 2014-03-11 16:55:52 +01:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Thomas Müller c0b567dbec Fix 3rdparty submodule after transifex sync broke it 2014-03-11 15:40:14 +01:00
Francesco Piraneo G. 3f4a0778c8 Update index.php 
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
 2014-03-11 14:29:26 +01:00
Georg Ehrke 9a5c2d0080 add preDelete hook for files_versions app 2014-03-11 14:17:08 +01:00
Georg Ehrke 0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Bjoern Schiessle a09df0083e add 'received_from' info to the share, so that every share can have a different value 2014-03-11 12:59:37 +01:00
Bjoern Schiessle 36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Vincent Petry c1cb9ee9b0 Merge pull request #7650 from owncloud/quota-totalspace 
Fixed total space display when data size exceeds quota
 2014-03-11 12:40:59 +01:00
Vincent Petry a53df71b4a Merge pull request #7652 from owncloud/localStorage_remove 
Add OC.localStorage.removeItem()
 2014-03-11 12:40:14 +01:00
Vincent Petry 0e4d522dd9 Merge pull request #7659 from owncloud/fix-7596 
Fix 7596
 2014-03-11 11:36:22 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Thomas Müller 26ec311cff Changing host after transifex client update on server 2014-03-10 23:24:24 +01:00
Thomas Müller 0de43f1fbe 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-10 21:56:37 +01:00
Thomas Müller f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Vincent Petry 1cde17d60b Merge pull request #7602 from owncloud/flush-updater-cache 
Reset time of last update feed polling after successful update
 2014-03-10 19:54:00 +01:00
Lukas Reschke 58b18de90d Merge pull request #7656 from owncloud/xml-entityfixes 
Disable XML entities when parsing XML
 2014-03-10 19:52:04 +01:00
Vincent Petry 010eef95c0 Fixed total space display when data size exceeds quota 
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
 2014-03-10 17:59:14 +01:00
Vincent Petry f4f61f03c9 Disable XML entities when parsing XML 2014-03-10 17:51:13 +01:00
Thomas Tanghus 5e6f0dcc6d Fix copy/paste error 2014-03-10 16:26:07 +01:00
Thomas Tanghus 01bcdf5b53 Add function remove() to OC.localeStorage 2014-03-10 16:22:52 +01:00
Vincent Petry 23eeb898a9 Merge pull request #7600 from ideaship/fix_escaped_html 
fix: use print_escaped for radio button "checked"
 2014-03-10 16:12:39 +01:00
Thomas Müller 9fb9684da7 Merge pull request #7646 from owncloud/fix_ocs_api_unshare 
we need the file_source to delete a share successfully
 2014-03-10 16:06:17 +01:00
Vincent Petry 4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db 
[trash] fall back if file is not in db
 2014-03-10 16:04:47 +01:00
Bjoern Schiessle 5ddabd7cd0 fix mimetype detection, introduce fake etag to identify preview images 2014-03-10 15:13:28 +01:00
Bjoern Schiessle 4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Bjoern Schiessle abad625cac only enable previews if the encryption is disabled 2014-03-10 15:13:28 +01:00
Bjoern Schiessle eab844e226 if file is not in db, fall back to restore file to the users root 2014-03-10 15:13:28 +01:00
Thomas Müller 3c5185edab Merge pull request #7632 from owncloud/fix-7582-master 
we first shall check if the current session is valid - otherwise the ses...
 2014-03-10 15:10:19 +01:00
Robin Appelman 4a2b16d76d update copyright header 2014-03-10 14:40:05 +01:00
Robin Appelman 26793e1f94 switch OC::getRouter usages to OC::$server->getRouter 2014-03-10 14:06:47 +01:00
Robin Appelman 8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry 0ffd32a1ae Merge pull request #7629 from owncloud/files-allfileswarningtypo 
Fixed log warning when deleting a single file
 2014-03-10 11:40:28 +01:00
Bjoern Schiessle 9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Vincent Petry 92df8deb0a Merge pull request #7631 from ichEben/master 
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
 2014-03-10 10:04:54 +01:00
Vincent Petry 26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix 
[master] Fixed used space to be based on unencrypted size
 2014-03-10 09:38:24 +01:00
Thomas Tanghus 212699e389 Merge pull request #7628 from owncloud/fileinfo-type 
Fix FileInfo->getType errors
 2014-03-09 23:34:01 +01:00
Jan-Christoph Borchardt 9a31e53313 Merge pull request #7567 from owncloud/apps-scroll-settings 
restrict height of settings and make scrollable
 2014-03-09 01:22:51 +01:00
Thomas Müller 25f523680a fixing ident 2014-03-07 20:06:06 +01:00
Thomas Müller 0d90b90d94 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:00:34 +01:00
IchEben e7d5715114 only initialise upload dropZone if public upload is allowed 2014-03-07 17:45:24 +01:00