aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19534 from owncloud/fix_19532Thomas Müller2015-10-021-0/+5
|\
| * 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 versionRobin Appelman2015-10-021-0/+9
* | | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-028-35/+186
|\ \ \
| * | | Added mimetype repair stepRoeland Jago Douma2015-10-023-1/+125
| * | | Updated some mimetypesRoeland Jago Douma2015-10-023-1/+3
| * | | Allow recursive mimetype aliasesRobin McCorkell2015-10-022-2/+2
| * | | 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 displayVincent Petry2015-10-021-1/+8
| |/ /
* | | Merge pull request #19525 from owncloud/share-preventmovemountpointintoshared...Robin Appelman2015-10-022-27/+141
|\ \ \ | |/ / |/| |
| * | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-10-022-27/+141
* | | Merge pull request #19533 from owncloud/free-space-infRobin Appelman2015-10-021-1/+1
|\ \ \
| * | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 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"Morris Jobke2015-10-023-2/+6
| |/
* | 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 enabledVincent Petry2015-10-011-0/+4
* | | Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevertThomas Müller2015-10-022-2/+13
|\ \ \
| * | | 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
|\ \ \
| * | | first copy to owner and then move to current user because the encryptionBjoern Schiessle2015-10-012-18/+26
* | | | Merge pull request #19521 from owncloud/files-conflictdialog-loadpromiseThomas Müller2015-10-022-6/+16
|\ \ \ \
| * | | | 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 defaultMorris Jobke2015-10-013-2/+26
* | | | | Merge pull request #19510 from owncloud/json-grouplist-sharing-excludeThomas Müller2015-10-024-8/+9
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | Do not return unneeded infoRoeland Jago Douma2015-10-021-2/+4
| * | | | | Extend share infoRoeland Jago Douma2015-10-021-1/+23
| * | | | | Made routes remote_shares only againRoeland Jago Douma2015-10-021-8/+8
| * | | | | Added '../remote_shares' endpointRoeland Jago Douma2015-10-023-4/+104
| * | | | | Move OCS endpoint ../remote_share to ../pending_sharesRoeland Jago Douma2015-10-021-3/+3
* | | | | | Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-c...Jörn Friedrich Dreyer2015-10-022-4/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 file list checkboxesVincent Petry2015-09-301-5/+23