summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary length parameter from last commitMichael Gapczynski2013-01-032-4/+4
* Update old storage classes names to the new namespace during mountingMichael Gapczynski2013-01-032-1/+16
* Don't mount shared storage unless there are shared filesMichael Gapczynski2013-01-031-2/+4
* merge master into filesystemRobin Appelman2013-01-03292-3056/+8206
|\
| * Merge pull request #1063 from owncloud/translate_not_enough_space_availableThomas Müller2013-01-031-5/+6
| |\
| | * fix error when wrong dir was specifiedJörn Friedrich Dreyer2013-01-031-2/+2
| | * move $l to topJörn Friedrich Dreyer2013-01-031-0/+1
| | |\
| | | * fixing undefined variable $lThomas Mueller2013-01-021-1/+3
| | * | also translate 'No file was uploaded. Unknown error'Jörn Friedrich Dreyer2013-01-031-2/+2
| | |/
| | * add translation call for 'Not enough space available' upload errorJörn Friedrich Dreyer2013-01-021-1/+1
| * | fixing indentThomas Mueller2013-01-031-94/+94
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0340-286/+2271
| * | Merge pull request #1041 from owncloud/fixing-856-masterThomas Müller2013-01-022-5/+7
| |\ \
| | * | only show the max possible upload of 2GB on a 32 bit system.Thomas Mueller2012-12-282-1/+6
| | * | Revert "fixed max possible upload size for files app in admin screen"Thomas Mueller2012-12-281-4/+1
| * | | Merge pull request #975 from irgsmirx/patch-1Thomas Müller2013-01-021-8/+21
| |\ \ \
| | * | | Update lib/util.phpirgsmirx2012-12-201-8/+21
| * | | | Merge pull request #1062 from owncloud/fix-1048-masterJörn Friedrich Dreyer2013-01-022-6/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | add smtp port configuration optionThomas Mueller2013-01-022-6/+11
| |/ / /
| * | | Merge pull request #945 from owncloud/fix_app_management_in_ie8Jörn Friedrich Dreyer2013-01-022-4/+4
| |\ \ \
| | * | | combine ie8 fix with debug checkJörn Friedrich Dreyer2013-01-021-10/+4
| | * | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| | * | | fix broken console.log in ie8Jörn Friedrich Dreyer2013-01-021-1/+7
| * | | | phpdoc fixes for public apiRobin Appelman2013-01-023-71/+71
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0224-37/+1778
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0124-375/+466
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3166-728/+1155
| * | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashesLukas Reschke2012-12-301-2/+3
| |\ \ \
| | * | | Replace %2F with / in breadcrumbsMichael Gapczynski2012-12-281-2/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-30144-1189/+1704
| * | | | Merge pull request #902 from owncloud/storage-wordingThomas Müller2012-12-283-18/+43
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change old variable name $default_quota to $defaultQuotaMichael Gapczynski2012-12-281-1/+1
| | * | | moving logic from template to the 'controller'Thomas Müller2012-12-212-13/+22
| | * | | remove unused codeThomas Müller2012-12-201-5/+0
| | * | | enable translations for quota sizes 'none' and 'default'Thomas Müller2012-12-202-7/+28
| | * | | dim Default Storage label color a bitJan-Christoph Borchardt2012-12-141-1/+1
| | * | | change storage space 'none' to 'Unlimited' and capitalize DefaultJan-Christoph Borchardt2012-12-141-3/+3
| | * | | change technical expression 'Quota' to simpler 'Storage'Jan-Christoph Borchardt2012-12-141-3/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2922-72/+117
| | |_|/ | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2848-420/+614
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2728-123/+174
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2622-111/+165
* | | | Cache: rename index to prevent colissions with old fscache indexesRobin Appelman2013-01-031-2/+2
* | | | Use the sub storage's permission cache for retrieving the correct permissionMichael Gapczynski2013-01-021-13/+15
* | | | Use the source Scanner for shared storage when the path is specifiedMichael Gapczynski2013-01-011-3/+13
* | | | Initialize storageId variable in shared cacheMichael Gapczynski2013-01-011-0/+1
* | | | Cache: provide path hints to getCache/etc where availableRobin Appelman2013-01-012-17/+17
* | | | Cache: optional path argument for getCache/Scanner/etcRobin Appelman2013-01-012-11/+12
* | | | Actually add Shared_WatcherMichael Gapczynski2013-01-011-0/+51
* | | | Remove Shared_Scanner and add Shared_Watcher insteadMichael Gapczynski2013-01-013-74/+5