Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 36 | -14/+136 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-23 | 12 | -0/+28 |
| | |||||
* | Merge pull request #24124 from owncloud/encryped-size-progation | Thomas Müller | 2016-04-22 | 2 | -14/+68 |
|\ | | | | | dont do optimized size propagation for encrypted files | ||||
| * | Add unit tests for shared size propagation with encryption | Robin Appelman | 2016-04-21 | 2 | -14/+68 |
| | | |||||
* | | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 5 | -43/+115 |
|\ \ | | | | | | | bring back CRUDS permissions for federated shares | ||||
| * | | ask for share-permissions on propfind | Björn Schießle | 2016-04-20 | 1 | -0/+16 |
| | | | |||||
| * | | return correct share permissions on propfind | Björn Schießle | 2016-04-18 | 3 | -40/+88 |
| | | | |||||
| * | | set correct permissions in shareinfo | Björn Schießle | 2016-04-18 | 1 | -3/+11 |
| | | | |||||
* | | | Merge pull request #24151 from owncloud/create-personal-calendar | Thomas Müller | 2016-04-22 | 2 | -1/+83 |
|\ \ \ | | | | | | | | | Personal calendar should be generated even if the birthday calendar a… | ||||
| * | | | Personal calendar should be generated even if the birthday calendar already ↵ | Thomas Müller | 2016-04-21 | 2 | -1/+83 |
| | |/ | |/| | | | | | | | exists - fixes #24082 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-22 | 16 | -0/+16 |
| | | | |||||
* | | | Merge pull request #24157 from ↵ | Thomas Müller | 2016-04-21 | 1 | -6/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/files-app-is-not-available-on-public-page OCA.Files.App is not available on public page | ||||
| * | | | OCA.Files.App is not available on public page | Christoph Wurst | 2016-04-21 | 1 | -6/+9 |
| |/ / | |||||
* | | | Merge pull request #24155 from owncloud/fix-birthday_calendar-acl | Thomas Müller | 2016-04-21 | 4 | -8/+27 |
|\ \ \ | | | | | | | | | Birthday calendar should never have write acl | ||||
| * | | | Birthday calendar should never have write acl - fixes #24154 | Thomas Müller | 2016-04-21 | 4 | -8/+27 |
| |/ / | |||||
* | | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobs | Björn Schießle | 2016-04-21 | 3 | -56/+24 |
|\ \ \ | |/ / |/| | | Chunk the users correctly in the trashbin and versions background job | ||||
| * | | Chunk the users correctly in the trashbin and versions background job | Joas Schilling | 2016-04-20 | 3 | -56/+24 |
| | | | |||||
* | | | Merge pull request #22791 from owncloud/enc_master_key_improvements | Vincent Petry | 2016-04-21 | 6 | -74/+117 |
|\ \ \ | | | | | | | | | Enc master key improvements | ||||
| * | | | replaceUserKeys() actually deletes the users keys -> update method name and ↵ | Bjoern Schiessle | 2016-03-18 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | doc-block | ||||
| * | | | only create and update user specific key if no master key is enabled | Bjoern Schiessle | 2016-03-18 | 6 | -71/+112 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-21 | 68 | -66/+6 |
| | | | | |||||
* | | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions | Thomas Müller | 2016-04-20 | 6 | -211/+4 |
|\ \ \ \ | | | | | | | | | | | migrate deprecated jQuery 1.x functions | ||||
| * | | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') | Christoph Wurst | 2016-04-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | replace $.parseJSON() by JSON.parse() | Christoph Wurst | 2016-04-19 | 5 | -209/+2 |
| | | | | | |||||
| * | | | | migrate jQuery.fn.unload() | Christoph Wurst | 2016-04-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-example | Thomas Müller | 2016-04-20 | 25 | -1191/+865 |
|\ \ \ \ \ | | | | | | | | | | | | | SharedStorage to new sharing code + cleanup | ||||
| * | | | | | Move moveFromCache to CacheJail | Roeland Jago Douma | 2016-04-19 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Move copy- and moveFromStorage to jail | Roeland Jago Douma | 2016-04-19 | 1 | -20/+0 |
| | | | | | | |||||
| * | | | | | Only construct the storage when we start using it | Robin Appelman | 2016-04-19 | 1 | -7/+16 |
| | | | | | | |||||
| * | | | | | Fix resolve path | Roeland Jago Douma | 2016-04-19 | 2 | -13/+1 |
| | | | | | | |||||
| * | | | | | Fix tests | Roeland Jago Douma | 2016-04-19 | 17 | -720/+731 |
| | | | | | | |||||
| * | | | | | Fix related logic | Roeland Jago Douma | 2016-04-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move SharedStorage et al over to the shareManager and jail | Roeland Jago Douma | 2016-04-19 | 8 | -456/+146 |
| |/ / / / | |||||
* | | | | | Merge pull request #23952 from owncloud/hide-hidden-files | Thomas Müller | 2016-04-20 | 13 | -13/+155 |
|\ \ \ \ \ | | | | | | | | | | | | | Add option to hide hidden files | ||||
| * | | | | | filter hidden files on the web interface | Christoph Wurst | 2016-04-19 | 13 | -13/+155 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add checkbox to toggle show/hide hidden files persist show hidden setting fix settings menu layout test ApiController::showHiddenFiles don't show hidden files by default Store config in Backbone model and inject it into FileList Filter files only temporarily when rending the file list Fix file rename validation | ||||
* | | | | | Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test | Thomas Müller | 2016-04-20 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Move the group dummy backend to test | ||||
| * | | | | | Move the group dummy backend to test | Roeland Jago Douma | 2016-04-19 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | The dummy backend is only used for testing and should thus reside in tests. | ||||
* | | | | | Merge pull request #24097 from owncloud/fix_23632 | Thomas Müller | 2016-04-20 | 2 | -10/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | init users mount point before recovery | ||||
| * | | | | | we need to initialize the mount points of the given user before we recover | Björn Schießle | 2016-04-19 | 2 | -10/+48 |
| | |_|/ / | |/| | | | | | | | | | | | | | access to his files | ||||
* | | | | | Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments | Björn Schießle | 2016-04-20 | 1 | -2/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | Always add activities for comments to the stream | ||||
| * | | | | Always add activities for comments to the stream | Joas Schilling | 2016-04-11 | 1 | -2/+9 |
| | | | | | |||||
* | | | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user | Thomas Müller | 2016-04-19 | 3 | -0/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership | ||||
| * | | | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-15 | 3 | -0/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #24076 from ↵ | Lukas Reschke | 2016-04-19 | 2 | -18/+89 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-initial-calendar-and-addressbook-names Fix displayname for initial calendars and address books | ||||
| * | | | | | | Fix displayname for initial calendars and address books - fixes #24057 | Thomas Müller | 2016-04-18 | 2 | -18/+89 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24054 from owncloud/data_fingerprint | Roeland Douma | 2016-04-19 | 5 | -12/+101 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Add data-fingerprint property | ||||
| * | | | | | | Add data-fingerprint property to webdav | Roeland Jago Douma | 2016-04-18 | 5 | -12/+101 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-19 | 4 | -0/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook | Thomas Müller | 2016-04-19 | 1 | -0/+11 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Move post_removeFromGroup to shareManager | ||||
| * | | | | | Move post_removeFromGroup to shareManager | Roeland Jago Douma | 2016-04-13 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last sharing hook to be moved over. * Added unit tests * Removed old tests that relied on old behaviour * Removed old hooks.php |