summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19547 from owncloud/fix-16154Thomas Müller2015-10-051-4/+5
|\
| * LDAP Wizard: do not be picky about credentials when only looking for the portArthur Schiwon2015-10-031-4/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-052-0/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0428-0/+172
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0338-26/+362
|/
* 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
* | Lock files when rolling back versionRobin Appelman2015-10-021-0/+9
* | 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 #19523 from owncloud/fix-seconds-agoThomas Müller2015-10-022-2/+2
|\ \ | |/ |/|
| * Fix moment.js "a few seconds ago" with "seconds ago"Morris Jobke2015-10-022-2/+2
* | 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-021-2/+5
|\ \ \ \
| * | | | Make sure the conflict dialog is loaded before adding conflictsVincent Petry2015-10-021-2/+5
| | |_|/ | |/| |
* | | | Merge pull request #19522 from owncloud/activity-395-less-sidebar-textThomas Müller2015-10-024-37/+139
|\ \ \ \
| * | | | 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
| |/ / /
* | | | 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 #19484 from owncloud/ie8-checkbox-rageJörn Friedrich Dreyer2015-10-021-5/+23
|\ \ \ \
| * | | | [IE8] Fix file list checkboxesVincent Petry2015-09-301-5/+23
| | |_|/ | |/| |
* | | | Merge pull request #19496 from owncloud/ie8-filenamewidth-sicknessJörn Friedrich Dreyer2015-10-021-11/+0
|\ \ \ \
| * | | | [IE8] Remove non-working ellipsis supportVincent Petry2015-10-011-11/+0
| |/ / /
* | / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-028-168/+188
| |/ / |/| |
* | | display checkboxes properly after file restoreHendrik Leppelsack2015-10-011-2/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-016-0/+24
* | Merge pull request #19421 from owncloud/fix_19382Thomas Müller2015-09-303-1/+19
|\ \
| * | adjust style of disabled buttonMorris Jobke2015-09-302-1/+11
| * | Do noy allow empty urls to be submitted in "add to your owncloud"Roeland Jago Douma2015-09-302-1/+9
* | | Merge pull request #19468 from owncloud/fix-36-vs-32-previewsThomas Müller2015-09-305-8/+8
|\ \ \ | |_|/ |/| |
| * | Change small thumbnails to 32 pxMorris Jobke2015-09-305-8/+8
* | | Merge pull request #19454 from owncloud/ie8-madness-returnsThomas Müller2015-09-303-0/+6
|\ \ \
| * | | [IE8] Fix popover menu borders for IE8Vincent Petry2015-09-291-0/+3
| * | | [IE8] Fix filetype icon sizesVincent Petry2015-09-292-0/+3
| |/ /
* | | Merge pull request #19470 from owncloud/pass-exceptionThomas Müller2015-09-303-10/+76
|\ \ \
| * | | Only intercept exceptions of type "NotFoundException" instead of any ExceptionLukas Reschke2015-09-303-10/+76
| | |/ | |/|
* | | Merge pull request #19467 from owncloud/files-newmenu-highlightcurrentThomas Müller2015-09-302-0/+8
|\ \ \ | |/ / |/| |