aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2436-14/+136
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2312-0/+28
|
* Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-222-14/+68
|\ | | | | dont do optimized size propagation for encrypted files
| * Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
| |
* | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-225-43/+115
|\ \ | | | | | | bring back CRUDS permissions for federated shares
| * | ask for share-permissions on propfindBjörn Schießle2016-04-201-0/+16
| | |
| * | return correct share permissions on propfindBjörn Schießle2016-04-183-40/+88
| | |
| * | set correct permissions in shareinfoBjörn Schießle2016-04-181-3/+11
| | |
* | | Merge pull request #24151 from owncloud/create-personal-calendarThomas Müller2016-04-222-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üller2016-04-212-1/+83
| | |/ | |/| | | | | | | exists - fixes #24082
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2216-0/+16
| | |
* | | Merge pull request #24157 from ↵Thomas Müller2016-04-211-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 pageChristoph Wurst2016-04-211-6/+9
| |/ /
* | | Merge pull request #24155 from owncloud/fix-birthday_calendar-aclThomas Müller2016-04-214-8/+27
|\ \ \ | | | | | | | | Birthday calendar should never have write acl
| * | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-214-8/+27
| |/ /
* | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobsBjörn Schießle2016-04-213-56/+24
|\ \ \ | |/ / |/| | Chunk the users correctly in the trashbin and versions background job
| * | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
| | |
* | | Merge pull request #22791 from owncloud/enc_master_key_improvementsVincent Petry2016-04-216-74/+117
|\ \ \ | | | | | | | | Enc master key improvements
| * | | replaceUserKeys() actually deletes the users keys -> update method name and ↵Bjoern Schiessle2016-03-183-3/+5
| | | | | | | | | | | | | | | | doc-block
| * | | only create and update user specific key if no master key is enabledBjoern Schiessle2016-03-186-71/+112
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2168-66/+6
| | | |
* | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functionsThomas Müller2016-04-206-211/+4
|\ \ \ \ | | | | | | | | | | migrate deprecated jQuery 1.x functions
| * | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')Christoph Wurst2016-04-191-1/+1
| | | | |
| * | | | replace $.parseJSON() by JSON.parse()Christoph Wurst2016-04-195-209/+2
| | | | |
| * | | | migrate jQuery.fn.unload()Christoph Wurst2016-04-191-1/+1
| | | | |
* | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-exampleThomas Müller2016-04-2025-1191/+865
|\ \ \ \ \ | | | | | | | | | | | | SharedStorage to new sharing code + cleanup
| * | | | | Move moveFromCache to CacheJailRoeland Jago Douma2016-04-191-4/+0
| | | | | |
| * | | | | Move copy- and moveFromStorage to jailRoeland Jago Douma2016-04-191-20/+0
| | | | | |
| * | | | | Only construct the storage when we start using itRobin Appelman2016-04-191-7/+16
| | | | | |
| * | | | | Fix resolve pathRoeland Jago Douma2016-04-192-13/+1
| | | | | |
| * | | | | Fix testsRoeland Jago Douma2016-04-1917-720/+731
| | | | | |
| * | | | | Fix related logicRoeland Jago Douma2016-04-191-1/+1
| | | | | |
| * | | | | Move SharedStorage et al over to the shareManager and jailRoeland Jago Douma2016-04-198-456/+146
| |/ / / /
* | | | | Merge pull request #23952 from owncloud/hide-hidden-filesThomas Müller2016-04-2013-13/+155
|\ \ \ \ \ | | | | | | | | | | | | Add option to hide hidden files
| * | | | | filter hidden files on the web interfaceChristoph Wurst2016-04-1913-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_testThomas Müller2016-04-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Move the group dummy backend to test
| * | | | | Move the group dummy backend to testRoeland Jago Douma2016-04-191-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The dummy backend is only used for testing and should thus reside in tests.
* | | | | Merge pull request #24097 from owncloud/fix_23632Thomas Müller2016-04-202-10/+48
|\ \ \ \ \ | | | | | | | | | | | | init users mount point before recovery
| * | | | | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
| | |_|/ / | |/| | | | | | | | | | | | | access to his files
* | | | | Merge pull request #23915 from owncloud/activity-505-always-stream-for-commentsBjörn Schießle2016-04-201-2/+9
|\ \ \ \ \ | |/ / / / |/| | | | Always add activities for comments to the stream
| * | | | Always add activities for comments to the streamJoas Schilling2016-04-111-2/+9
| | | | |
* | | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-userThomas Müller2016-04-193-0/+20
|\ \ \ \ \ | | | | | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership
| * | | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-153-0/+20
| | | | | |
* | | | | | Merge pull request #24076 from ↵Lukas Reschke2016-04-192-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 #24057Thomas Müller2016-04-182-18/+89
| | | | | | |
* | | | | | | Merge pull request #24054 from owncloud/data_fingerprintRoeland Douma2016-04-195-12/+101
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add data-fingerprint property
| * | | | | | Add data-fingerprint property to webdavRoeland Jago Douma2016-04-185-12/+101
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-194-0/+14
| | | | | |
* | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hookThomas Müller2016-04-191-0/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Move post_removeFromGroup to shareManager
| * | | | | Move post_removeFromGroup to shareManagerRoeland Jago Douma2016-04-131-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