Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-08 | 14 | -0/+14 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-07 | 2 | -0/+2 |
* | Merge pull request #16724 from owncloud/mimetype-js | Roeland Douma | 2015-07-06 | 2 | -2/+1 |
|\ | |||||
| * | Share app no longer use the OCS API icon | Roeland Jago Douma | 2015-07-06 | 2 | -2/+1 |
* | | Merge pull request #17418 from owncloud/fix-public-download-button-regression | Jan-Christoph Borchardt | 2015-07-06 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix regression of button at public download page | Morris Jobke | 2015-07-06 | 1 | -1/+1 |
* | | Merge pull request #17290 from owncloud/remove-readonly-wrapper | Thomas Müller | 2015-07-06 | 3 | -76/+2 |
|\ \ | |||||
| * | | remove no longer needed readonly wrapper | Robin Appelman | 2015-07-01 | 1 | -74/+0 |
| * | | use permissions mask wrapper instead of readonly wrapper | Robin Appelman | 2015-07-01 | 2 | -2/+2 |
* | | | Merge pull request #16964 from owncloud/versions_occ | Thomas Müller | 2015-07-06 | 3 | -0/+304 |
|\ \ \ | |_|/ |/| | | |||||
| * | | add occ tool to delete versions | Bjoern Schiessle | 2015-06-16 | 3 | -0/+304 |
* | | | Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activi... | Joas Schilling | 2015-07-06 | 2 | -13/+26 |
|\ \ \ | |||||
| * | | | Use federated cloud id as a parameter type | Joas Schilling | 2015-07-02 | 1 | -3/+3 |
| * | | | Add the item name to the federated sahre activity | Joas Schilling | 2015-07-02 | 2 | -1/+6 |
| * | | | Use the app constant to fix the grouping | Joas Schilling | 2015-07-02 | 2 | -9/+11 |
| * | | | Use the item name when refering to the unaccepted remote share | Joas Schilling | 2015-07-02 | 2 | -2/+8 |
* | | | | Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares | Joas Schilling | 2015-07-06 | 4 | -3/+122 |
|\ \ \ \ | |||||
| * | | | | Add OCS api to get, accept and decline remote shares | Joas Schilling | 2015-07-03 | 4 | -1/+120 |
| * | | | | Allow sharing with type remote share | Joas Schilling | 2015-07-03 | 1 | -2/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-06 | 4 | -8/+20 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-05 | 8 | -18/+94 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-04 | 2 | -8/+8 |
* | | | | | Remove OC_Log | Thomas Müller | 2015-07-03 | 2 | -5/+5 |
* | | | | | Merge pull request #15470 from rullzer/files_sharing_getUrlContent | Vincent Petry | 2015-07-03 | 1 | -51/+56 |
|\ \ \ \ \ | |||||
| * | | | | | Move away from private static deprecated functio | Roeland Jago Douma | 2015-05-18 | 1 | -51/+56 |
* | | | | | | Merge pull request #17140 from owncloud/trashbin_occ | Björn Schießle | 2015-07-03 | 3 | -0/+339 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add occ command to trashbin to remove deleted files | Bjoern Schiessle | 2015-06-24 | 3 | -0/+339 |
* | | | | | | | Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable | Morris Jobke | 2015-07-03 | 2 | -1/+18 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Do not show static share owner if not available | Vincent Petry | 2015-07-02 | 2 | -1/+18 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-03 | 18 | -4/+70 |
* | | | | | | | 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 |
* | | | | | | | | 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 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | handle error during setup | Robin Appelman | 2015-06-29 | 1 | -3/+5 |
* | | | | | | | | 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 #17316 from owncloud/master-delete-ocsid-from-db-if-none-s... | Joas Schilling | 2015-07-02 | 5 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Bump versions | Lukas Reschke | 2015-07-02 | 5 | -5/+5 |
* | | | | | | | | | 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 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | [master] Remove OCS IDs | Lukas Reschke | 2015-07-02 | 5 | -5/+0 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-02 | 40 | -22/+116 |
* | | | | | | | Fix scanFile signature to avoid boring warning | Vincent Petry | 2015-07-01 | 1 | -1/+3 |
|/ / / / / / | |||||
* | | | | | | 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 |
* | | | | | | | Use OCP classes as much as possible in files_external | Robin McCorkell | 2015-07-01 | 9 | -49/+70 |
|/ / / / / / |