Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-11 | 396 | -1387/+1421 |
| | |||||
* | Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload | Lukas Reschke | 2014-05-10 | 1 | -45/+61 |
|\ | | | | | polish jslint for files-upload.js | ||||
| * | polish jslint for files-upload.js | Jörn Friedrich Dreyer | 2014-05-09 | 1 | -45/+61 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 91 | -178/+15473 |
| | | |||||
* | | Merge pull request #7546 from owncloud/no_freaking_tag_dupes | Lukas Reschke | 2014-05-09 | 2 | -22/+33 |
|\ \ | | | | | | | Tags cleanup | ||||
| * | | Yet another cleanup | Thomas Tanghus | 2014-03-05 | 2 | -22/+33 |
| | | | |||||
* | | | Merge pull request #8496 from owncloud/fix-folder-icon | Jan-Christoph Borchardt | 2014-05-09 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | fix folder icon (file had a big background rectangle before) | ||||
| * | | | fix folder icon (file had a big background rectangle before) | Jan-Christoph Borchardt | 2014-05-07 | 1 | -5/+4 |
| | | | | |||||
* | | | | Merge pull request #8512 from owncloud/fix-memcached-hasKey | Andreas Fischer | 2014-05-09 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Be more strict in checking the resultCode of memcached hasKey function * owncloud/fix-memcached-hasKey: Memcached hasKey should test for success, the get can fail for other reasons. | ||||
| * | | | Memcached hasKey should test for success, the get can fail for other reasons. | Bart Visscher | 2014-05-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | One of the other failures is no running server. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-09 | 27 | -137/+186 |
| | | | | |||||
* | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfix | Vincent Petry | 2014-05-08 | 3 | -6/+65 |
|\ \ \ \ | |/ / / |/| | | | Fix sharing of ext storage mount points | ||||
| * | | | Fix getPathById for Oracle | Vincent Petry | 2014-05-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Added extra code to handle the case of Oracle which saves empty strings as null values. | ||||
| * | | | Added unit test for sharing ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -2/+55 |
| | | | | |||||
| * | | | Fix sharing of ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | When sharing an ext storage mount point, it will now use the name of the mount point instead of an empty string for the target path. | ||||
* | | | | Merge pull request #8493 from ↵ | Andreas Fischer | 2014-05-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/we-certainly-don't-want-type-juggling-on-that Use strict type comparison * owncloud/we-certainly-don't-want-type-juggling-on-that: Use strict type comparison | ||||
| * | | | | Use strict type comparison | Lukas Reschke | 2014-05-07 | 1 | -2/+2 |
| |/ / / | | | | | | | | | We certainly don't want to have type juggling on that. | ||||
* | | | | Merge pull request #8293 from owncloud/files_external_fix_readData | Vincent Petry | 2014-05-08 | 1 | -19/+18 |
|\ \ \ \ | | | | | | | | | | | Fix issue with personal mount points and sharing | ||||
| * | | | | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-04-21 | 1 | -19/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue existed where `readData` used `OCP\User::getUser()` to get the user for personal mount points, which worked in all situations apart from when a personal mount point was used for sharing, so the return from `getUser()` is not the user that owns the share. As such, any personal mount points would not work correctly when shared. `readData` and `writeData` have been changed from using a `$isPersonal` boolean to using a `$user` string|null. `$isPersonal = false` can now be written as `$user = NULL` (or left out in the case of `readData`), and `$isPersonal = true` can be written as `$user = OCP\User::getUser()`. | ||||
* | | | | | Merge pull request #8221 from owncloud/type-hinting-sharing | Vincent Petry | 2014-05-08 | 5 | -168/+179 |
|\ \ \ \ \ | | | | | | | | | | | | | Type hinting fixes for sharing | ||||
| * | | | | | Use 'boolean' as type instead of 'bool' | Bart Visscher | 2014-05-07 | 1 | -21/+21 |
| | | | | | | |||||
| * | | | | | Typo | Bart Visscher | 2014-05-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Correct return type for getFilePath | Bart Visscher | 2014-05-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Better documentation for isValidSource function | Bart Visscher | 2014-05-01 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Some more params are optional | Bart Visscher | 2014-05-01 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into type-hinting-sharing | Bart Visscher | 2014-04-28 | 1045 | -20063/+51293 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php | ||||
| * | | | | | | Fix PHPdoc in OC\Share\Share and OCP\Share | Bart Visscher | 2014-04-15 | 2 | -155/+158 |
| | | | | | | | |||||
| * | | | | | | Fix PHPdoc in apps/files_sharing | Bart Visscher | 2014-04-15 | 4 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-08 | 14 | -17/+20 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8497 from owncloud/sharing_cleanup | Björn Schießle | 2014-05-07 | 3 | -24/+9 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | [sharing] some small clean ups and bug fixes | ||||
| * | | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup | Bjoern Schiessle | 2014-05-07 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix endless loop on windows servers | Joas Schilling | 2014-05-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory seperator is \ on windows However we can just check for path != dirname(path) because that is the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS | ||||
| * | | | | | | | remove error_log output | Bjoern Schiessle | 2014-05-07 | 1 | -2/+1 |
| |/ / / / / / | |||||
| * / / / / / | we can take the permission directly from the share, no need to call the ↵ | Bjoern Schiessle | 2014-05-07 | 1 | -20/+6 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | share api first | ||||
* | | | | | | Merge pull request #8488 from owncloud/sabre-notfoundloglevel | Lukas Reschke | 2014-05-07 | 2 | -6/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Some expected Sabre exceptions are now logged with DEBUG level | ||||
| * | | | | | | Some expected Sabre exceptions are now logged with DEBUG level | Vincent Petry | 2014-05-07 | 2 | -6/+20 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8223 from owncloud/fix_linkToPublic | Vincent Petry | 2014-05-07 | 3 | -5/+231 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix linkToPublic and linkToAbsolute. | ||||
| * | | | | | | | Remove unused var | Thomas Tanghus | 2014-04-16 | 1 | -5/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase | Thomas Tanghus | 2014-04-16 | 2 | -0/+223 |
| | | | | | | | | |||||
| * | | | | | | | Also fix linkToAbsolute | Thomas Tanghus | 2014-04-16 | 1 | -3/+7 |
| | | | | | | | | |||||
| * | | | | | | | Fix linkToPublic. Refs #8218 | Thomas Tanghus | 2014-04-15 | 1 | -2/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #8489 from owncloud/share_updater_ignore_part_files | Vincent Petry | 2014-05-07 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [sharing] share updater ignore part files | ||||
| * | | | | | | | | check if we have a fileinfo | Bjoern Schiessle | 2014-05-07 | 1 | -1/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | ignore part files | Bjoern Schiessle | 2014-05-07 | 1 | -0/+6 |
|/ / / / / / / / | |||||
* | | | | | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-07 | 55 | -225/+341 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri | Vincent Petry | 2014-05-06 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Send URI instead of filepath to NGINX for X-Accel | ||||
| * | | | | | | | Send URI instead of filepath to NGINX for X-Accel | josh4trunks | 2014-04-03 | 1 | -1/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #8466 from owncloud/fix-installation-caret | Morris Jobke | 2014-05-06 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix enlarged caret on installation page | ||||
| * | | | | | | | | fix enlarged caret on installation page | Jan-Christoph Borchardt | 2014-05-06 | 1 | -2/+0 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #8459 from owncloud/fix-getUserFolder | Morris Jobke | 2014-05-05 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix getUserFolder() of server container |