Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-10 | 14 | -14/+30 |
| | |||||
* | Merge pull request #17473 from owncloud/enc_fix_migration | Morris Jobke | 2015-07-09 | 2 | -14/+82 |
|\ | | | | | more secure way to update the database | ||||
| * | more secure way to update the database | Bjoern Schiessle | 2015-07-08 | 2 | -14/+82 |
| | | |||||
* | | Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype | Morris Jobke | 2015-07-09 | 1 | -0/+3 |
|\ \ | | | | | | | No more leaking of mounttype via metadata or icon in public shares. | ||||
| * | | Do not leak mounttype of a public share | Roeland Jago Douma | 2015-07-04 | 1 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-09 | 12 | -8/+40 |
| |/ |/| | |||||
* | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions | Morris Jobke | 2015-07-08 | 1 | -9/+139 |
|\ \ | | | | | | | Fix the path for users which have an exception for a group share | ||||
| * | | Add visibility to test methods | Joas Schilling | 2015-07-07 | 1 | -11/+11 |
| | | | |||||
| * | | Add test case when owner renames shared folder | Vincent Petry | 2015-07-07 | 1 | -5/+8 |
| | | | |||||
| * | | Add unit test for getUsersSharingFile | Vincent Petry | 2015-07-07 | 1 | -0/+127 |
| | | | | | | | | | | | | | | | This is to test if the user list and paths are correct, even when a recipient renamed the received shared folder | ||||
* | | | [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 |
|\ \ \ | | | | | | | | | Javascript to fetch mimetype icons | ||||
| * | | | Share app no longer use the OCS API icon | Roeland Jago Douma | 2015-07-06 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | Switch to new javascript mimetype resolver | ||||
* | | | | 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 | ||||
| * | | | Fix regression of button at public download page | Morris Jobke | 2015-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * introduced with #17159 | ||||
* | | | | Merge pull request #17290 from owncloud/remove-readonly-wrapper | Thomas Müller | 2015-07-06 | 3 | -76/+2 |
|\ \ \ \ | | | | | | | | | | | Replace readonly wrapper with permissions mask | ||||
| * | | | | 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 | ||||
| * | | | | add occ tool to delete versions | Bjoern Schiessle | 2015-06-16 | 3 | -0/+304 |
| | | | | | |||||
* | | | | | Merge pull request #17335 from ↵ | Joas Schilling | 2015-07-06 | 2 | -13/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/better-federated-cloud-sharing-activities Improve federated cloud sharing activities | ||||
| * | | | | | 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 send, get, accept and decline remote shares | ||||
| * | | | | | | 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 function OC_Util::getUrlContent | ||||
| * | | | | | | 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 remove deleted files | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | | Do not show static share owner if not available | Vincent Petry | 2015-07-02 | 2 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some corner cases, an outgoing share exists but sharing is not allowed for the current user. This would cause the file list to break because the static text could not be rendered as the owner was undefined. | ||||
* | | | | | | | | [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 | ||||
| * | | | | | | | | 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" | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix getting mount points when passing a path to the files:scan command | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | | | | Fix duplicated line in doc block | Joas Schilling | 2015-07-02 | 1 | -1/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #17316 from ↵ | Joas Schilling | 2015-07-02 | 5 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified |