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

8298 Commits

Author SHA1 Message Date
Michael Gapczynski f144be8857 Don't mount shared storage unless there are shared files 2013-01-03 11:37:19 -05:00
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Thomas Müller b673748151 Merge pull request #1063 from owncloud/translate_not_enough_space_available 
add translation call for 'Not enough space available' upload error
 2013-01-03 06:46:36 -08:00
Jörn Friedrich Dreyer fc64e8ec58 fix error when wrong dir was specified 2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer f19787f84c move $l to top 2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer ea732e5b29 also translate 'No file was uploaded. Unknown error' 2013-01-03 11:57:17 +01:00
Robin Appelman 6a6d6756b7 Cache: rename index to prevent colissions with old fscache indexes 2013-01-03 00:29:10 +01:00
Thomas Mueller 34e5cb5070 fixing indent 2013-01-03 00:13:30 +01:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Müller e0e7c98100 Merge pull request #1041 from owncloud/fixing-856-master 
Fixing #856 master
 2013-01-02 14:58:54 -08:00
Thomas Müller 9dc5ea172e Merge pull request #975 from irgsmirx/patch-1 
Update lib/util.php
 2013-01-02 14:01:38 -08:00
Thomas Mueller 3ea9432d43 fixing undefined variable $l 2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer 0405edc798 add translation call for 'Not enough space available' upload error 2013-01-02 21:00:50 +01:00
Michael Gapczynski a068ddff64 Use the sub storage's permission cache for retrieving the correct permission 2013-01-02 14:40:06 -05:00
Jörn Friedrich Dreyer 8240717309 Merge pull request #1062 from owncloud/fix-1048-master 
add smtp port configuration option
 2013-01-02 10:48:58 -08:00
Thomas Mueller 1727b2e84d add smtp port configuration option 2013-01-02 19:04:08 +01:00
Jörn Friedrich Dreyer 166da88b73 Merge pull request #945 from owncloud/fix_app_management_in_ie8 
since @tanghus and @DeepDiver1975 gave me their 👍 I'll merge this now: Fix app management in ie8
 2013-01-02 08:17:28 -08:00
Robin Appelman 54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +01:00
Jörn Friedrich Dreyer 5b07e722cb combine ie8 fix with debug check 2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer ed06070741 omit type attribute in script tag to use fallback (text/javascript) 2013-01-02 12:13:07 +01:00
Jörn Friedrich Dreyer e998da06d1 fix broken console.log in ie8 2013-01-02 12:13:07 +01:00
Jenkins for ownCloud 516464ba94 [tx-robot] updated from transifex 2013-01-02 00:05:14 +01:00
Michael Gapczynski a1f7c28e28 Use the source Scanner for shared storage when the path is specified 2013-01-01 14:47:25 -05:00
Michael Gapczynski fe90130618 Initialize storageId variable in shared cache 2013-01-01 14:24:18 -05:00
Robin Appelman a164fd160f Cache: provide path hints to getCache/etc where available 2013-01-01 20:20:20 +01:00
Robin Appelman 04f83e3b53 Cache: optional path argument for getCache/Scanner/etc 2013-01-01 20:20:20 +01:00
Michael Gapczynski 268c7acfc4 Actually add Shared_Watcher 2013-01-01 13:16:42 -05:00
Michael Gapczynski 3b67613afc Remove Shared_Scanner and add Shared_Watcher instead 2013-01-01 12:43:38 -05:00
Michael Gapczynski f4e4a06826 Forgot to select storage from filecache 2013-01-01 12:17:54 -05:00
Robin Appelman 0ac78a6411 Share: fix cache put function 2013-01-01 18:10:38 +01:00
Robin Appelman 4b65dd608a Share: small phpdoc fixes 2013-01-01 18:07:10 +01:00
Robin Appelman b41189de44 Cache: allow storage backends to overwrite Watcher 2013-01-01 18:04:29 +01:00
Michael Gapczynski f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Jenkins for ownCloud c6064a542c [tx-robot] updated from transifex 2013-01-01 00:04:42 +01:00
Michael Gapczynski 3ee3323b87 Fix retrieving of cache and scanner in Updater class 2012-12-30 20:27:38 -05:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Lukas Reschke f70f9f3bc4 Merge pull request #1043 from owncloud/fix_breadcrumb_slashes 
Replace %2F with / in breadcrumbs
 2012-12-30 08:56:32 -08:00
Jenkins for ownCloud 66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Michael Gapczynski d275725e23 No longer need to create folders locally for external storage mount points 2012-12-29 13:43:44 -05:00
Michael Gapczynski cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski fb053f8e73 Fix retrieving of shared source paths 2012-12-29 11:09:57 -05:00
Thomas Müller 36da34e5f6 Merge pull request #902 from owncloud/storage-wording 
Storage wording
 2012-12-28 23:19:52 -08:00
Michael Gapczynski b5b48428ab Replace %2F with / in breadcrumbs 2012-12-28 19:41:37 -05:00
Michael Gapczynski f922f836ce Change old variable name $default_quota to $defaultQuota 2012-12-28 19:14:33 -05:00
Jenkins for ownCloud 9aefbea074 [tx-robot] updated from transifex 2012-12-29 00:08:28 +01:00
Thomas Mueller a3206b4e97 only show the max possible upload of 2GB on a 32 bit system. 
for a 64 bit system we have no such limitation
refs #856

Conflicts:
	apps/files/templates/admin.php
 2012-12-28 22:17:38 +01:00
Thomas Mueller 7b72424a39 Revert "fixed max possible upload size for files app in admin screen" 
This reverts commit 7f2208b9a1.

Conflicts:
	apps/files/admin.php
 2012-12-28 22:14:32 +01:00
Michael Gapczynski 8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Jenkins for ownCloud e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Michael Gapczynski b035626709 Retrieve storage correctly, filename is not the mountpoint 2012-12-27 16:53:32 -05:00