aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | | | [IE8] Make checkbox on login page look less out of placeVincent Petry2015-09-301-1/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19496 from owncloud/ie8-filenamewidth-sicknessJörn Friedrich Dreyer2015-10-022-11/+4
|\ \ \ \ \ \ \
| * | | | | | | [IE8] Remove non-working ellipsis supportVincent Petry2015-10-012-11/+4
| |/ / / / / /
* | | | | | | Merge pull request #19505 from owncloud/returnfloatforquotaJörn Friedrich Dreyer2015-10-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | always return float, update docJörn Friedrich Dreyer2015-10-011-2/+2
* | | | | | | | Merge pull request #19480 from owncloud/fix-l10nJörn Friedrich Dreyer2015-10-021-14/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix l10n on masterMorris Jobke2015-09-301-14/+5
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0220-168/+214
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #19518 from owncloud/checkboxes-file-restoreVicDeo2015-10-022-2/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | display checkboxes properly after file restoreHendrik Leppelsack2015-10-012-2/+3
|/ / / / / /
* | | | | | Merge pull request #19463 from owncloud/fix_18132Thomas Müller2015-10-012-2/+47
|\ \ \ \ \ \
| * | | | | | versions should always use the keys of the original file, no need to create n...Bjoern Schiessle2015-10-012-2/+47
* | | | | | | Merge pull request #17703 from owncloud/preview-better-cache-useRobin Appelman2015-10-013-23/+80
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add testsRobin Appelman2015-10-012-19/+57
| * | | | | | stricter check if thumbnail is cachedRobin Appelman2015-10-011-7/+4
| * | | | | | to much copy pasteRobin Appelman2015-10-011-5/+3
| * | | | | | use cache data we already have to check if a thumbnail of specific size is ca...Robin Appelman2015-10-011-1/+24
| * | | | | | use the fileinfo to check if we have a valid fileRobin Appelman2015-10-011-1/+1