Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into filesystem | Robin Appelman | 2013-01-07 | 48 | -15/+95 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-07 | 4 | -0/+8 |
| * | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ... | Thomas Mueller | 2013-01-06 | 2 | -5/+17 |
| * | Files: prevent people from renaming files to '.' | Robin Appelman | 2013-01-05 | 2 | -2/+2 |
| * | Merge pull request #1053 from owncloud/ocs_api | Michael Gapczynski | 2013-01-04 | 1 | -1/+1 |
| |\ | |||||
| | * | Remove the WIP external sharing api | Tom Needham | 2012-12-31 | 4 | -84/+0 |
| | * | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 100 | -202/+704 |
| | |\ | |||||
| | * | | check if admin | Frank Karlitschek | 2012-12-29 | 4 | -1/+10 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-29 | 1 | -0/+2 |
| | * | | Change post_write hook to write to prevent creating a duplicate of the origin... | Michael Gapczynski | 2012-12-29 | 1 | -1/+1 |
| | * | | prevent keyboardshortcuts from catching events outside the main doc - e.g. th... | Thomas Mueller | 2012-12-29 | 1 | -0/+3 |
| | * | | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-16 | 18 | -28/+45 |
| | |\ \ | |||||
| | * \ \ | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 248 | -1940/+3296 |
| | |\ \ \ | |||||
| | * | | | | External Share API: Move url down one level in response | Tom Needham | 2012-10-31 | 3 | -2/+15 |
| | * | | | | Fix url generated for public shared files | Tom Needham | 2012-10-28 | 1 | -2/+2 |
| | * | | | | Merge master into ocs_api | Tom Needham | 2012-10-28 | 264 | -1195/+3585 |
| | |\ \ \ \ | |||||
| | * | | | | | Add API method for sharing a file, currently only via a link. | Tom Needham | 2012-10-28 | 3 | -1/+72 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-05 | 42 | -0/+58 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-04 | 2 | -1/+3 |
* | | | | | | | Remove unnecessary length parameter from last commit | Michael Gapczynski | 2013-01-03 | 1 | -3/+3 |
* | | | | | | | Update old storage classes names to the new namespace during mounting | Michael Gapczynski | 2013-01-03 | 1 | -0/+12 |
* | | | | | | | Don't mount shared storage unless there are shared files | Michael Gapczynski | 2013-01-03 | 1 | -2/+4 |
* | | | | | | | merge master into filesystem | Robin Appelman | 2013-01-03 | 57 | -57/+511 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #1063 from owncloud/translate_not_enough_space_available | Thomas Müller | 2013-01-03 | 1 | -5/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix error when wrong dir was specified | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| | * | | | | | | move $l to top | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | fixing undefined variable $l | Thomas Mueller | 2013-01-02 | 1 | -1/+3 |
| | * | | | | | | | also translate 'No file was uploaded. Unknown error' | Jörn Friedrich Dreyer | 2013-01-03 | 1 | -2/+2 |
| | |/ / / / / / | |||||
| | * | | | | | | add translation call for 'Not enough space available' upload error | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-03 | 5 | -0/+65 |
| * | | | | | | | Merge pull request #1041 from owncloud/fixing-856-master | Thomas Müller | 2013-01-02 | 2 | -5/+7 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | only show the max possible upload of 2GB on a 32 bit system. | Thomas Mueller | 2012-12-28 | 2 | -1/+6 |
| | * | | | | | | Revert "fixed max possible upload size for files app in admin screen" | Thomas Mueller | 2012-12-28 | 1 | -4/+1 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-02 | 1 | -1/+2 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-01 | 3 | -4/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-31 | 14 | -27/+206 |
| * | | | | | | Merge pull request #1043 from owncloud/fix_breadcrumb_slashes | Lukas Reschke | 2012-12-30 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Replace %2F with / in breadcrumbs | Michael Gapczynski | 2012-12-28 | 1 | -2/+3 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-30 | 7 | -7/+49 |
| |/ / / / / / | |||||
| * / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-29 | 5 | -1/+40 |
| |/ / / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-28 | 14 | -7/+89 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-27 | 5 | -1/+21 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-26 | 3 | -1/+18 |
* | | | | | | Use the source Scanner for shared storage when the path is specified | Michael Gapczynski | 2013-01-01 | 1 | -3/+13 |
* | | | | | | Initialize storageId variable in shared cache | Michael Gapczynski | 2013-01-01 | 1 | -0/+1 |
* | | | | | | Actually add Shared_Watcher | Michael Gapczynski | 2013-01-01 | 1 | -0/+51 |
* | | | | | | Remove Shared_Scanner and add Shared_Watcher instead | Michael Gapczynski | 2013-01-01 | 3 | -74/+5 |
* | | | | | | Share: fix cache put function | Robin Appelman | 2013-01-01 | 1 | -1/+1 |
* | | | | | | Share: small phpdoc fixes | Robin Appelman | 2013-01-01 | 1 | -4/+4 |
* | | | | | | Fix Shared root problems with Watcher and Quota proxy | Michael Gapczynski | 2013-01-01 | 2 | -0/+16 |