summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-03190-30/+798
|
* Merge pull request #19534 from owncloud/fix_19532Thomas Müller2015-10-021-0/+5
|\ | | | | if the mountpoint is accessible for all user the array should contain 'all'
| * if mountpoint is applicable to all users the old API expects a array with 'all'Bjoern Schiessle2015-10-021-0/+5
| |
* | Merge pull request #19538 from owncloud/versions-lockThomas Müller2015-10-021-0/+9
|\ \ | | | | | | Lock files when rolling back version
| * | Lock files when rolling back versionRobin Appelman2015-10-021-0/+9
| | |
* | | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-028-35/+186
|\ \ \ | | | | | | | | Introduce a few new mimetypes for code, fix recursive mimetype aliases
| * | | Added mimetype repair stepRoeland Jago Douma2015-10-023-1/+125
| | | | | | | | | | | | | | | | * Version number increased
| * | | Updated some mimetypesRoeland Jago Douma2015-10-023-1/+3
| | | | | | | | | | | | | | | | * c++ and cpp now both map to code
| * | | Allow recursive mimetype aliasesRobin McCorkell2015-10-022-2/+2
| | | | | | | | | | | | | | | | application/xml -> text/html -> text/code
| * | | Introduce a few new mimetypes for codeRobin McCorkell2015-10-023-33/+58
| | | |
* | | | Merge pull request #19536 from owncloud/share-focusonsharefieldThomas Müller2015-10-021-1/+8
|\ \ \ \ | |_|/ / |/| | | Focus on share field after first display
| * | | Focus on share field after first displayVincent Petry2015-10-021-1/+8
| |/ /
* | | Merge pull request #19525 from ↵Robin Appelman2015-10-022-27/+141
|\ \ \ | |/ / |/| | | | | | | | owncloud/share-preventmovemountpointintosharedfolder Prevent moving mount point into already shared folder (outgoing)
| * | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-10-022-27/+141
| | | | | | | | | | | | | | | | | | | | | | | | It is already not allowed to share a folder containing mount points / incoming shares. This fixes an issue that made it possible to bypass the check by moving the incoming share mount point into an existing outgoing share folder.
* | | Merge pull request #19533 from owncloud/free-space-infRobin Appelman2015-10-021-1/+1
|\ \ \ | | | | | | | | Work around INF=0 on some shared hosts
| * | | Work around INF=0 on some shared hostsRobin Appelman2015-10-021-1/+1
| | | |
* | | | Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_youThomas Müller2015-10-022-17/+171
|\ \ \ \ | |_|_|/ |/| | | List remote shares in shared with you
| * | | Fix and extend unit testsRoeland Jago Douma2015-10-022-14/+111
| | | |
| * | | More fileinfoRoeland Jago Douma2015-10-021-4/+8
| | | |
| * | | Start to show remote shares in shared with you sectionRoeland Jago Douma2015-10-021-6/+59
| | | |
* | | | Merge pull request #19482 from owncloud/kill-unused-methodThomas Müller2015-10-022-40/+5
|\ \ \ \ | |_|/ / |/| | | [l10n] remove unused static methods
| * | | [l10n] remove unused static methodsMorris Jobke2015-10-022-40/+5
| |/ /
* | | Merge pull request #19523 from owncloud/fix-seconds-agoThomas Müller2015-10-023-2/+6
|\ \ \ | |/ / |/| | Fix moment.js "a few seconds ago" with "seconds ago"
| * | Fix moment.js "a few seconds ago" with "seconds ago"Morris Jobke2015-10-023-2/+6
| |/ | | | | | | * fixes #18627
* | Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-pukeThomas Müller2015-10-021-0/+4
|\ \ | | | | | | [IE8] Fix dangling Delete action when multiselect is enabled
| * | [IE8] Fix dangling Delete action when multiselect is enabledVincent Petry2015-10-011-0/+4
| | | | | | | | | | | | | | | For some reason we need to cancel out the table's top: 95px, but just for the delete action and not the other ones... whatever, IE8...
* | | Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevertThomas Müller2015-10-022-2/+13
|\ \ \ | | | | | | | | Reload versions list after revert
| * | | Reload versions list after revertVincent Petry2015-10-012-2/+13
| |/ /
* | | Merge pull request #19500 from owncloud/fix_trash_with_encryption2Thomas Müller2015-10-022-18/+26
|\ \ \ | | | | | | | | [trashbin] fix broken versions on restore
| * | | first copy to owner and then move to current user because the encryptionBjoern Schiessle2015-10-012-18/+26
| | | | | | | | | | | | | | | | wrapper always expect to work on the owner storage
* | | | Merge pull request #19521 from owncloud/files-conflictdialog-loadpromiseThomas Müller2015-10-022-6/+16
|\ \ \ \ | | | | | | | | | | Make sure the conflict dialog is loaded before adding conflicts
| * | | | Make sure the conflict dialog is loaded before adding conflictsVincent Petry2015-10-022-6/+16
| | |_|/ | |/| |
* | | | Merge pull request #19508 from owncloud/setting-to-skip-migration-testsThomas Müller2015-10-023-2/+26
|\ \ \ \ | | | | | | | | | | setting to skip migration tests by default
| * | | | setting to skip migration tests by defaultMorris Jobke2015-10-013-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if you install owncloud via package it is not possible to skip migration tests * this also allows to disable migration tests for an instance by default
* | | | | Merge pull request #19510 from owncloud/json-grouplist-sharing-excludeThomas Müller2015-10-024-8/+9
|\ \ \ \ \ | | | | | | | | | | | | save excluded groups in json format
| * | | | | save excluded groups in json format - fixes #10983Thomas Müller2015-10-014-8/+9
| |/ / / /
* | | | | Merge pull request #19522 from owncloud/activity-395-less-sidebar-textThomas Müller2015-10-026-37/+176
|\ \ \ \ \ | | | | | | | | | | | | Activity 395 less sidebar text
| * | | | | Fix intendationJoas Schilling2015-10-021-34/+34
| | | | | |
| * | | | | Use shorter text on the sidebar for files_sharing activitiesJoas Schilling2015-10-023-5/+69
| | | | | |
| * | | | | Use shorter text on the sidebar for files activitiesJoas Schilling2015-10-021-0/+38
| | | | | |
| * | | | | Allow identifying whether the current item is the filtered oneJoas Schilling2015-10-022-0/+37
| | |/ / / | |/| | |
* | | | | Merge pull request #19386 from owncloud/ocs_shareapi_extenstionThomas Müller2015-10-023-7/+131
|\ \ \ \ \ | | | | | | | | | | | | OCS endpoint to list remote shares
| * | | | | Do not return unneeded infoRoeland Jago Douma2015-10-021-2/+4
| | | | | |
| * | | | | Extend share infoRoeland Jago Douma2015-10-021-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data from the share_external is not to much. Thus we enrich this data with info from the filecache. This allows endpoints using this to actually show usefull information. The filecache might not be up to date but that is a sacrifice we need to make in terms of speed. Else the number of remote PROPFINDS grows lineary with the number of remote shares wich will make this endpoint practically unusable.
| * | | | | Made routes remote_shares only againRoeland Jago Douma2015-10-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we need a unique id to accept/reject shares for now we keep the pending shares under remote_shares. * remote_shares/pending lists pending shares * PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
| * | | | | Added '../remote_shares' endpointRoeland Jago Douma2015-10-023-4/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * list incoming remote shares at 'remote_shares' * get per share info at 'remote_shares/<ID>' * delete remote share with a DELETE to 'remote_shares/<ID>'
| * | | | | Move OCS endpoint ../remote_share to ../pending_sharesRoeland Jago Douma2015-10-021-3/+3
| | | | | |
* | | | | | Merge pull request #19520 from ↵Jörn Friedrich Dreyer2015-10-022-4/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | owncloud/issue-17420-modify-group-count-when-changing-memberships Modify the group user count when changing membership of a user
| * | | | | Modify the group user count when changing membership of a userJoas Schilling2015-10-022-4/+17
| | | | | |
* | | | | | Merge pull request #19484 from owncloud/ie8-checkbox-rageJörn Friedrich Dreyer2015-10-022-6/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | [IE8] Fix checkboxes in login page and file list
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 13:48:27 +0000