Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17291 from owncloud/mount-manager-public | Vincent Petry | 2015-07-03 | 5 | -5/+127 |
|\ | |||||
| * | fix typehinting | Robin Appelman | 2015-07-01 | 1 | -2/+3 |
| * | phpdoc | Robin Appelman | 2015-07-01 | 1 | -0/+21 |
| * | expose the mount manager in the public api | Robin Appelman | 2015-07-01 | 5 | -3/+103 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-03 | 34 | -18/+132 |
* | | Merge pull request #17327 from owncloud/fix_index | Morris Jobke | 2015-07-02 | 2 | -2/+4 |
|\ \ | |||||
| * | | call post_addToGroup als for class OC_User because sharing and LDAP are using... | Bjoern Schiessle | 2015-07-02 | 1 | -0/+2 |
| * | | owner is stored as 'uid_owner', not as 'owner' in the oc_share table | Bjoern Schiessle | 2015-07-02 | 1 | -2/+2 |
* | | | Merge pull request #17353 from owncloud/apps-keepgloballist | Lukas Reschke | 2015-07-02 | 2 | -2/+29 |
|\ \ \ | |||||
| * | | | Unit test for app list | Vincent Petry | 2015-07-02 | 1 | -0/+26 |
| * | | | Fix global app list state | Vincent Petry | 2015-07-02 | 1 | -2/+3 |
* | | | | Merge pull request #17159 from owncloud/fix-duplicate-id | Morris Jobke | 2015-07-02 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | remove duplicate ID in HTML template for public shares | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
* | | | | | Merge pull request #17343 from owncloud/share-disablepluginwhennocoreshare | Morris Jobke | 2015-07-02 | 1 | -0/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Do not register JS share plugin if core sharing API is disabled | Vincent Petry | 2015-07-02 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge pull request #17328 from owncloud/revert-15363-ext-ocp | Thomas Müller | 2015-07-02 | 9 | -70/+49 |
|\ \ \ \ | |||||
| * | | | | Revert "Use OCP classes as much as possible in files_external" | Thomas Müller | 2015-07-02 | 9 | -70/+49 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17077 from owncloud/files-scan-absolute-path | Morris Jobke | 2015-07-02 | 4 | -8/+58 |
|\ \ \ \ | |||||
| * | | | | handle invalid results from mount providers | Robin Appelman | 2015-06-29 | 1 | -1/+4 |
| * | | | | handle error during setup | Robin Appelman | 2015-06-29 | 1 | -3/+5 |
| * | | | | add unit test | Robin Appelman | 2015-06-29 | 2 | -2/+48 |
| * | | | | fix getting mount points when passing a path to the files:scan command | Robin Appelman | 2015-06-29 | 1 | -3/+2 |
* | | | | | Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block | Vincent Petry | 2015-07-02 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fix duplicated line in doc block | Joas Schilling | 2015-07-02 | 1 | -1/+0 |
* | | | | | | Merge pull request #17321 from rullzer/3rdparty-doctering-v1.2.6 | Morris Jobke | 2015-07-02 | 1 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Upgrade 3rdparty submodule for docterine v1.2.6 | Roeland Jago Douma | 2015-07-02 | 1 | -0/+0 |
* | | | | | | | Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-s... | Joas Schilling | 2015-07-02 | 6 | -5/+7 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Bump versions | Lukas Reschke | 2015-07-02 | 5 | -5/+5 |
| * | | | | | | Delete OCS ID from DB if none is specified | Lukas Reschke | 2015-07-02 | 1 | -0/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #17246 from owncloud/share-lock-owner-parent | Joas Schilling | 2015-07-02 | 3 | -10/+134 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | only lock the parent folders | Robin Appelman | 2015-07-01 | 2 | -2/+13 |
| * | | | | | lock parent folders for the owner when locking a shared file as recipient | Robin Appelman | 2015-07-01 | 3 | -10/+123 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #17310 from owncloud/master-remove-ocs-ids | Thomas Müller | 2015-07-02 | 5 | -5/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [master] Remove OCS IDs | Lukas Reschke | 2015-07-02 | 5 | -5/+0 |
|/ / / / | |||||
* | | | | Merge pull request #17293 from owncloud/revert-z-index | Morris Jobke | 2015-07-02 | 2 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | Revert "fix z-index of share-autocomplete" | Jan-Christoph Borchardt | 2015-07-01 | 1 | -1/+0 |
| * | | | | Revert "explicitly set z-index on app-content, fix overlap from navigation" | Jan-Christoph Borchardt | 2015-07-01 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-02 | 60 | -32/+292 |
* | | | | | Merge pull request #17295 from owncloud/scanfilesignature | Lukas Reschke | 2015-07-01 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix scanFile signature to avoid boring warning | Vincent Petry | 2015-07-01 | 1 | -1/+3 |
* | | | | | This will be 8.2 in the future | Frank Karlitschek | 2015-07-01 | 2 | -3/+3 |
* | | | | | Merge pull request #17252 from owncloud/fix-php-errors-in-app-description | Morris Jobke | 2015-07-01 | 2 | -15/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Only do the description kung-fu on strings - fixes #17028 | Thomas Müller | 2015-07-01 | 2 | -15/+23 |
| |/ / / | |||||
* | | | | Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce | Vincent Petry | 2015-07-01 | 1 | -4/+8 |
|\ \ \ \ | |||||
| * | | | | Only delete part file on error if it is really a part file | Vincent Petry | 2015-07-01 | 1 | -2/+6 |
| * | | | | Clean up part file only once, not twice on error | Vincent Petry | 2015-07-01 | 1 | -2/+2 |
* | | | | | Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/master | Lukas Reschke | 2015-07-01 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Changed broken links to php manual | Michael Roth | 2015-07-01 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes | Vincent Petry | 2015-07-01 | 1 | -13/+7 |
|\ \ \ \ | |||||
| * | | | | Catch more error codes thrown by federated shares | Vincent Petry | 2015-07-01 | 1 | -13/+7 |
| |/ / / |