summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-0748-15/+95
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-074-0/+8
| * rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ...Thomas Mueller2013-01-062-5/+17
| * Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
| * Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-041-1/+1
| |\
| | * Remove the WIP external sharing apiTom Needham2012-12-314-84/+0
| | * Merge branch 'master' into ocs_apiTom Needham2012-12-31100-202/+704
| | |\
| | * | check if adminFrank Karlitschek2012-12-294-1/+10
| | * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-291-0/+2
| | * | Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-291-1/+1
| | * | prevent keyboardshortcuts from catching events outside the main doc - e.g. th...Thomas Mueller2012-12-291-0/+3
| | * | Merge branch 'master' into ocs_apiTom Needham2012-12-1618-28/+45
| | |\ \
| | * \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-14248-1940/+3296
| | |\ \ \
| | * | | | External Share API: Move url down one level in responseTom Needham2012-10-313-2/+15
| | * | | | Fix url generated for public shared filesTom Needham2012-10-281-2/+2
| | * | | | Merge master into ocs_apiTom Needham2012-10-28264-1195/+3585
| | |\ \ \ \
| | * | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-283-1/+72
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0542-0/+58
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-042-1/+3
* | | | | | | Remove unnecessary length parameter from last commitMichael Gapczynski2013-01-031-3/+3
* | | | | | | Update old storage classes names to the new namespace during mountingMichael Gapczynski2013-01-031-0/+12
* | | | | | | Don't mount shared storage unless there are shared filesMichael Gapczynski2013-01-031-2/+4
* | | | | | | merge master into filesystemRobin Appelman2013-01-0357-57/+511
|\| | | | | |
| * | | | | | 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
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-035-0/+65
| * | | | | | | 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
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-021-1/+2
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-013-4/+9
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3114-27/+206
| * | | | | | 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-307-7/+49
| |/ / / / / /
| * / / / / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-295-1/+40
| |/ / / / /
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2814-7/+89
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-275-1/+21
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-263-1/+18
* | | | | | 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
* | | | | | Actually add Shared_WatcherMichael Gapczynski2013-01-011-0/+51
* | | | | | Remove Shared_Scanner and add Shared_Watcher insteadMichael Gapczynski2013-01-013-74/+5
* | | | | | Share: fix cache put functionRobin Appelman2013-01-011-1/+1
* | | | | | Share: small phpdoc fixesRobin Appelman2013-01-011-4/+4
* | | | | | Fix Shared root problems with Watcher and Quota proxyMichael Gapczynski2013-01-012-0/+16