Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 1 | -5/+15 |
|\ | |||||
| * | fix unit tests | Morris Jobke | 2015-03-17 | 1 | -5/+15 |
* | | Merge pull request #15244 from owncloud/use_default_share_folder | Morris Jobke | 2015-03-26 | 3 | -5/+20 |
|\ \ | |||||
| * | | always fall back to default share folder | Bjoern Schiessle | 2015-03-26 | 3 | -5/+20 |
* | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 2 | -20/+192 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 1 | -9/+13 |
| * | | Rename must be possible with update-only permission | Vincent Petry | 2015-03-19 | 1 | -17/+23 |
| * | | Fix shared storage permission checks | Vincent Petry | 2015-03-18 | 2 | -4/+166 |
* | | | Merge pull request #15001 from owncloud/kill-share-proxy | Thomas Müller | 2015-03-26 | 6 | -76/+23 |
|\ \ \ | |||||
| * | | | replace share proxy with hook | Robin Appelman | 2015-03-26 | 6 | -71/+18 |
| * | | | rename proxy test | Robin Appelman | 2015-03-26 | 1 | -7/+7 |
* | | | | Remove IDE autocomplete fail | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
|/ / / | |||||
* | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 63 | -510/+1119 |
* | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 3 | -27/+15 |
|\ \ \ | |||||
| * | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 3 | -27/+15 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 2 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #15055 from owncloud/share-activity-grouping | Morris Jobke | 2015-03-24 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | Group sharing activities by user/group and file respectively | Joas Schilling | 2015-03-20 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-tests | Morris Jobke | 2015-03-24 | 2 | -154/+67 |
|\ \ \ | |||||
| * | | | Merge the two tests into one | Joas Schilling | 2015-03-24 | 2 | -154/+67 |
* | | | | Merge pull request #15158 from owncloud/fix-failing-master | Robin Appelman | 2015-03-24 | 2 | -5/+14 |
|\| | | | |||||
| * | | | *cough* | Joas Schilling | 2015-03-24 | 2 | -5/+14 |
* | | | | Merge pull request #14998 from rullzer/ocs_api_new_url | Morris Jobke | 2015-03-24 | 2 | -2/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added extra unit test | Roeland Jago Douma | 2015-03-21 | 1 | -0/+5 |
| * | | | OCS API should return fancy OC url | Roeland Jago Douma | 2015-03-21 | 1 | -2/+1 |
* | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share | Morris Jobke | 2015-03-24 | 4 | -26/+209 |
|\ \ \ \ | |||||
| * | | | | Add a unit test for the naming conflict on the mountpoint name | Joas Schilling | 2015-03-17 | 2 | -6/+155 |
| * | | | | Use insertIfNotExists() instead of manual logic | Joas Schilling | 2015-03-17 | 1 | -24/+31 |
| * | | | | Correctly get the unique mountpoint name when mounting the share | Joas Schilling | 2015-03-17 | 3 | -10/+37 |
| | |_|/ | |/| | | |||||
* | | | | when the path doesnt exist show a proper error page | Robin Appelman | 2015-03-24 | 1 | -0/+2 |
* | | | | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-24 | 4 | -23/+85 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-22 | 2 | -0/+2 |
* | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 3 | -4/+5 |
|\ \ \ \ | |||||
| * | | | | Fix controller test | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| * | | | | Move mimetype check from template to controller | Joas Schilling | 2015-03-16 | 2 | -4/+4 |
| * | | | | Use the PreviewManager where possible | Joas Schilling | 2015-03-16 | 1 | -2/+2 |
* | | | | | Do not automatically add "update" permission to shared mounts | Vincent Petry | 2015-03-20 | 1 | -2/+1 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-20 | 2 | -10/+10 |
* | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | Added unit test | Roeland Jago Douma | 2015-03-19 | 1 | -0/+18 |
* | | | | | Merge pull request #14537 from owncloud/oci-external-share | Robin Appelman | 2015-03-19 | 3 | -2/+144 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Do not make setupMounts() public just because of testing | Joas Schilling | 2015-03-11 | 2 | -12/+12 |
| * | | | | Add unit tests for external share mananger | Robin Appelman | 2015-03-10 | 2 | -2/+144 |
| * | | | | Fix external shares without password on oracle | Robin Appelman | 2015-02-27 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-19 | 2 | -0/+6 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-18 | 4 | -2/+16 |
* | | | | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Fix PHPDoc and Co. | Lukas Reschke | 2015-03-17 | 1 | -4/+12 |
* | | | Fix scanFile signature warnings | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-12 | 2 | -2/+2 |