Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-20 | 8 | -0/+10 |
| | |||||
* | Merge pull request #17706 from rullzer/external_diricon_filelist | Morris Jobke | 2015-07-17 | 1 | -0/+4 |
|\ | | | | | The external directories should get the correct icon in filelist | ||||
| * | The external directories should get the correct icon | Roeland Jago Douma | 2015-07-17 | 1 | -0/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-17 | 4 | -4/+4 |
| | | |||||
* | | Merge pull request #17474 from owncloud/fix_trashbin | Vincent Petry | 2015-07-16 | 2 | -2/+62 |
|\ \ | | | | | | | Don't try to move files to the trashbin outside of user/files | ||||
| * | | only move real files to the trash bin | Bjoern Schiessle | 2015-07-08 | 2 | -2/+62 |
| | | | |||||
* | | | Merge pull request #17500 from owncloud/encryption_migration_improvements | Thomas Müller | 2015-07-16 | 4 | -8/+71 |
|\ \ \ | | | | | | | | | Only clean up if migration finished succesfully | ||||
| * | | | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-08 | 2 | -7/+68 |
| | | | | |||||
| * | | | only cleanUp the remaining keys if the migration really finished succesfully | Bjoern Schiessle | 2015-07-08 | 2 | -1/+3 |
| |/ / | |||||
* | | | Merge pull request #17046 from nicolas-grekas/fix-16654 | blizzz | 2015-07-16 | 3 | -9/+5 |
|\ \ \ | |_|/ |/| | | Do not use OC*::mb_*_replace(), they are useless | ||||
| * | | Do not use OC*::mb_*_replace(), they are useless | Nicolas Grekas | 2015-07-16 | 3 | -9/+5 |
| | | | |||||
* | | | Lock scanner to the given user | Robin Appelman | 2015-07-15 | 1 | -4/+5 |
| | | | |||||
* | | | Merge pull request #17623 from owncloud/fed-throwcorrectexception | Morris Jobke | 2015-07-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Throw storage not available on guzzle error | ||||
| * | | | Throw storage not available on guzzle error | Vincent Petry | 2015-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the remote server is in maintenance mode, we must throw storage not available exception instead of not found which might auto-remove the share. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-14 | 2 | -0/+2 |
|/ / / | |||||
* | | | Strip public webdav info about sharing and mount points | Vincent Petry | 2015-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Remove information about whether a file is an incoming share or mount point when requested over public webdav. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-13 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-12 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-11 | 6 | -0/+32 |
| | | | |||||
* | | | Merge pull request #17483 from rullzer/migrate-mimetype-js | Vincent Petry | 2015-07-10 | 6 | -73/+38 |
|\ \ \ | | | | | | | | | Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl | ||||
| * | | | Fix unit tests | Roeland Jago Douma | 2015-07-09 | 3 | -4/+13 |
| | | | | |||||
| * | | | Make the filelist get the mimetypeicon from the mimetype | Roeland Jago Douma | 2015-07-09 | 1 | -9/+1 |
| | | | | |||||
| * | | | Remove ajax/mimeicon.php and its route | Roeland Jago Douma | 2015-07-09 | 2 | -29/+0 |
| | | | | |||||
| * | | | Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl | Roeland Jago Douma | 2015-07-09 | 1 | -27/+25 |
| | | | | |||||
| * | | | Make getMimeIcon use OC.MimeType.getIconUrl | Roeland Jago Douma | 2015-07-09 | 1 | -12/+7 |
| | | | | |||||
* | | | | [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 |
| | | | | | | |